Commit Graph

515 Commits

Author SHA1 Message Date
Adam Jackson
edcbe5f52d Fix link failure with gcc 10
Without the 'extern' this looks like a definition not just a
declaration, in every file that includes the header. gcc 10 is stricter
about this kind of multiple definition.
2020-02-05 11:08:33 -05:00
Adam Jackson
fd66f5c0be kms: Handle changes to SourceValidate call chain in xserver 19
xserver 19 expects the SourceValidate hook to always be filled in with
something valid. For earlier servers it's harmless to simply fill this
in with a do-nothing function instead of NULL.

Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
2019-11-22 17:29:37 +01:00
Michel Dänzer
b467d2569a Bump version for the 19.1.0 release xf86-video-amdgpu-19.1.0 2019-10-11 17:10:10 +02:00
Michel Dänzer
a1b7263277 Don't unreference FBs of pixmaps from different screens in LeaveVT
FindClientResourcesByType finds pixmaps from all screens, but trying to
process ones from other screens here makes no sense and likely results
in a crash or memory corruption.

Fixes: c16ff42f92 ("Make all active CRTCs scan out an all-black
                      framebuffer in LeaveVT")
(Ported from radeon commit 2faaecc69b127248718e759c6c98c84d56dd1b6b)
2019-09-26 15:56:59 +02:00
Michel Dänzer
5b8bc9fc50 Don't set up black scanout buffer if LeaveVT is called from CloseScreen
Avoids a crash described in
https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/merge_requests/43#note_223718

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2019-09-18 12:55:45 +02:00
Michel Dänzer
e6fce59a07 present: Don't check pixmap pitch in check_flip with non-DC >= 3.34
The current non-DC kernel driver also handles flipping between different
pitches correctly.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-08-07 18:11:54 +02:00
Michel Dänzer
5bb2580b26 present: Don't check pixmap pitch in check_flip with current DC
Current DC handles flipping between different pitches correctly.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-08-07 18:11:20 +02:00
Michel Dänzer
ac66086613 present: Also check pixmap pitch in check_flip with current xserver
The corresponding check in the xserver Present code was removed again,
because flipping between different pitches can work in some cases.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-08-07 18:04:52 +02:00
Michel Dänzer
98f172eb2d gitlab-ci: Use templates from wayland/ci-templates
These are already used by xserver, Mesa and some other projects.

Current Debian testing brings e.g. GCC 8.3.0 and clang 7.0.1.
2019-07-30 09:43:31 +02:00
Michel Dänzer
87f41ace49 Don't disable page flipping completely with SW cursor
Even with SW cursor, page flipping can be used while no X cursor is
visible.

Occurred to me in the context of xorg/xserver#828.
2019-07-05 12:43:53 +02:00
Michel Dänzer
7d3fef72e0 present: Check that we can get a KMS FB for flipping
This can legitimately fail if the pixmap's storage is shared from
another device, e.g. when using PRIME render offloading.
2019-06-25 15:28:36 +00:00
Michel Dänzer
ea19a52070 Remove dri2_drawable_crtc parameter consider_disabled
All callers were passing TRUE.

Reviewed-and-tested-by: Flora Cui <flora.cui@amd.com>
2019-06-14 11:09:19 +02:00
Michel Dänzer
3109f088fd dri2: Re-use previous CRTC when possible if pick_best_crtc returns NULL
This way, the MSC will continue ticking at the rate of (the last mode
which was enabled for) that CRTC, instead of the client running
unthrottled.

Reviewed-and-tested-by: Flora Cui <flora.cui@amd.com>
2019-06-14 11:07:32 +02:00
Flora Cui
fb06fb8147 dri2: reply to client for WaitMSC request in any case
otherwise client would wait for reply forever and desktop appears hang.

Signed-off-by: Flora Cui <flora.cui@amd.com>
Acked-by: Feifei Xu <Feifei.Xu@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2019-06-10 09:45:03 +08:00
Michel Dänzer
4b17533fcb dri3: Always flush glamor before sharing pixmap storage with clients
Even if glamor_gbm_bo_from_pixmap / glamor_fd_from_pixmap themselves
don't trigger any drawing, there could already be unflushed drawing to
the pixmap whose storage we share with a client.
2019-04-30 17:50:15 +02:00
Michel Dänzer
bf61e6d7ac Retry get_fb_ptr in get_fb
If get_fb_ptr returns NULL, try again after pixmap_get_handle, it should
work then.

Fixes spurious Present page flipping failures using "normal" pixmaps
which aren't shared with direct rendering clients, e.g. with a
compositor using the RENDER extension.

Bugzilla: https://bugs.freedesktop.org/110417
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2019-04-18 19:21:40 +02:00
Michel Dänzer
bd4ffd4ebb Bump version for the 19.0.1 release xf86-video-amdgpu-19.0.1 2019-03-19 18:44:31 +01:00
Dave Airlie
6ee8577261 modesetting: add tile property support
This adds tiling support to the driver, it retrieves the tile info from
the kernel and translates it into the server format and exposes the
property.

(Ported from xserver commits 8fb8bbb3062f1a06621ab7030a9e89d5e8367b35
 and 6abdb54a11dac4e8854ff94ecdcb90a14321ab31)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2019-03-07 16:25:19 +01:00
Michel Dänzer
9534bf3bb3 Bump version for the 19.0.0 release xf86-video-amdgpu-19.0.0 2019-03-06 12:05:49 +01:00
Michel Dänzer
a2b32e72fd present: Don't check tiling parameters with DC & DRM minor version >= 31
Current DC handles any changes of tiling parameters for flips.

v2:
* Just check all tiling bits if DRM minor < 31 or DC is disabled.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-03-04 17:39:27 +01:00
Michel Dänzer
2798244be7 Make drmmode_cm_enabled an inline function
So that it can be used outside of drmmode_display.c as well.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-03-04 17:39:12 +01:00
Michel Dänzer
72653455e4 Revert "Remove set but unused amdgpu_dri2::pKernelDRMVersion"
This reverts commit 720a61000a.

We're going to make use of it now.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-03-04 17:31:45 +01:00
Michel Dänzer
28cd209ebf Revert "gitlab-ci: Only run docker-image stage if relevant source files change"
This reverts commit 9c23076b9e.

Some scenarios have come to light where this failed to ensure the docker
image exists:

* If the master branch of a forked repository is used for an MR which
  doesn't modify .gitlab-ci.yml, the docker-image job may not run.
* If the docker-image job of the first pipeline in a forked repository
  is cancelled or fails for any reason, and .gitlab-ci.yml isn't
  modified for the next pipeline run.
2019-03-01 10:09:21 +00:00
Michel Dänzer
09be74a3d1 dri2: Call drm_queue_handle_deferred in dri2_deferred_event
drm_queue_handler just puts the event on the signalled list; without
calling drm_queue_handle_deferred, actual processing of the event may be
delayed indefinitely, e.g. until another event arrives from the kernel.

This could result in DRI2 clients hanging during DPMS off.

Fixes: 739181c8d3 "Add amdgpu_drm_handle_event wrapper for
                      drmHandleEvent"
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Tested-by: Aaron Liu <aaron.liu@amd.com>
2019-03-01 09:53:38 +00:00
Michel Dänzer
a636f42b49 present: Check that flip and screen pixmap pitches match
If they don't, flipping will result in corrupted display.

Test case:

* Run Xorg at 1920x1080 with no window manager
* glxgears -geometry 2048x1080

The Present extension code in xserver 1.21 will check for this.

Tested-by: Jax Lin <jax.lin@amd.com>
2019-02-27 18:43:27 +01:00
Michel Dänzer
bd090f389f Call amdgpu_present_set_screen_vrr from amdgpu_vrr_property_update
If the window is currently flipping.

This might make a difference when the property gets disabled: Variable
refresh will now be disabled immediately in that case, instead of only
when the window can no longer use page flipping at all.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-02-22 17:45:04 +01:00
Michel Dänzer
d9be5d712d Make use of property request wrappers for VRR property
Instead of scanning for PropertyNotify events. Reasons:

* Works even if no client listens to PropertyNotify events for the
  window.
* No overhead on delivery of unrelated events, and no overhead at all
  if Option "VariableRefresh" is disabled.

v2:
* Use shorter variable name amdgpu_vrr_atom.
* Call MakeAtom regardless of info->instance_id, for robustness vs VRR
  being enabled in some but not all AMDGPU screens.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-02-22 17:44:30 +01:00
Michel Dänzer
ef8fbe33b7 Wrap change/delete window property request handlers
Preparation for the following change.

v2:
* Add comments explaining what the wrappers are wrapping.
* Use global amdgpu_property_vectors_wrapped to keep track of whether
  the vectors need to be (un)wrapped, for robustness against VRR being
  enabled in some but not all AMDGPU screens.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-02-20 17:57:16 +01:00
Michel Dänzer
09a45ff8fe Don't enable the VRR support code for GPU screens
Windows aren't associated with GPU screens, and amdgpu_present_flip is
never called for them, so VRR can never actually be enabled for them.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-02-20 16:37:13 +01:00
Michel Dänzer
2a3d00dc7e Don't register a window private if VRR is disabled
It's not used in that case.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
2019-02-12 18:58:23 +01:00
Michel Dänzer
5f91be77e0 gitlab-ci: Don't rely on $CI_PROJECT_NAME
The name of a forked repository can be changed later, in which case this
would fail to refer to the main repository.

Pointed out by Eric Engestrom in
https://gitlab.freedesktop.org/mesa/mesa/merge_requests/224 .
2019-02-11 18:32:07 +01:00
Michel Dänzer
9c23076b9e gitlab-ci: Only run docker-image stage if relevant source files change
Otherwise there's normally no need to run it. It will also run when a
new branch is created, which ensures that the docker image always exists
(e.g. in a newly forked repository).

Inspired by https://gitlab.freedesktop.org/mesa/mesa/merge_requests/143
2019-02-07 17:35:13 +01:00
Michel Dänzer
9045fb310f Keep waiting for a pending flip if drm_handle_event returns 0
drm_wait_pending_flip stopped waiting if drm_handle_event returned 0,
but that might have processed only some unrelated DRM events. As long as
the flip is pending, we have to keep waiting for its completion event.

Noticed while working on the previous fix.

Acked-by: Alex Deucher <alexander.deucher@amd.com>
2019-01-25 17:54:53 +01:00
Michel Dänzer
3ff2cc225f Call drmHandleEvent again if it was interrupted by a signal
drmHandleEvent can be interrupted by a signal in read(), in which case
it doesn't process any events but returns -1, which
drm_handle_event propagated to its callers. This could cause the
following failure cascade:

1. drm_wait_pending_flip stopped waiting for a pending flip.
2. Its caller cleared drmmode_crtc->flip_pending before the flip
   completed.
3. Another flip was attempted but got an unexpected EBUSY error because
   the previous flip was still pending.
4. TearFree was disabled due to the error.

The solution is to call drmHandleEvent if it was interrupted by a
signal. We can do that in drm_handle_event, because when that is called,
either it is known that there are events ready to be processed, or the
caller has to wait for events to arrive anyway.

v2:
* Use ErrorF instead of xf86DrvMsg with hard-coded screen 0.

Bugzilla: https://bugs.freedesktop.org/109364
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> # v1
2019-01-25 17:49:52 +01:00
Michel Dänzer
e72a02ba1d Only update drmmode_crtc->flip_pending after actually submitting a flip
And only clear it if it matches the framebuffer of the completed flip
being processed.

Fixes

 (WW) AMDGPU(0): flip queue failed: Device or resource busy
 (WW) AMDGPU(0): Page flip failed: Device or resource busy
 (EE) AMDGPU(0): present flip failed

due to clobbering drmmode_crtc->flip_pending.

Reproducer: Enable TearFree, run warzone2100 fullscreen, toggle
Vertical sync on/off under Video Options. Discovered while investigating
https://bugs.freedesktop.org/109364 .

Acked-by: Alex Deucher <alexander.deucher@amd.com>
2019-01-17 11:34:04 +01:00
Michel Dänzer
a1b479c7d0 Don't allow TearFree scanout flips to complete in the same vblank period
We were using a relative target of 0, meaning "complete the flip ASAP".
This could result in the flip sometimes, but not always completing in
the same vertical blank period where the corresponding drawing occurred,
potentially causing judder artifacts with applications updating their
window contents synchronized to the display refresh. A good way to test
this is the vsynctester.com site in a windowed browser, where the judder
results in the large "VSYNC" text intermittently appearing red or cyan
instead of the expected gray.

To avoid this, use a relative target MSC of 1, meaning that if a
vertical blank period is in progress, the flip will only complete in the
next one.

Reported by Julian Tempel and Brandon Wright in
https://bugs.freedesktop.org/106175 .

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2019-01-16 18:39:56 +01:00
Michel Dänzer
bf326f2ea1 glamor: Avoid glamor_create_pixmap for pixmaps backing windows
If the compositing manager uses direct rendering (as is usually the case
these days), the storage of a pixmap allocated by glamor_create_pixmap
needs to be reallocated for sharing it with the compositing manager.
Instead, allocate pixmap storage which can be shared directly.

Acked-by: Alex Deucher <alexander.deucher@amd.com>
2019-01-16 18:39:11 +01:00
Michel Dänzer
ebd32b1c07 dri2: Flush in dri2_create_buffer2 after calling glamor_set_pixmap_bo
To make sure the client can't use the shared pixmap storage for direct
rendering first, which could produce garbage.

Bugzilla: https://bugs.freedesktop.org/109235
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2019-01-16 18:38:40 +01:00
Michel Dänzer
d168532ee7 dri3: Flush if necessary in dri3_fd_from_pixmap
To make sure the client can't use the shared pixmap storage for direct
rendering first, which could produce garbage.

Bugzilla: https://bugs.freedesktop.org/109235
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2019-01-11 18:04:26 +01:00
Michel Dänzer
2058c4c469 Only call drmmode_validate_leases if RandR is enabled
It would crash if RandR is disabled, e.g. because Xinerama is enabled.

Bugzilla: https://bugs.freedesktop.org/109230
(Ported from radeon commit b1c01698f577577e4a88bad0ae08fb5d998e7ebb)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2019-01-10 17:25:05 +01:00
Michel Dänzer
f3c0939a0c Only call drmmode_uevent_init if RandR is enabled
There's no point in listening for hotplug events if RandR is disabled,
as there's no other mechanism for them to be propagated. We were already
mostly ignoring them in that case.

Inspired by
1a489142c8
(via https://bugs.freedesktop.org/109230#c11).
(Ported from radeon commit 38db1bbcfc019c92884c7819a6630c70e543f6b2)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2019-01-10 17:00:12 +01:00
Michel Dänzer
f3ddda618e gitlab-ci: Use kaniko instead of docker-in-docker for image generation
kaniko can also work in unprivileged runners.

Based on v2 of
https://gitlab.freedesktop.org/xorg/xserver/merge_requests/92 .
Acked-by: Alex Deucher <alexander.deucher@amd.com>
2018-12-20 10:28:32 +01:00
Michel Dänzer
b689dc5081 Remove superfluous vrr_flipping field and clean up related code
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-12-20 10:08:13 +01:00
Michel Dänzer
233a0be82d Don't clear info->flip_window in present_unflip
present_unflip can get called between present_check_flip and
present_flip, in which case the latter would pass a NULL WindowPtr to
the former, resulting in a crash.

present_flip should never get called for a window which has already been
destroyed, so there's no need to clear info->flip_window.

Bugzilla: https://bugs.freedesktop.org/109067
Fixes: 2d18b37159 "Check last flip window instead of screen root
                      before flipping"
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-12-19 18:56:37 +01:00
Mario Kleiner
d4eab5d108 Fix crash when page flipping in multi-X-Screen/Zaphod mode
amdgpu_do_pageflip() indexed the flipdata->fb[] array
indexing over config->num_crtc, but the flip completion
routines, e.g., drmmode_flip_handler(), index that array
via the crtc hw id from drmmode_get_crtc_id(crtc).

This is mismatched and causes indexing into the wrong
array slot at flip completion -> Server crash.

Always use drmmode_get_crtc_id(crtc) for indexing into
the array to fix this.

Tested on a dual-X-Screen setup with one video output
assigned to each X-Screen, page-flipping an OpenGL app
on either of both X-Screens. This used to crash when
flipping on X-Screen 1, now it doesn't anymore.

Fixes: 9b6782c821 "Store FB for each CRTC in drmmode_flipdata_rec"
(Ported from radeon commit 0058fd2ebf4c900b12f129984e98886a7ac84b2f)
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
2018-12-19 18:03:27 +01:00
Michel Dänzer
0d60233d26 Use two HW cursor buffers per CRTC
Switch to the other buffer when xf86_config->cursor changes. Avoids
these issues possible when re-using the same buffer:

* The HW may intermittently display a mix of the old and new cursor
  images.
* If the hotspot changes, the HW may intermittently display the new
  cursor image at the location corresponding to the old image's hotspot.

Bugzilla: https://bugs.freedesktop.org/108832
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-12-13 12:40:40 +01:00
Michel Dänzer
b04697de52 Update cursor position in drmmode_show_cursor if hotspot changed
The cursor position is updated to be consistent with the new hotspot in
the same ioctl call.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-12-13 12:40:03 +01:00
Michel Dänzer
b344e1559e Use drmIoctl in drmmode_show_cursor
This should be functionally equivalent to what drmModeSetCursor(2) do
behind the scenes, but allows for new tricks in following changes.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-12-13 12:39:16 +01:00
Michel Dänzer
e95044e453 Drop AMDGPUInfoRec::cursor_buffer array
Not needed or even useful for anything.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-12-13 12:38:40 +01:00
Michel Dänzer
13c85e8a13 Don't use GBM for allocating HW cursor BOs
GBM doesn't really buy us anything for the cursor BOs. This simplifies
the code and following changes.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-12-13 12:37:56 +01:00