Backport to 4.9 enough to make wlroots >= 0.7 work on -CURRENT #214
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 0b2c3cf)
(cherry picked from commit 9dc2a2b)
(cherry picked from commit 3484b98)
(cherry picked from commit b17900b)
(cherry picked from commit 9ea021d)
With the atomic API, it is possible that a single commit affects multiple crtcs. If the user requests an event with that commit, one event will be sent for each CRTC, but it is not possible to distinguish which crtc an event is for in user space. To solve this, the reserved field in struct drm_vblank_event is repurposed to include the crtc_id which the event is for. The DRM_CAP_CRTC_IN_VBLANK_EVENT is added to allow userspace to query if the crtc field will be set properly. [daniels: Rebased, using Maarten's forward-port.] Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Signed-off-by: Daniel Stone <daniels@collabora.com> Cc: Maarten Lankhorst <maarten.lankhorst@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170404165221.28240-2-daniels@collabora.com (cherry picked from commit 9f1da74)
Userspace can set a FB_ID on a plane without setting CRTC_ID, which will fail with -EINVAL, but the kernel shouldn't warn about that. Same for !FB_ID and CRTC_ID being set. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20180130102704.28016-1-maarten.lankhorst@linux.intel.com Reviewed-by: Harry Wentland <harry.wentland@amd.com> (cherry picked from commit github.com/torvalds/linux/commit/fa5aaeecf524ecbcae9755ee3d34b7b8ba412583)
Wayland compositors need a notification to know when to rescan display connectors. (cherry picked from commit fe43859)
This fixes ridiculous interrupt rate on aarch64, was enabled in the legacy in-tree drm port, and is a good idea in general. (cherry picked from commit f4e7403)
(cherry picked from commit 6a3d6e6)
fix 'mutex_unlock() system panic' when DRM_SYSCTL_PRINT fails and has not the lock, reproduced by: % sysctl -B 1 hw.dri.0.vblank % sysctl -B 1 hw.dri % sysctl -B 1 -a (cherry picked from commit 324a27a)
cdev_pager_free_page() now expects an xbusy page. (cherry picked from commit 727f5a1)
Update to chase a header change in current. Signed-off-by: Niclas Zeising <zeising@daemonic.se> Signed-off-by: Hans Petter Selasky <hps@selasky.org> (cherry picked from commit ea88121)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
drm-v4.9was a long-lived branch, being very stable near EOL. Make it usable again e.g., for debugging issues on newer branches or as a last resort by users.I'm not really expecting this to be merged but it builds fine on FreeBSD 11.3 as well.