All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm: handle cursor_set2 in restore_fbdev_mode
@ 2015-09-30 18:47 Alex Deucher
  2015-09-30 18:47 ` [PATCH 2/2] drm/radeon: drop radeon_fb_helper_set_par Alex Deucher
                   ` (3 more replies)
  0 siblings, 4 replies; 12+ messages in thread
From: Alex Deucher @ 2015-09-30 18:47 UTC (permalink / raw)
  To: dri-devel; +Cc: Alex Deucher

If a driver uses the cursor_set2 crtc callback rather than
cursor_set, use that.  This fixes the fbdev helper for drivers
that use cursor_set2.

Change-Id: I127d3f8e72789ba70c3648140f87c6187864e130
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/drm_fb_helper.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 418d299..ca08c47 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -345,7 +345,11 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper)
 		struct drm_crtc *crtc = mode_set->crtc;
 		int ret;
 
-		if (crtc->funcs->cursor_set) {
+		if (crtc->funcs->cursor_set2) {
+			ret = crtc->funcs->cursor_set2(crtc, NULL, 0, 0, 0, 0, 0);
+			if (ret)
+				error = true;
+		} else if (crtc->funcs->cursor_set) {
 			ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0);
 			if (ret)
 				error = true;
-- 
1.8.3.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2015-10-02  7:45 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-30 18:47 [PATCH 1/2] drm: handle cursor_set2 in restore_fbdev_mode Alex Deucher
2015-09-30 18:47 ` [PATCH 2/2] drm/radeon: drop radeon_fb_helper_set_par Alex Deucher
2015-09-30 19:04 ` [PATCH 1/2] drm: handle cursor_set2 in restore_fbdev_mode Christian König
2015-10-01  3:50 ` Michel Dänzer
2015-10-01 17:01   ` Alex Deucher
2015-10-01 17:13     ` Alex Deucher
2015-10-01 17:22       ` Alex Deucher
2015-10-02  7:12         ` Daniel Vetter
2015-10-02  7:45         ` Michel Dänzer
2015-10-01 11:36 ` Emil Velikov
2015-10-01 12:50   ` Daniel Vetter
2015-10-01 12:58   ` Deucher, Alexander

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.