- 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

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-amdgpu?expand=0&rev=72
This commit is contained in:
Stefan Dirsch 2023-02-26 18:07:55 +00:00 committed by Git OBS Bridge
parent 6749c22452
commit 45f68256b0
7 changed files with 14 additions and 67 deletions

View File

@ -1,59 +0,0 @@
From 9c959fac3af28d191105f63236096ad456dca614 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc47a1a8854e790270fa5de2fb9dfe8558139b03d8f68ac1057dcd235d572dcc
size 552435

Binary file not shown.

BIN
xf86-video-amdgpu-23.0.0.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Feb 26 18:01:09 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com> Mon Jan 23 11:12:08 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -21,18 +21,17 @@
%define pci_ids_dir %{_sysconfdir}/X11/xorg_pci_ids %define pci_ids_dir %{_sysconfdir}/X11/xorg_pci_ids
%endif %endif
Name: xf86-video-amdgpu Name: xf86-video-amdgpu
Version: 22.0.0 Version: 23.0.0
Release: 0 Release: 0
Summary: AMDGPU video driver for the Xorg X server Summary: AMDGPU video driver for the Xorg X server
License: MIT License: MIT
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
URL: https://xorg.freedesktop.org/ URL: https://xorg.freedesktop.org/
Source: https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.gz Source: https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.xz
Source1: https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.gz.sig Source1: https://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.xz.sig
Source2: %{name}.keyring Source2: %{name}.keyring
Source3: amdgpu.ids Source3: amdgpu.ids
Patch1: N_amdgpu-present-Check-tiling-for-newer-versions-too.patch 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: autoconf >= 2.6.0
BuildRequires: automake BuildRequires: automake
BuildRequires: libtool BuildRequires: libtool
@ -65,7 +64,6 @@ Its autodetects whether your hardware has a CI or newer AMD Graphics Card
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
# We have some -z now related errors during X default startup (boo#1197994): # We have some -z now related errors during X default startup (boo#1197994):