[Git][xorg-team/lib/libdrm][debian-unstable] 8 commits: radeon: fix missing stencil_tile_mode initialisation in the linear/fallback case

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libdrm

Commits:

54b12081

by Eric Engestrom at 2024-01-01T07:43:19+00:00

radeon: fix missing stencil_tile_mode initialisation in the linear/fallback case

../radeon/radeon_surface.c:1611:13: error: 'stencil_tile_mode' may be used uninitialized [-Werror=maybe-uninitialized]
 1611 |         r = si_surface_init_1d(surf_man, surf, surf->stencil_level, 1, stencil_tile_mode, surf->bo_size, 0);
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

118addfa

by Pierre-Eric Pelloux-Prayer at 2024-01-04T11:00:37+01:00

amdgpu: fix use-after-free

Closes: https://gitlab.freedesktop.org/mesa/drm/-/issues/96
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

6c4392f4

by Simon Ser at 2024-01-13T10:33:05+01:00

Sync headers with drm-next

Synchronize drm.h and drm_mode.h to drm-next.

Generated using make headers_install.
Generated from drm-next branch commit a60501d7c2d3e70b3545b9b96576628e369d8e85

Signed-off-by: Simon Ser <contact@emersion.fr>
Acked-by: Simon Zeni <simon.zeni@collabora.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

75254bf2

by Simon Ser at 2024-01-13T10:37:07+01:00

build: bump version to 2.4.120

Signed-off-by: Simon Ser <contact@emersion.fr>

d48766f0
by Timo Aaltonen at 2024-01-16T14:06:04+02:00
```
release to sid, for real this time
```

b0663862

by Timo Aaltonen at 2024-01-16T14:07:56+02:00

Merge branch 'upstream-unstable' into debian-unstable

55bd6ab7
by Timo Aaltonen at 2024-01-16T14:08:22+02:00
```
version bump
```
9457e0dd
by Timo Aaltonen at 2024-01-16T14:09:01+02:00
```
release to sid
```

Changes:

amdgpu/amdgpu_cs.c

