Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/vblank: Pass crtc_id to page_flip_ioctl." failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message Dec 4, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From b8a3365a30c463e9105969ab1bf8674b763e3408 Mon Sep 17 00:00:00 2001

From: Maarten Lankhorst <[email protected]>
Date: Thu, 23 Nov 2017 11:37:37 +0100
Subject: [PATCH] drm/vblank: Pass crtc_id to page_flip_ioctl.

We added crtc_id to the atomic ioctl, but forgot to add it for vblank and page flip events. Commit bd386e518056 ("drm: Reorganize drm_pending_event to support future event types [v2]") added it to the vblank event, but page flip event was still missing.

Correct this and add a test for making sure we always set crtc_id correctly.

Fixes bd386e518056 ("drm: Reorganize drm_pending_event to support future event types [v2]")
Fixes 5db06a8a98f5 ("drm: Pass CRTC ID in userspace vblank events")
Cc Daniel Stone <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Gustavo Padovan <[email protected]>
Cc Sean Paul <[email protected]>
Cc <[email protected]> # v4.12+

Testcase: igt/kms_vblank/crtc_id

drivers/gpu/drm/drm_plane.c +1 -0
index 19404e34cd59..37a93cdffb4a 100644
@@ -1030,6 +1030,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
 		e->event.base.type = DRM_EVENT_FLIP_COMPLETE;
 		e->event.base.length = sizeof(e->event);
 		e->event.vbl.user_data = page_flip->user_data;
+		e->event.vbl.crtc_id = crtc->base.id;
 		ret = drm_event_reserve_init(dev, file_priv, &e->base, &e->event.base);
 		if (ret) {
 			kfree(e);