Commit Graph

292 Commits

Author SHA1 Message Date
Michel Dänzer
82b15a4da1 Skip some initialization steps for GPU screens
Xorg doesn't use the following functionality of GPU screens, so don't
bother initializing it:

* DRI page flipping
* DRI3 / Present / SYNC fences
* XVideo / XvMC
* Root window with background None

(Ported from radeon commit 67ae5e00a748ad52cf92738d401afff2947b1891)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-09 15:47:24 +09:00
Michel Dänzer
fa85331f0c glamor: Use glamor_finish when available
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 18:02:29 +09:00
Hans De Goede
7884e38e94 amdgpu_probe: Do not close server managed drm fds
This fixes the xserver only seeing AMD/ATI devices supported by the amdgpu
driver, as by the time xf86-video-ati gets a chance to probe them, the
fd has been closed.

This fixes e.g. Xorg not seeing the dGPU on a Lenovo Thinkpad E465 laptop
with a CARRIZO iGPU and a HAINAN dGPU.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

v2: Rebased on top of new patch 1.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:58:29 +09:00
Michel Dänzer
a2c360fa1d Refactor amdgpu_kernel_close_fd helper
Preparation for the following change.

Assign pAMDGPUEnt->fd = -1 instead of 0 when we're not using the file
descriptor anymore.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:57:51 +09:00
Michel Dänzer
947017194d glamor: Don't flush in BlockHandler with Xorg >= 1.19
This was only necessary with older versions for driving the FBO cache
expiry mechanism.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:57:25 +09:00
Michel Dänzer
86907a5e4c Only define transform_region for XF86_CRTC_VERSION >= 4
Not used with older versions of Xorg. Fixes warning in that case:

