GitLab

There were two problems:

I accidentally changed the variable name in the AC_ARG_WITH stanza from
configdir to xorgconfigdir, so specifying --with-xorg-conf-dir wouldn't
work correctly. Fix this back to configdir.

If neither --with-xorg-conf-dir nor --prefix is specified on the command
line, the $prefix variable doesn't contain "/usr/local" (the default
prefix) yet at this point but "NONE". So make install would attempt to
install 10-amdgpu.conf in ${DESTDIR}NONE/share/X11/xorg.conf.d/ . Fix
this by leaving ${prefix} verbatim in the default value, to be resolved
by make.

Also print the configdir value along with the values of other similar
configuration variables.
Reported-by: Timo Aaltonen <tjaalton@debian.org>
Reviewed-by: Julien Cristau <jcristau@debian.org>
(Cherry picked from commit aa8a3fa2)

We were using the result of `pkg-config --variable=sysconfigdir
xorg-server` before, which may not be inside $prefix, so make install
might fail for 10-amdgpu.conf .

Fixes make distcheck in that case, and possibly also 10-amdgpu.conf
seemingly missing from some distribution packages.

This matches what some (though not all) input drivers are doing for their
xorg.conf.d snippets.

(Cherry picked from commit cd3acb75)

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Acked-by: Edward O'Callaghan <funfunctor@folklore1984.net>
(Cherry picked from commit c4364520)

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
(Cherry picked from commit 2eb5d77b)

Found by comparing src/pcidb/ati_pciids.csv with xf86-video-ati.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
(Cherry picked from commit 7d050d15)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97472Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
(Cherry picked from commit aa549266)

Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
(Cherry picked from commit 73c8dc00)

We need that in amdgpu_dri2_drawable_crtc as well for priv->vblank_delta
to work as intended.

amdgpu_dri2_get_msc was already doing this.

Fixes hangs in some cases when using VDPAU via DRI2 and moving the
window between CRTCs.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
(Cherry picked from commit abd1a790)

Fixes crash with Xinerama enabled, which disables RandR.

Fixes: https://bugs.debian.org/827984

(Ported from radeon commit 3be841d0ae7d505cef325993205b12d15e98dba9)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
(Cherry picked from commit b5e2b964)

Fixes leaking active scanout buffers across a server reset, which also
fixes server reset with glamor and active scanout buffers.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
(Cherry picked from commit d96dabc7)

Fixes corruption when using DRI2 PRIME render offloading with the master
screen using this driver.
Reported-by: Qiang Yu <qiang.yu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Qiang Yu <qiang.yu@amd.com>
(Cherry picked from commit 0007c2f0)

So it can be used outside of the DRI2 code.

v2: Keep pixmap refcnt increment in amdgpu_dri2_create_buffer2 (Qiang Yu)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Qiang Yu <qiang.yu@amd.com> (v1)
(Cherry picked from commit 5518bf5d)

There were two static helpers for the same purpose. Consolidate them
into a single inline helper which can be used anywhere.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Qiang Yu <qiang.yu@amd.com>
(Cherry picked from commit 641f4647)

Retrieves the tiling information about a pixmap BO from the kernel
driver.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Qiang Yu <qiang.yu@amd.com>
(Cherry picked from commit 8e40f190)

Not used anymore.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Qiang Yu <qiang.yu@amd.com>
(Cherry picked from commit e7eeb6ad)

Fixes crash when running a compositor and DRI_PRIME client via DRI2.
Reported-by: Qiang Yu <qiang.yu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Qiang Yu <qiang.yu@amd.com>
(Cherry picked from commit b36c7769)

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(Cherry picked from commit 60ced502)

Signed-off-by: Flora Cui <Flora.Cui@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(Cherry picked from commit 8e89448e)

Signed-off-by: Flora Cui <Flora.Cui@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(Cherry picked from commit a59b23d6)

On multi GPU platform, some screen is created by other GPU DDX.
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
(Cherry picked from commit 97824297)

We need to scan both screens of the entity for existing connectors, and
enumerate DVI & HDMI connectors consistently regardless of which screen
they're assigned to.

Fixes crash when hot-(un)plugging connectors in Zaphod mode.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93415
(Ported from radeon commit c801f9f10a5d72d935faf21e72f7e7808fb4f05f)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
(Cherry picked from commit 14606e12)

Signed-off-by: Flora Cui <flora.cui@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
(Cherry picked from commit 4822ec7a)

Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
(Cherry picked from commit a0bbb373)

Fixes crash when running DRI3 clients with ShadowPrimary enabled.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94799Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

It's now effective for rotation as well.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

If the memory for an entry was allocated at the same address as that for
a previously cancelled entry, the handler could theoretically be called
prematurely, triggered by the DRM event which was submitted for the
cancelled entry.

(Ported from radeon commit 4693b1bd5b5c381e8b7b68a6f7f0c6696d6a68df)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Fixes hangs when attempting to use DRI3 on display connections forwarded
via SSH.

Don't do this for Xorg > 1.18.99.1 since the corresponding xserver
change has landed in Git master.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93261

(Ported from radeon commit 0b3aac1de9db42bfca545fa331e4985836682ec7)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

This reverts commit ea558e64.

It broke VDPAU<->GL interop with DRI3 enabled, because the Gallium VDPAU
code doesn't support DRI3 yet. We can consider re-enabling this once
there is a Mesa release where the Gallium VDPAU code supports DRI3.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94675Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Flora Cui <Flora.Cui@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Flora Cui <Flora.Cui@amd.com>
Reviewed-By: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1.9.0 was released in August 2010.

We were already unintentionally relying on things not available in 1.8
for at least a year, and nobody has complained.

(Ported from radeon commit e592f32f8b5f5873fcc18b10a69dd5e4ccf11073)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Also slightly clean up the error handling in amdgpu_scanout_do_update.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94614

(Ported from radeon commit bde466e5d44cad64b4e4eceaa5de80fdbf86356e)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94214

(Ported from radeon commit d21ac4669a8b2cdd4eec5e5a94d1950b7423b8b5)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

If it's available, Xorg calls it on each mode configuration change. It
does what xf86_reload_cursors does (and more), so we don't need to call
the latter anymore.

(Ported from radeon commit d670c5c9851b4eff21c845d26c7d7e4eb5ee0fa9)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Flipping doesn't interact correctly with SW cursor: A flip makes the SW
cursor disappear. It will only appear again when the cursor is moved,
but it will be surrounded by corruption, because the SW cursor code
will restore stale screen contents at the old cursor location before
drawing the cursor at the new location.

(Ported from radeon commit 7f3d0780ca65a90117c2a61362dbc0899bd9c0b0)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

And add a check for RandR 1.4 multihead.

(Ported from radeon commit 3de480e83c0a1824838d662d6d67c9fe85277298)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>