@@ -140,8 +140,8 @@ drm_public int amdgpu_cs_ctx_free(amdgpu_context_handle context)
  	for (i = 0; i < AMDGPU_HW_IP_NUM; i++) {
  		for (j = 0; j < AMDGPU_HW_IP_INSTANCE_MAX_COUNT; j++) {
  			for (k = 0; k < AMDGPU_CS_MAX_RINGS; k++) {
 -				amdgpu_semaphore_handle sem;
 -				LIST_FOR_EACH_ENTRY(sem, &context->sem_list[i][j][k], list) {
 +				amdgpu_semaphore_handle sem, tmp;
 +				LIST_FOR_EACH_ENTRY_SAFE(sem, tmp, &context->sem_list[i][j][k], list) {
  					list_del(&sem->list);
  					amdgpu_cs_reset_sem(sem);
  					amdgpu_cs_unreference_sem(sem);

debian/changelog

 -libdrm (2.4.119-2) UNRELEASED; urgency=medium
 +libdrm (2.4.120-1) unstable; urgency=medium
 +  * New upstream release.
++
 + -- Timo Aaltonen <tjaalton@debian.org>  Tue, 16 Jan 2024 14:08:50 +0200
++
 +libdrm (2.4.119-2) unstable; urgency=medium
++
 +  [ Diederik de Haas ]
    * Add new signing-key from Marek Olšák
    * symbols: Add new symbol for amdgpu
 - -- Diederik de Haas <didi.debian@cknow.org>  Fri, 12 Jan 2024 19:43:14 +0100
 + -- Timo Aaltonen <tjaalton@debian.org>  Tue, 16 Jan 2024 14:05:50 +0200
  libdrm (2.4.119-1) unstable; urgency=medium

include/drm/drm.h

@@ -707,7 +707,8 @@ struct drm_gem_open {
  /**
   * DRM_CAP_ASYNC_PAGE_FLIP
+  *
 - * If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC.
 + * If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC for legacy
 + * page-flips.
   */
  #define DRM_CAP_ASYNC_PAGE_FLIP		0x7
  /**
@@ -767,6 +768,13 @@ struct drm_gem_open {
   * :ref:`drm_sync_objects`.
   */
  #define DRM_CAP_SYNCOBJ_TIMELINE	0x14
 +/**
 + * DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP
 + *
 + * If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC for atomic
 + * commits.
 + */
 +#define DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP	0x15
  /* DRM_IOCTL_GET_CAP ioctl argument type */
  struct drm_get_cap {
@@ -836,6 +844,31 @@ struct drm_get_cap {
   */
  #define DRM_CLIENT_CAP_WRITEBACK_CONNECTORS	5
 +/**
 + * DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT
 + *
 + * Drivers for para-virtualized hardware (e.g. vmwgfx, qxl, virtio and
 + * virtualbox) have additional restrictions for cursor planes (thus
 + * making cursor planes on those drivers not truly universal,) e.g.
 + * they need cursor planes to act like one would expect from a mouse
 + * cursor and have correctly set hotspot properties.
 + * If this client cap is not set the DRM core will hide cursor plane on
 + * those virtualized drivers because not setting it implies that the
 + * client is not capable of dealing with those extra restictions.
 + * Clients which do set cursor hotspot and treat the cursor plane
 + * like a mouse cursor should set this property.
 + * The client must enable &DRM_CLIENT_CAP_ATOMIC first.
 + *
 + * Setting this property on drivers which do not special case
 + * cursor planes (i.e. non-virtualized drivers) will return
 + * EOPNOTSUPP, which can be used by userspace to gauge
 + * requirements of the hardware/drivers they're running on.
 + *
 + * This capability is always supported for atomic-capable virtualized
 + * drivers starting from kernel version 6.6.
 + */
 +#define DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT	6
++
  /* DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */
  struct drm_set_client_cap {
  	__u64 capability;
@@ -887,6 +920,7 @@ struct drm_syncobj_transfer {
  #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0)
  #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1)
  #define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE (1 << 2) /* wait for time point to become available */
 +#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE (1 << 3) /* set fence deadline to deadline_nsec */
  struct drm_syncobj_wait {
  	__u64 handles;
  	/* absolute timeout */
@@ -895,6 +929,14 @@ struct drm_syncobj_wait {
  	__u32 flags;
  	__u32 first_signaled; /* only valid when not waiting all */
  	__u32 pad;
 +	/**
 +	 * @deadline_nsec - fence deadline hint
 +	 *
 +	 * Deadline hint, in absolute CLOCK_MONOTONIC, to set on backing
 +	 * fence(s) if the DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE flag is
 +	 * set.
 +	 */
 +	__u64 deadline_nsec;
  };
  struct drm_syncobj_timeline_wait {
@@ -907,6 +949,14 @@ struct drm_syncobj_timeline_wait {
  	__u32 flags;
  	__u32 first_signaled; /* only valid when not waiting all */
  	__u32 pad;
 +	/**
 +	 * @deadline_nsec - fence deadline hint
 +	 *
 +	 * Deadline hint, in absolute CLOCK_MONOTONIC, to set on backing
 +	 * fence(s) if the DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE flag is
 +	 * set.
 +	 */
 +	__u64 deadline_nsec;
  };
  /**

include/drm/drm_mode.h

@@ -957,6 +957,15 @@ struct hdr_output_metadata {
   * Request that the page-flip is performed as soon as possible, ie. with no
   * delay due to waiting for vblank. This may cause tearing to be visible on
   * the screen.
 + *
 + * When used with atomic uAPI, the driver will return an error if the hardware
 + * doesn't support performing an asynchronous page-flip for this update.
 + * User-space should handle this, e.g. by falling back to a regular page-flip.
 + *
 + * Note, some hardware might need to perform one last synchronous page-flip
 + * before being able to switch to asynchronous page-flips. As an exception,
 + * the driver will return success even though that first page-flip is not
 + * asynchronous.
   */
  #define DRM_MODE_PAGE_FLIP_ASYNC 0x02
  #define DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE 0x4

meson.build

@@ -21,7 +21,7 @@
  project(
    'libdrm',
    ['c'],
 -  version : '2.4.119',
 +  version : '2.4.120',
    license : 'MIT',
    meson_version : '>= 0.59',
    default_options : ['buildtype=debugoptimized', 'c_std=c11'],

radeon/radeon_surface.c

@@ -2205,6 +2205,7 @@ static int cik_surface_sanity(struct radeon_surface_manager *surf_man,
          break;
      case RADEON_SURF_MODE_LINEAR_ALIGNED:
      default:
 +        *stencil_tile_mode = SI_TILE_MODE_COLOR_LINEAR_ALIGNED;
          *tile_mode = SI_TILE_MODE_COLOR_LINEAR_ALIGNED;
+     }