../../src/amdgpu_kms.c:328:1: warning: ‘transform_region’ defined but not used [-Wunused-function]
 transform_region(RegionPtr region, struct pict_f_transform *transform,
 ^~~~~~~~~~~~~~~~

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:56:51 +09:00
Michel Dänzer
8d2b7d1758 Use local implementation of RegionDuplicate for older xserver
It was only added in xserver 1.15. Fixes build against older xserver.

Reported-by: Pali Rohár <pali.rohar@gmail.com>
(Ported from radeon commit 80cc892ee1ce54fad3cb7dd11bd9df18c359136f)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:56:24 +09:00
Michel Dänzer
cd73100114 Don't use pScrn->is_gpu in AMDGPUCreateScreenResources_KMS
Looks like this snuck in accidentally.

Brings us back in line with the radeon driver, and fixes the build
against older versions of xserver which didn't have the is_gpu field
yet.

Fixes: 6bab8fabb3 ("Remove info->dri2.drm_fd and info->drmmode->fd")
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:55:44 +09:00
Michel Dänzer
351baa89b9 Don't call amdgpu_glamor_flush in drmmode_copy_fb
AMDGPUWindowExposures_oneshot takes care of it.

(Ported from radeon commit d63881623f0686a66a2e3e3c1f84e496aa52ec6b)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:55:23 +09:00
Michel Dänzer
ad53635af1 Move DPMS check from amdgpu_scanout_do_update to amdgpu_scanout_flip
When amdgpu_scanout_do_update is called from
drmmode_crtc_scanout_update, drmmode_crtc->pending_dpms_mode may still
be != DPMSModeOn, e.g. during server startup.

Fixes intermittently showing garbage with TearFree enabled.

(Ported from radeon commit cc9d6b7db9c2078be1e530a64af6d517c6a42024)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:55:00 +09:00
Michel Dänzer
378bd05c84 Call drmmode_set_desired_modes from a WindowExposures hook
This is the earliest opportunity where the root window contents are
guaranteed to be initialized, and prevents drmmode_set_mode_major from
getting called before drmmode_set_desired_modes via AMDGPUUnblank ->
drmmode_crtc_dpms. Also, in contrast to the BlockHandler hook, this is
called when running Xorg with -pogo.

Fixes intermittently showing garbage on server startup or after server
reset.

As a bonus, this avoids trouble due to higher layers (e.g. the tigervnc
Xorg module) calling AMDGPUBlockHandler_oneshot repeatedly even after
we set pScreen->BlockHandler = AMDGPUBlockHandler_KMS.

Bugzilla: https://bugs.freedesktop.org/99457
(Ported from radeon commits 0a12bf1085505017068dfdfd31d23133e51b45b9 and
f0e7948e1c0e984fc27f235f365639e9cf628291)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:54:27 +09:00
Michel Dänzer
8d4d73e05c present: Flush before flipping
This isn't necessary for DRI clients, but the Present extension can also
be used for presenting normal pixmaps rendered to via the X11 protocol.

(Ported from radeon commit 9035b6abea557828e672ee455f0c84e43da0906f)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:54:04 +09:00
Michel Dänzer
88725b68ca present: Use async flip for unflip if possible
In that case, unflip operations should finish faster in general.

(Ported from radeon commit 0a4eb0e12f0c9c653cf4cea6fd62e1a507eb261c)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:53:27 +09:00
Michel Dänzer
b31489c086 present: Also flush before using a flip to unflip
Not doing so might result in intermittently scanning out stale contents
of the screen pixmap.

(Ported from radeon commit 9a951a3e551db58ba50e7a594521ceac54d90615)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:53:02 +09:00
Michel Dänzer
f6a3c87c30 present: Wait for GPU idle before setting modes for unflip
To make sure the screen pixmap contents are up to date when it starts
being scanned out.

(Ported from radeon commit 244d4bc7f8c8f6bc90f49556c0b9344c8aa40295)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:52:34 +09:00
Michel Dänzer
012ffffb45 present: Only call drmModeRmFB after setting modes for unflip
Fixes display intermittently blanking when a modeset is used for unflip.

(Ported from radeon commit 3ff29e5a14451916bc66b4e0028e9a317f0723f8)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-07 16:52:14 +09:00
Michel Dänzer
f4719bb473 Use drmmode_crtc_scanout_free in drmmode_fini
We were leaking drmmode_crtc->scanout_damage, which caused trouble on
server reset. Fixes server reset with active separate scanout pixmaps.

(Cherry picked from radeon commit 0c29deb5a97d9a57e994cc0053c49ddf7aca6ecb)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-03 16:19:11 +09:00
Michel Dänzer
af0b24c1ac Allow toggling TearFree at runtime via output property
Option "TearFree" now sets the default value of the output property.
See the manpage update for details.

TearFree is now enabled by default for outputs using rotation or other
RandR transforms, and for RandR 1.4 slave outputs.

(Ported from radeon commit 58cd1600057e41aade0106d4acf78e23eac6e44f)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-03 16:12:26 +09:00
Michel Dänzer
77853f02e5 Factor out drmmode_crtc_scanout_update helper
Cleanup in preparation for following change, no functional change
intended.

(Ported from radeon commit 305e2cbf335837a2ab6a24e9ff65815afe038296)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-03 16:11:54 +09:00
Michel Dänzer
d25cc3b2b3 Factor out amdgpu_prime_dirty_to_crtc helper
Cleanup in preparation for the following change, no functional change
intended.

(Ported from radeon commit 649644a88347a6d03de68f8c41db03a82deeb23b)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-03 16:11:32 +09:00
Michel Dänzer
a6d363008e Don't destroy current FB if drmModeAddFB fails
It would probably result in a black screen.

(Ported from radeon commit 1351e48efe7a2c28eab447e16f36a00fbd02ae48)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-03 16:11:12 +09:00
Michel Dänzer
53926db235 Fix flip event data leak if calloc or drmModeAddFB fails
(Ported from radeon commit 481394e3c9f9f7d88bb66fe9ae8834c87952a8ab)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-03 16:10:07 +09:00
Mihail Konev
45a8ec6257 autogen: add default patch prefix
(Ported from radeon commit 8e6a4e96b7b27559e186f71b5547abb0a80b96dd)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-03 16:09:26 +09:00
Michel Dänzer
ba2aa0a8c1 Handle rotation in the driver also with Xorg 1.12-1.18
We cannot use the HW cursor in that case, but in turn we get more
efficient and less teary updates of rotated outputs.

(Ported from radeon commit f2bc882f1c1082bed9f496cfab6c8f07a76bc122)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-03 16:08:21 +09:00
Michel Dänzer
7f3abf35a2 Fold drmmode_crtc_scanout_allocate into drmmode_crtc_scanout_create
Not used anywhere else anymore.

(Ported from radeon commit ae921a3150f69c38b5b3c88a9e37d54fdf0d5093)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-03 16:07:49 +09:00
Michel Dänzer
03c2db3c67 Call drmmode_crtc_scanout_create in drmmode_crtc_shadow_allocate as well
Calling drmmode_crtc_scanout_allocate in drmmode_crtc_shadow_allocate
resulted in drmmode_crtc_scanout_create called from
drmmode_crtc_shadow_create passing an uninitialized pitch value to
drmmode_create_bo_pixmap.

Fixes issues such as failure to allocate the scanout pixmap or visual
corruption and GPUVM faults when attempting to use rotation with Xorg
<1.19.

Bugzilla: https://bugs.freedesktop.org/99916
Fixes: 5f71238088 ("Pass pitch from drmmode_crtc_scanout_allocate to
                      drmmode_create_bo_pixmap")
(Ported from radeon commit 987a34adb319923ad36e2b47a26837248f187c3e)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-03-02 16:42:04 +09:00
Emil Velikov
49b092563c autogen.sh: use quoted string variables
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-01-26 11:10:12 +09:00
Peter Hutterer
457fcc5935 autogen.sh: use exec instead of waiting for configure to finish
Syncs the invocation of configure with the one from the server.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-01-26 11:09:07 +09:00
Michel Dänzer
5f71238088 Pass pitch from drmmode_crtc_scanout_allocate to drmmode_create_bo_pixmap
Mostly to align with radeon commit
ea30d856ba5e7274c8ea499293b8b0e721b8e082, but also gets rid of a
gbm_bo_get_stride call.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-01-06 17:42:25 +09:00
Jammy Zhou
b5c189473d Use render node for DRI3 if available
Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
[ Second attempt, let's see if there's any fallout this time... ]
2016-12-19 17:20:25 +09:00
Michel Dänzer
edd276185d Simplify drmmode_handle_uevents
No functional change intended.

Reviewed-by: Jim Qu <Jim.Qu@amd.com>
2016-12-15 12:42:44 +09:00
jimqu
732cf4d3a2 udev_monitor_receive_device() will block when hotplug monitor
udev_monitor_receive_device() will block and wait for the event of udev
use select() to ensure that this will not block.

Signed-off-by: JimQu <Jim.Qu@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2016-12-14 11:33:50 +09:00
Michel Dänzer
d60ea478cf Call amdgpu_drm_abort_entry on failure to flip to a scanout pixmap
Fixes leaking the corresponding struct amdgpu_drm_queue list entry in
that case.

(Ported from radeon commit e2942449171fe628a7726e59bcaab65e27d88563)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-12-01 17:04:00 +09:00
Michel Dänzer
aea70298ef Call ValidateGC after ChangeClip in amdgpu_sync_scanout_pixmaps
The wrong order meant that the clipping region wasn't actually applied,
so it always copied the full contents from the other scanout pixmap.

(Ported from radeon commit 14c3f59f5157885ad8f941f0bad6c0c5e3db12f8)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-12-01 17:03:49 +09:00
Michel Dänzer
0f79c30619 Fix amdgpu_scanout_extents_intersect for GPU screens
Fixes incorrect screen updates with TearFree enabled on PRIME slave
outputs which are not located at (0, 0).

(Ported from radeon commit a995f5830916a0fee5126263d1bfe48632be3a15)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-12-01 17:03:33 +09:00
Michel Dänzer
082b6b8ca1 Take current scanout_id into account everywhere involved with TearFree
Fixes various potential issues with TearFree enabled, e.g. outputs
freezing after display configuration changes.

(Ported from radeon commit e543ef3a2fb304cbe3a965fb780632af2e4186f4)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-11-30 16:21:28 +09:00
Michel Dänzer
82729b1f3b Add amdgpu_is_gpu_screen helper
This will hopefully decrease the chance of accidentally breaking the
build against xserver < 1.13 in the future.

(Ported from radeon commit f130b10e63f7526360b41aa0918b4940f63f662a)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-11-28 17:47:17 +09:00
Michel Dänzer
7fe2a8ed67 Don't install Flush/EventCallback for GPU screens
Their purpose is to flush GPU rendering commands corresponding to damage
events, but there can be no damage events corresponding to GPU screen
rendering operations.

(Ported from radeon commits 13c6bc5e382765fe567091e1c616c0a26eec04ca and
487aa62a2a23b86e4ea4714fdfd465c9e513141f)

v2: Squash in radeon fix for build against xserver < 1.13

Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
2016-11-28 17:40:32 +09:00
Michel Dänzer
ff31320644 Make libdrm >= 2.4.72 requirement explicit
And drop compatibility code for older versions.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-11-28 17:39:18 +09:00
Michel Dänzer
f9ba1e8fd4 Use DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags when available
(Ported from radeon commits 1106b2f773ad0611c729b27f4c192a26b43ef1e7
and 5fea5ef2f07eee4a0f94baab427010b936f1d4b4)

v2:
* Squash in radeon fix for TearFree regression
* Remove preprocessor guards for compatibility with libdrm < 2.4.72
  (Emil Velikov)

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-11-22 16:30:59 +09:00
Michel Dänzer
e8aa4e7ea5 Remove generated header files
No longer used.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-11-21 17:58:23 +09:00
Michel Dänzer
d69fd22b6d Stop using AMDGPU(Unique)Chipsets
Use libdrm_amdgpu's amdgpu_get_marketing_name for the chipset name, or
"Unknown AMD Radeon GPU" as a fallback.

v2: Require libdrm_amdgpu >= 2.4.72 for amdgpu_get_marketing_name

Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
2016-11-21 17:55:57 +09:00
Michel Dänzer
8a5ff54af3 Stop using AMDGPUPciChipsets
Not actually used by Xorg.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-11-21 17:55:32 +09:00
Michel Dänzer
298eaf58a5 Remove amdpciids.h
Not useful anymore.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-11-21 17:55:00 +09:00
Michel Dänzer
a0881d55fe Stop using generated amdgpu_device_match
Just match on PCI device ID 0x1002.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-11-21 17:54:26 +09:00
Michel Dänzer
40ddc52b2a Use family information from libdrm_amdgpu / kernel
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-11-21 17:53:43 +09:00
Michel Dänzer
5c9d1c5097 Move struct amdgpu_gpu_info out of amdgpu_get_tile_config
Preparation for the following change, no functional change intended.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2016-11-21 17:51:02 +09:00
Michel Dänzer
adf7dabdf9 Post-release version bump 2016-11-21 17:50:22 +09:00
Michel Dänzer
a000320508 Bump version for 1.2.0 release xf86-video-amdgpu-1.2.0 2016-11-17 15:17:10 +09:00
Michel Dänzer
a446b3af9b manpage updates for the 1.2.0 release
Option "TearFree" is now effective for arbitrary transforms as well.

Point to the amd-gfx mailing list instead of xorg-driver-ati.
2016-11-17 15:13:59 +09:00