diff --git a/U_Use-DRM_CAP_CURSOR_WIDTH-HEIGHT-if-possible.patch b/U_Use-DRM_CAP_CURSOR_WIDTH-HEIGHT-if-possible.patch deleted file mode 100644 index 77fde35..0000000 --- a/U_Use-DRM_CAP_CURSOR_WIDTH-HEIGHT-if-possible.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9c959fac3af28d191105f63236096ad456dca614 Mon Sep 17 00:00:00 2001 -From: Pierre-Eric Pelloux-Prayer -Date: Thu, 29 Sep 2022 16:42:09 +0200 -Subject: [PATCH] Use DRM_CAP_CURSOR_WIDTH/HEIGHT if possible - -There's no need to hardcode the cursor size if the kernel can -report the value it wants. ---- - src/amdgpu_kms.c | 27 ++++++++++++++++++++------- - 1 file changed, 20 insertions(+), 7 deletions(-) - -diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c -index 9364d17..1f049c9 100644 ---- a/src/amdgpu_kms.c -+++ b/src/amdgpu_kms.c -@@ -1501,6 +1501,25 @@ static Bool AMDGPUCreateWindow_oneshot(WindowPtr pWin) - return ret; - } - -+static void amdgpu_determine_cursor_size(int fd, AMDGPUInfoPtr info) -+{ -+ uint64_t value; -+ -+ if (drmGetCap(fd, DRM_CAP_CURSOR_WIDTH, &value) == 0) -+ info->cursor_w = value; -+ else if (info->family < AMDGPU_FAMILY_CI) -+ info->cursor_w = CURSOR_WIDTH; -+ else -+ info->cursor_w = CURSOR_WIDTH_CIK; -+ -+ if (drmGetCap(fd, DRM_CAP_CURSOR_HEIGHT, &value) == 0) -+ info->cursor_h = value; -+ else if (info->family < AMDGPU_FAMILY_CI) -+ info->cursor_h = CURSOR_HEIGHT; -+ else -+ info->cursor_h = CURSOR_HEIGHT_CIK; -+} -+ - /* When the root window is mapped, set the initial modes */ - void AMDGPUWindowExposures_oneshot(WindowPtr pWin, RegionPtr pRegion - #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,16,99,901,0) -@@ -1684,13 +1703,7 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags) - else - pAMDGPUEnt->HasCRTC2 = TRUE; - -- if (info->family < AMDGPU_FAMILY_CI) { -- info->cursor_w = CURSOR_WIDTH; -- info->cursor_h = CURSOR_HEIGHT; -- } else { -- info->cursor_w = CURSOR_WIDTH_CIK; -- info->cursor_h = CURSOR_HEIGHT_CIK; -- } -+ amdgpu_determine_cursor_size(pAMDGPUEnt->fd, info); - - amdgpu_query_heap_size(pAMDGPUEnt->pDev, AMDGPU_GEM_DOMAIN_GTT, - &heap_size, &max_allocation); --- -2.35.3 - diff --git a/xf86-video-amdgpu-22.0.0.tar.gz b/xf86-video-amdgpu-22.0.0.tar.gz deleted file mode 100644 index ba6f349..0000000 --- a/xf86-video-amdgpu-22.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc47a1a8854e790270fa5de2fb9dfe8558139b03d8f68ac1057dcd235d572dcc -size 552435 diff --git a/xf86-video-amdgpu-22.0.0.tar.gz.sig b/xf86-video-amdgpu-22.0.0.tar.gz.sig deleted file mode 100644 index c63b915..0000000 Binary files a/xf86-video-amdgpu-22.0.0.tar.gz.sig and /dev/null differ diff --git a/xf86-video-amdgpu-23.0.0.tar.xz b/xf86-video-amdgpu-23.0.0.tar.xz new file mode 100644 index 0000000..4a90307 --- /dev/null +++ b/xf86-video-amdgpu-23.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f04f0ea66f3ced0dcc58f617409860163a19c4e8c285cfb5285f36ba09cc061 +size 381268 diff --git a/xf86-video-amdgpu-23.0.0.tar.xz.sig b/xf86-video-amdgpu-23.0.0.tar.xz.sig new file mode 100644 index 0000000..55eafb2 Binary files /dev/null and b/xf86-video-amdgpu-23.0.0.tar.xz.sig differ diff --git a/xf86-video-amdgpu.changes b/xf86-video-amdgpu.changes index f2daa6d..cb3faa3 100644 --- a/xf86-video-amdgpu.changes +++ b/xf86-video-amdgpu.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Feb 26 18:01:09 UTC 2023 - Stefan Dirsch + +- Update to version 23.0.0 + * bugfix release, see also for more details here: + https://lists.x.org/archives/dri-devel/2023-February/392659.html +- supersedes U_Use-DRM_CAP_CURSOR_WIDTH-HEIGHT-if-possible.patch + ------------------------------------------------------------------- Mon Jan 23 11:12:08 UTC 2023 - Stefan Dirsch diff --git a/xf86-video-amdgpu.spec b/xf86-video-amdgpu.spec index 2b18ac1..6441c1d 100644 --- a/xf86-video-amdgpu.spec +++ b/xf86-video-amdgpu.spec @@ -21,18 +21,17 @@ %define pci_ids_dir %{_sysconfdir}/X11/xorg_pci_ids %endif Name: xf86-video-amdgpu -Version: 22.0.0 +Version: 23.0.0 Release: 0 Summary: AMDGPU video driver for the Xorg X server License: MIT Group: System/X11/Servers/XF86_4 URL: https://xorg.freedesktop.org/ -Source: https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.gz -Source1: https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.gz.sig +Source: https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.xz +Source1: https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.xz.sig Source2: %{name}.keyring Source3: amdgpu.ids Patch1: N_amdgpu-present-Check-tiling-for-newer-versions-too.patch -Patch2: U_Use-DRM_CAP_CURSOR_WIDTH-HEIGHT-if-possible.patch BuildRequires: autoconf >= 2.6.0 BuildRequires: automake BuildRequires: libtool @@ -65,7 +64,6 @@ Its autodetects whether your hardware has a CI or newer AMD Graphics Card %prep %setup -q %patch1 -p1 -%patch2 -p1 %build # We have some -z now related errors during X default startup (boo#1197994):