summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2018-03-05Only change Set/MoveCursor hooks from what we expectMichel Dänzer
Since xf86CursorCloseScreen runs after RADEONCloseScreen_KMS, PointPriv->spriteFuncs doesn't point to the same struct in the latter as in RADEONCursorInit_KMS. So we were restoring info->Set/MoveCursor to the wrong struct. Then in the next server generation, info->Set/MoveCursor would end up pointing to drmmode_sprite_set/move_cursor, resulting in an infinite loop if one of them was called. To avoid this, only change the Set/MoveCursor hooks if their values match our expectations, otherwise leave them as is. This is kind of a hack, but the alternative would be invasive and thus risky changes to the way we're wrapping CloseScreen, and it's not even clear that can work without changing xserver code. Fixes: 1fe8ca75974c ("Keep track of how many SW cursors are visible on each screen") Acked-by: Alex Deucher <alexander.deucher@amd.com>
2018-03-02modesetting: Update property values at detect and uevent timeKeith Packard
We were updating the link-status property when a uevent came in, but we also want to update the non-desktop property, and potentially others as well. We also want to check at detect time in case we don't get a hotplug event. This patch updates every property provided by the kernel, sending changes to DIX so it can track things as well. Signed-off-by: Keith Packard <keithp@keithp.com> (Ported from amdgpu commit 374cb8fef4fdbb648af089ee80803ec78321f1b2)
2018-03-02modesetting: Reset output_id if drmModeGetConnector failedDaniel Martin
If drmModeGetConnector() fails in drmmode_output_detect(), we have to reset the output_id to -1 too. Yet another spot leading to a potential NULL dereference when handling the mode_output member as output_id was != -1. Though, this case should be very hard to hit. Signed-off-by: Daniel Martin <consume.noise@gmail.com> (Ported from amdgpu commit 10054b6c3d9a755b30abb43020121b9631fa296d)
2018-03-02modesetting: Use helper to fetch drmModeProperty(Blob)sDaniel Martin
Replace the various loops to lookup drmModeProperty(Blob)s by introducing helper functions. Signed-off-by: Daniel Martin <consume.noise@gmail.com> (Ported from amdgpu commit fb58e06acd6c6bd59de2dbdadbca27eb1dd0025b)
2018-03-02Disable all unused CRTCs before setting desired modesMichel Dänzer
This might avoid modeset failures in some cases where a CRTC which isn't used by Xorg was enabled before. (Ported from amdgpu commit e3aae7a24296f640c0153d1459f3e0820485468a) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-02-16Don't bail from drmmode_set_desired_modes immediatelyMichel Dänzer
If we fail to find or set the mode for a CRTC, keep trying for the remaining CRTCs, and only return FALSE if we failed for all CRTCs that should be on. (Ported from amdgpu commit f5ac5f385f41d1547cfd7ccc8bb35a537a8fffeb)
2018-02-15Simplify depth 30 "kernel too old" error messageMichel Dänzer
We know it's depth 30, no need to have xf86DrvMsg fill it in. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-02-15If glamor is too old for depth 30, fall back to EXA or ShadowFBMichel Dänzer
Instead of not starting up at all. Corresponding to amdgpu commit 37c7260bdef3a53b0f0295a531f33938e9aad8cf. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-02-15Call RADEONFreeRec from RADEONFreeScreen_KMS even if info == NULLMichel Dänzer
It's safe now. (Ported from amdgpu commit c9bd1399a13cea2e1331af2c826ca054b88db071) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-02-15Don't call RADEONFreeRec from RADEONPreInit_KMSMichel Dänzer
If the latter fails, Xorg will call RADEONFreeScreen_KMS, which calls the former. (Ported from amdgpu commit 103b7285845b786929fb509083c57e074c48f9be) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-02-15Don't use RADEONEntPriv in RADEONFreeRecMichel Dänzer
It crashes if info == NULL. (Ported from amdgpu commits fb8444e731765588c0ff1e9053c1c7b73f5f0907 & cfccf4c4e7e5c73fe4040fabeb1b43283cf29b33) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-02-14glamor: Allow depth 30 with Xorg >= 1.19.99.1Michel Dänzer
Corresponding to amdgpu commit 6aee5770fb913713bb1b9a1af8f0d0892a66f21a. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2018-01-25Always use screen depth/bpp for KMS framebuffersMichel Dänzer
DRI clients can use depth 32 pixmaps while the screen is depth 24, in which case page flipping would fail. Reported-by: Mario Kleiner <mario.kleiner.de@gmail.com> Reviewed-and-Tested-by: Mario Kleiner <mario.kleiner.de@gmail.com>
2018-01-25Make XvMC extension initialize at depth 30.Mario Kleiner
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2018-01-25Add missing depth 30 -> cpp=4 handling for DRI2.Mario Kleiner
Missing this apparently didn't cause any ill side effects, only a bit of confusion when looking at xtrace's of DRI2 clients. Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2018-01-22Support exa screen color depth 30 on Linux 3.16 and later. (v2)Mario Kleiner
Linux 3.16's radeon-kms introduced 10 bpc fb support. Currently, as of X-Server 1.19, this works with exa accel, but not yet when using glamor acceleration. v2: Style fixes, check for glamor first, as suggested by Michel. Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2018-01-22exa: Accelerate ARGB2101010 picturesFredrik Höglund
Tested by Mario on a Radeon HD 4000 series for the r600 exa path, and on Radeon HD 5770 for the evergreen exa path. Signed-off-by: Fredrik Höglund <fredrik@kde.org> Reviewed-and-Tested-by: Mario Kleiner <mario.kleiner.de@gmail.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2018-01-22Skip xf86HandleColormaps() at color depth 30. (v2)Mario Kleiner
The hardware gamma luts get bypassed at color depth 30 anyway, so skip their setup. v2: Also don't hook up drmmode_crtc_gamma_set() to .gamma_set for a screen with depth 30, so the server can spare itself the effort of updating and setting unused cluts. Suggested by Michel. Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2018-01-22Define per x-screen individual drmmode_crtc_funcsMario Kleiner
This allows to en-/disable some functions depending on individual screen settings. Prep work for more efficient depth 30 support. Suggested-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2017-12-28Keep track of how many SW cursors are visible on each screenMichel Dänzer
And use this to determine when we cannot use page flipping for DRI clients. We previously did this based on whether the HW cursor cannot be used on at least one CRTC, which had at least two issues: * Even while the HW cursor cannot be used, no SW cursor may actually be visible (e.g. because all cursors are disabled), in which case we can use page flipping for DRI clients anyway * Even while the HW cursor can be used, there may be SW cursors visible from non-core pointer devices, in which case we cannot use page flipping for DRI clients anyway (Ported from amdgpu commit 69e20839bfeb3ee0b0a732d72de0a32d6c5435fc) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-12-27Move cursor related ScreenInit calls into RADEONCursorInit_KMSMichel Dänzer
And bail if xf86_cursors_init fails. (Ported from amdgpu commit dfccaa7043ccb157a1f8be7313123792bb7e7001) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-12-01Add radeon_dirty_src_drawable helperMichel Dänzer
Allows tidying up radeon_dirty_src_equals and redisplay_dirty slightly. (Cherry picked from amdgpu commit 1d65ac395971571094df21ca0408d5972c6b56ec) Acked-by: Alex Deucher <alexander.deucher@amd.com>
2017-11-27Fix non GLAMOR buildJoakim Tjernlund
Non GLAMOR builds needs pRADEONEnt so move the USE_GLAMOR define down to make pRADEONEnt defined in this case. Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2017-11-15Use correct ScrnInfoPtr in redisplay_dirtyMichel Dänzer
We used the destination pixmap's screen for flushing drawing commands. But when we are the master screen, the destination pixmap is from the slave screen. Fixes crash when the slave screen isn't using the same acceleration architecture as us. Bugzilla: https://bugs.freedesktop.org/103613 Fixes: 01b040b4a807 ("Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr") (Ported from amdgpu commit 3a4f7422913093ed9e26b73ecd7f9e773478cb1e) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-11-01modesetting: Check crtc before searching link-status propertyDaniel Martin
No need to lookup the link-status property if we don't have a crtc. Signed-off-by: Daniel Martin <consume.noise@gmail.com> (Ported from xserver commit 8d7f7e24261e68459e6f0a865e243473f65fe7ad) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-10-30modesetting: Skip no-longer-present connectors when resetting BAD linksKeith Packard
Outputs may have NULL mode_output (connector) pointers if the connector disappears while the server is running. Skip these when resetting outputs with BAD link status. (Ported from xserver commit 37f4e7651a2fd51efa613a08a1e705553be33e76) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-10-30Always call drmModeFreeProperty after drmModeGetPropertyMichel Dänzer
We were not doing so in all cases, leaking memory allocated by the latter. (Cherry picked from amdgpu commit f6b39bcd45cb06976ba8a3600df77fc471c63995) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-10-30Call TimerFree for timer created in LeaveVTMichel Dänzer
We were leaking the memory allocated by TimerSet. (Ported from amdgpu commit 84aad09f18fed6b52b0c073f0bbd675a6de07807) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-10-30Free memory returned by xf86GetEntityInfoMichel Dänzer
We were leaking it. (Ported from amdgpu commit cfccf4c4e7e5c73fe4040fabeb1b43283cf29b33) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-10-20Free pRADEONEnt memory in RADEONFreeRecMichel Dänzer
We were leaking it. (Inspired by amdgpu commit 9d84934309e4ccd9a43c73d958b8ff10ef2fc990) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-10-20Unreference pixmap's FB with EXA as well in radeon_set_pixmap_boMichel Dänzer
Not doing so resulted in DRI2 page flips not actually changing the FB being scanned out, showing intermittent flicker of the "back" buffer rendering. Bugzilla: https://bugs.freedesktop.org/102643 Fixes: 55e513b978b2 "Use reference counting for tracking KMS framebuffer lifetimes" Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-10-04Bail if there's a problem with ShadowFBMichel Dänzer
If we hit a problem while setting up ShadowFB, just carrying on trying to set up HW acceleration instead is unlikely to work. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-10-03Fix VT switching with ShadowFBMichel Dänzer
We were trying to call acceleration specific functions from LeaveVT. Instead, memset the scanout buffer to all 0 in LeaveVT and allocate a new one in EnterVT. Bugzilla: https://bugs.freedesktop.org/102948 Fixes: 06a465484101 ("Make all active CRTCs scan out an all-black framebuffer in LeaveVT") Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-30Require xserver >= 1.13Michel Dänzer
xserver 1.13.0 was released on September 6th, 2012, almost 5 years ago. This allows cleaning up a bunch of backwards compatibility code. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2017-08-29Use a timer for unreferencing the all-black FBMichel Dänzer
The timer fires 1 second after LeaveVT. This gives the next DRM master enough time to set up scanout of its own buffers. Fixes prolonged intermittent black screen when switching from Xorg to e.g. the GDM Wayland mode login VT. Fixes: 06a465484101 ("Make all active CRTCs scan out an all-black framebuffer in LeaveVT") Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-29Remove drmmode_scanout_freeMichel Dänzer
Not used anymore. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-29Make all active CRTCs scan out an all-black framebuffer in LeaveVTMichel Dänzer
And destroy all other FBs. This is so that other DRM masters can only get access to this all-black FB, not to any other FB we created, while we're switched away and not DRM master. Fixes: 55e513b978b2 ("Use reference counting for tracking KMS framebuffer lifetimes") Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-29Create radeon_master_screen helperMichel Dänzer
Preparatory, no functional change intended yet. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-29Create radeon_pixmap_get_fb_ptr helperMichel Dänzer
Preparatory, no functional change intended yet. Also inline radeon_pixmap_create_fb into radeon_pixmap_get_fb, since there's only one call-site anymore. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-29Create drmmode_set_mode helperMichel Dänzer
Preparatory, no functional change intended yet. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-23Create radeon_pixmap_clear helperMichel Dänzer
Preparatory, no functional change intended yet. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-18modesetting: re-set the crtc's mode when link-status goes BADMartin Peres
Despite all the careful planning of the kernel, a link may become insufficient to handle the currently-set mode. At this point, the kernel should mark this particular configuration as being broken and potentially prune the mode before setting the offending connector's link-status to BAD and send the userspace a hotplug event. This may happen right after a modeset or later on. Upon receiving a hot-plug event, we iterate through the connectors to re-apply the currently-set mode on all the connectors that have a link-status property set to BAD. The kernel may be able to get the link to work by dropping to using a lower link bpp (with the same display bpp). However, the modeset may fail if the kernel has pruned the mode, so to make users aware of this problem a warning is outputed in the logs to warn about having a potentially-black display. This patch does not modify the current behaviour of always propagating the events to the randr clients. This allows desktop environments to re-probe the connectors and select a new resolution based on the new (currated) mode list if a mode disapeared. This behaviour is expected in order to pass the Display Port compliance tests. (Ported from xserver commit bcee1b76aa0db8525b491485e90b8740763d7de6) [ Michel: Bump libdrm dependency to >= 2.4.78 for DRM_MODE_LINK_STATUS_BAD ] Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-17Make radeon_scanout_do_update take a PixmapPtr instead of a DrawablePtrMichel Dänzer
All callers were already passing in a pixmap. This allows simplifying the rotated scanout case slightly. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-17Use xorg_list_append for the DRM event listMichel Dänzer
We were adding entries at the start of the list, i.e. the list was ordered from most recently added to least recently added. However, the corresponding DRM events are generally expected to arrive in the same order as they are queued, which means that radeon_drm_queue_alloc would generally have to traverse the whole list to find the entry corresponding to an arrived event. Fix this by adding entries at the end of the list. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-17Consolidate radeon_scanout_flip_abort/handler helpersMichel Dänzer
While at it, make them use crtc->driver_private. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-17Always allow DRI2 page flipping with TearFreeMichel Dänzer
Even if TearFree is enabled for the CRTC we're synchronizing to. v2: * Move manpage hunk here from previous change. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> # v1
2017-08-17Always allow Present page flipping with TearFreeMichel Dänzer
Even if TearFree is active for the the CRTC we're synchronizing to. In that case, for Present flips synchronized to vertical blank, the other scanout buffer is immediately synchronized and flipped to during the target vertical blank period. For Present flips not synchronized to vertical blank, we simply use the MSC and timestamp values of the last vertical blank period for timing purposes, and let the normal TearFree mechanism handle display updates. v2: * Move manpage hunk to next change, since TearFree can still prevent DRI2 page flipping with this change. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> # v1
2017-08-17Pass extents to radeon_scanout_do_updateMichel Dänzer
Preparation for following change, no functional change intended yet. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-17Add source drawable parameter to radeon_scanout_do_updateMichel Dänzer
Preparation for following changes, no functional change intended yet. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2017-08-17Handle multiple "pending" Present flipsMichel Dänzer
The xserver Present code can submit a flip in response to notifying it that a vblank event arrived. This can happen before the completion event of the previous flip is processed. In that case, we were clearing the drmmode_crtc->flip_pending field prematurely. Prevent this by only clearing drmmode_crtc->flip_pending when it matches the framebuffer being scanned out since the flip whose completion event we're processing. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 03:06:01 +0000