Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libdrm for openSUSE:Factory checked in at 2024-06-27 15:57:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdrm (Old) and /work/SRC/openSUSE:Factory/.libdrm.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdrm" Thu Jun 27 15:57:57 2024 rev:177 rq:1183417 version:2.4.122 Changes: -------- --- /work/SRC/openSUSE:Factory/libdrm/libdrm.changes 2024-06-04 12:50:05.165551268 +0200 +++ /work/SRC/openSUSE:Factory/.libdrm.new.18349/libdrm.changes 2024-06-27 15:58:10.591294423 +0200 @@ -1,0 +2,12 @@ +Wed Jun 26 11:10:14 UTC 2024 - Stefan Dirsch <sndirsch@suse.com> + +- update to 2.4.122 + * fix FTBS on FreeBSD (or non-Linux in general) + * freedreno: fix FTBS on non-Linux platforms (unused header) + * etnaviv: fix FTBS on undefined linux/* headers on non-Linux platforms. + * ci: upgrade debian container to bookworm + * ci: upgrade FreeBSD VM to 14.1 + * Remove libm in libdrm dependencies + * Sync headers with drm-next + +------------------------------------------------------------------- Old: ---- libdrm-2.4.121.tar.xz New: ---- libdrm-2.4.122.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdrm.spec ++++++ --- /var/tmp/diff_new_pack.2NF28E/_old 2024-06-27 15:58:11.623332200 +0200 +++ /var/tmp/diff_new_pack.2NF28E/_new 2024-06-27 15:58:11.623332200 +0200 @@ -24,7 +24,7 @@ Name: libdrm # Please remember to adjust the version in the n_libdrm-drop-valgrind* patches -Version: 2.4.121 +Version: 2.4.122 Release: 0 Summary: Userspace Interface for Kernel DRM Services License: MIT ++++++ libdrm-2.4.121.tar.xz -> libdrm-2.4.122.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.121/.gitlab-ci.yml new/libdrm-2.4.122/.gitlab-ci.yml --- old/libdrm-2.4.121/.gitlab-ci.yml 2024-06-01 19:31:41.000000000 +0200 +++ new/libdrm-2.4.122/.gitlab-ci.yml 2024-06-26 10:13:31.000000000 +0200 @@ -12,7 +12,7 @@ # main repository, it's recommended to remove the image from the source # repository's container registry, so that the image from the main # repository's registry will be used there as well. -.templates_sha: &template_sha 567700e483aabed992d0a4fea84994a0472deff6 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha b61a03cabbf308e81289f7aaaf0b5a80a34ffb99 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: - project: 'freedesktop/ci-templates' @@ -39,12 +39,11 @@ .os-debian: variables: BUILD_OS: debian - FDO_DISTRIBUTION_VERSION: buster + FDO_DISTRIBUTION_VERSION: bookworm FDO_DISTRIBUTION_PACKAGES: 'build-essential docbook-xsl libatomic-ops-dev libcairo2-dev libcunit1-dev libpciaccess-dev meson ninja-build pkg-config python3 python3-pip python3-wheel python3-setuptools python3-docutils valgrind' - FDO_DISTRIBUTION_EXEC: 'pip3 install meson==0.59.0' # bump this tag every time you change something which requires rebuilding the # base image - FDO_DISTRIBUTION_TAG: "2023-09-01.0" + FDO_DISTRIBUTION_TAG: "2024-06-25.0" .debian-x86_64: extends: @@ -67,11 +66,11 @@ .os-freebsd: variables: BUILD_OS: freebsd - FDO_DISTRIBUTION_VERSION: "13.2" + FDO_DISTRIBUTION_VERSION: "14.1" FDO_DISTRIBUTION_PACKAGES: 'meson ninja pkgconf libpciaccess py39-docutils cairo' # bump this tag every time you change something which requires rebuilding the # base image - FDO_DISTRIBUTION_TAG: "2023-07-20.0" + FDO_DISTRIBUTION_TAG: "2026-26-25.0" .freebsd-x86_64: extends: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.121/etnaviv/etnaviv_device.c new/libdrm-2.4.122/etnaviv/etnaviv_device.c --- old/libdrm-2.4.121/etnaviv/etnaviv_device.c 2024-06-01 19:31:41.000000000 +0200 +++ new/libdrm-2.4.122/etnaviv/etnaviv_device.c 2024-06-26 10:13:31.000000000 +0200 @@ -25,8 +25,7 @@ */ #include <stdlib.h> -#include <linux/stddef.h> -#include <linux/types.h> +#include <sys/types.h> #include <errno.h> #include <sys/mman.h> #include <fcntl.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.121/exynos/exynos_drm.c new/libdrm-2.4.122/exynos/exynos_drm.c --- old/libdrm-2.4.121/exynos/exynos_drm.c 2024-06-01 19:31:41.000000000 +0200 +++ new/libdrm-2.4.122/exynos/exynos_drm.c 2024-06-26 10:13:31.000000000 +0200 @@ -31,7 +31,6 @@ #include <unistd.h> #include <sys/mman.h> -#include <linux/stddef.h> #include <xf86drm.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.121/exynos/exynos_fimg2d.c new/libdrm-2.4.122/exynos/exynos_fimg2d.c --- old/libdrm-2.4.121/exynos/exynos_fimg2d.c 2024-06-01 19:31:41.000000000 +0200 +++ new/libdrm-2.4.122/exynos/exynos_fimg2d.c 2024-06-26 10:13:31.000000000 +0200 @@ -30,7 +30,6 @@ #include <assert.h> #include <sys/mman.h> -#include <linux/stddef.h> #include <xf86drm.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.121/freedreno/kgsl/kgsl_bo.c new/libdrm-2.4.122/freedreno/kgsl/kgsl_bo.c --- old/libdrm-2.4.121/freedreno/kgsl/kgsl_bo.c 2024-06-01 19:31:41.000000000 +0200 +++ new/libdrm-2.4.122/freedreno/kgsl/kgsl_bo.c 2024-06-26 10:13:31.000000000 +0200 @@ -28,8 +28,6 @@ #include "kgsl_priv.h" -#include <linux/fb.h> - static int set_memtype(struct fd_device *dev, uint32_t handle, uint32_t flags) { struct drm_kgsl_gem_memtype req = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.121/include/drm/drm_fourcc.h new/libdrm-2.4.122/include/drm/drm_fourcc.h --- old/libdrm-2.4.121/include/drm/drm_fourcc.h 2024-06-01 19:31:41.000000000 +0200 +++ new/libdrm-2.4.122/include/drm/drm_fourcc.h 2024-06-26 10:13:31.000000000 +0200 @@ -54,7 +54,7 @@ * Format modifiers may change any property of the buffer, including the number * of planes and/or the required allocation size. Format modifiers are * vendor-namespaced, and as such the relationship between a fourcc code and a - * modifier is specific to the modifer being used. For example, some modifiers + * modifier is specific to the modifier being used. For example, some modifiers * may preserve meaning - such as number of planes - from the fourcc code, * whereas others may not. * @@ -79,7 +79,7 @@ * format. * - Higher-level programs interfacing with KMS/GBM/EGL/Vulkan/etc: these users * see modifiers as opaque tokens they can check for equality and intersect. - * These users musn't need to know to reason about the modifier value + * These users mustn't need to know to reason about the modifier value * (i.e. they are not expected to extract information out of the modifier). * * Vendors should document their modifier usage in as much detail as @@ -540,7 +540,7 @@ * This is a tiled layout using 4Kb tiles in row-major layout. * Within the tile pixels are laid out in 16 256 byte units / sub-tiles which * are arranged in four groups (two wide, two high) with column-major layout. - * Each group therefore consits out of four 256 byte units, which are also laid + * Each group therefore consists out of four 256 byte units, which are also laid * out as 2x2 column-major. * 256 byte units are made out of four 64 byte blocks of pixels, producing * either a square block or a 2:1 unit. @@ -1103,7 +1103,7 @@ */ /* - * The top 4 bits (out of the 56 bits alloted for specifying vendor specific + * The top 4 bits (out of the 56 bits allotted for specifying vendor specific * modifiers) denote the category for modifiers. Currently we have three * categories of modifiers ie AFBC, MISC and AFRC. We can have a maximum of * sixteen different categories. @@ -1419,7 +1419,7 @@ * Amlogic FBC Memory Saving mode * * Indicates the storage is packed when pixel size is multiple of word - * boudaries, i.e. 8bit should be stored in this mode to save allocation + * boundaries, i.e. 8bit should be stored in this mode to save allocation * memory. * * This mode reduces body layout to 3072 bytes per 64x32 superblock with @@ -1476,6 +1476,7 @@ #define AMD_FMT_MOD_TILE_VER_GFX10 2 #define AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS 3 #define AMD_FMT_MOD_TILE_VER_GFX11 4 +#define AMD_FMT_MOD_TILE_VER_GFX12 5 /* * 64K_S is the same for GFX9/GFX10/GFX10_RBPLUS and hence has GFX9 as canonical @@ -1486,6 +1487,8 @@ /* * 64K_D for non-32 bpp is the same for GFX9/GFX10/GFX10_RBPLUS and hence has * GFX9 as canonical version. + * + * 64K_D_2D on GFX12 is identical to 64K_D on GFX11. */ #define AMD_FMT_MOD_TILE_GFX9_64K_D 10 #define AMD_FMT_MOD_TILE_GFX9_64K_S_X 25 @@ -1493,6 +1496,19 @@ #define AMD_FMT_MOD_TILE_GFX9_64K_R_X 27 #define AMD_FMT_MOD_TILE_GFX11_256K_R_X 31 +/* Gfx12 swizzle modes: + * 0 - LINEAR + * 1 - 256B_2D - 2D block dimensions + * 2 - 4KB_2D + * 3 - 64KB_2D + * 4 - 256KB_2D + * 5 - 4KB_3D - 3D block dimensions + * 6 - 64KB_3D + * 7 - 256KB_3D + */ +#define AMD_FMT_MOD_TILE_GFX12_64K_2D 3 +#define AMD_FMT_MOD_TILE_GFX12_256K_2D 4 + #define AMD_FMT_MOD_DCC_BLOCK_64B 0 #define AMD_FMT_MOD_DCC_BLOCK_128B 1 #define AMD_FMT_MOD_DCC_BLOCK_256B 2 @@ -1524,6 +1540,9 @@ #define AMD_FMT_MOD_DCC_MAX_COMPRESSED_BLOCK_SHIFT 18 #define AMD_FMT_MOD_DCC_MAX_COMPRESSED_BLOCK_MASK 0x3 +#define AMD_FMT_MOD_GFX12_DCC_MAX_COMPRESSED_BLOCK_SHIFT 3 +#define AMD_FMT_MOD_GFX12_DCC_MAX_COMPRESSED_BLOCK_MASK 0x3 /* 0:64B, 1:128B, 2:256B */ + /* * DCC supports embedding some clear colors directly in the DCC surface. * However, on older GPUs the rendering HW ignores the embedded clear color diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.121/include/drm/drm_mode.h new/libdrm-2.4.122/include/drm/drm_mode.h --- old/libdrm-2.4.121/include/drm/drm_mode.h 2024-06-01 19:31:41.000000000 +0200 +++ new/libdrm-2.4.122/include/drm/drm_mode.h 2024-06-26 10:13:31.000000000 +0200 @@ -36,10 +36,10 @@ /** * DOC: overview * - * DRM exposes many UAPI and structure definition to have a consistent - * and standardized interface with user. + * DRM exposes many UAPI and structure definitions to have a consistent + * and standardized interface with users. * Userspace can refer to these structure definitions and UAPI formats - * to communicate to driver + * to communicate to drivers. */ #define DRM_CONNECTOR_NAME_LEN 32 @@ -540,7 +540,7 @@ /* the PROP_ATOMIC flag is used to hide properties from userspace that * is not aware of atomic properties. This is mostly to work around * older userspace (DDX drivers) that read/write each prop they find, - * witout being aware that this could be triggering a lengthy modeset. + * without being aware that this could be triggering a lengthy modeset. */ #define DRM_MODE_PROP_ATOMIC 0x80000000 @@ -664,7 +664,7 @@ }; #define DRM_MODE_FB_INTERLACED (1<<0) /* for interlaced framebuffers */ -#define DRM_MODE_FB_MODIFIERS (1<<1) /* enables ->modifer[] */ +#define DRM_MODE_FB_MODIFIERS (1<<1) /* enables ->modifier[] */ /** * struct drm_mode_fb_cmd2 - Frame-buffer metadata. @@ -858,6 +858,17 @@ }; /** + * struct drm_plane_size_hint - Plane size hints + * + * The plane SIZE_HINTS property blob contains an + * array of struct drm_plane_size_hint. + */ +struct drm_plane_size_hint { + __u16 width; + __u16 height; +}; + +/** * struct hdr_metadata_infoframe - HDR Metadata Infoframe Data. * * HDR Metadata Infoframe as per CTA 861.G spec. This is expected @@ -881,8 +892,8 @@ * These are coded as unsigned 16-bit values in units of * 0.00002, where 0x0000 represents zero and 0xC350 * represents 1.0000. - * @display_primaries.x: X cordinate of color primary. - * @display_primaries.y: Y cordinate of color primary. + * @display_primaries.x: X coordinate of color primary. + * @display_primaries.y: Y coordinate of color primary. */ struct { __u16 x, y; @@ -892,8 +903,8 @@ * These are coded as unsigned 16-bit values in units of * 0.00002, where 0x0000 represents zero and 0xC350 * represents 1.0000. - * @white_point.x: X cordinate of whitepoint of color primary. - * @white_point.y: Y cordinate of whitepoint of color primary. + * @white_point.x: X coordinate of whitepoint of color primary. + * @white_point.y: Y coordinate of whitepoint of color primary. */ struct { __u16 x, y; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.121/meson.build new/libdrm-2.4.122/meson.build --- old/libdrm-2.4.121/meson.build 2024-06-01 19:31:41.000000000 +0200 +++ new/libdrm-2.4.122/meson.build 2024-06-26 10:13:31.000000000 +0200 @@ -21,7 +21,7 @@ project( 'libdrm', ['c'], - version : '2.4.121', + version : '2.4.122', license : 'MIT', meson_version : '>= 0.59', default_options : ['buildtype=debugoptimized', 'c_std=c11'], @@ -154,7 +154,6 @@ else dep_rt = [] endif -dep_m = cc.find_library('m', required : false) # The header is not required on Linux, and is in fact deprecated in glibc 2.30+ if ['linux'].contains(host_machine.system()) @@ -258,7 +257,7 @@ 'drm', libdrm_files, c_args : libdrm_c_args, - dependencies : [dep_valgrind, dep_rt, dep_m], + dependencies : [dep_valgrind, dep_rt], include_directories : inc_drm, install : true, kwargs : libdrm_kw, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.121/omap/omap_drm.c new/libdrm-2.4.122/omap/omap_drm.c --- old/libdrm-2.4.121/omap/omap_drm.c 2024-06-01 19:31:41.000000000 +0200 +++ new/libdrm-2.4.122/omap/omap_drm.c 2024-06-26 10:13:31.000000000 +0200 @@ -27,7 +27,6 @@ */ #include <stdlib.h> -#include <linux/stddef.h> #include <linux/types.h> #include <errno.h> #include <sys/mman.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.121/tests/exynos/exynos_fimg2d_test.c new/libdrm-2.4.122/tests/exynos/exynos_fimg2d_test.c --- old/libdrm-2.4.121/tests/exynos/exynos_fimg2d_test.c 2024-06-01 19:31:41.000000000 +0200 +++ new/libdrm-2.4.122/tests/exynos/exynos_fimg2d_test.c 2024-06-26 10:13:31.000000000 +0200 @@ -31,7 +31,6 @@ #include <unistd.h> #include <sys/mman.h> -#include <linux/stddef.h> #include <xf86drm.h> #include <xf86drmMode.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.121/xf86drm.c new/libdrm-2.4.122/xf86drm.c --- old/libdrm-2.4.121/xf86drm.c 2024-06-01 19:31:41.000000000 +0200 +++ new/libdrm-2.4.122/xf86drm.c 2024-06-26 10:13:31.000000000 +0200 @@ -60,7 +60,6 @@ #if HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> #endif -#include <math.h> #include <inttypes.h> #if defined(__FreeBSD__) @@ -4596,6 +4595,7 @@ int node_type, subsystem_type; int maj, min, n, ret; const int max_node_length = ALIGN(drmGetMaxNodeName(), sizeof(void *)); + struct stat sbuf; if (device == NULL) return -EINVAL; @@ -4620,8 +4620,8 @@ n = snprintf(node, PATH_MAX, dev_name, DRM_DIR_NAME, min); if (n == -1 || n >= PATH_MAX) return -errno; - if (written + 1 > max_node_length) - return -EINVAL + if (n + 1 > max_node_length) + return -EINVAL; if (stat(node, &sbuf)) return -EINVAL;