Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03f9abb2 authored Sep 30, 2015 by Alex Deucher Committed by Dave Airlie Oct 02, 2015

drm: handle cursor_set2 in restore_fbdev_mode



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.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent ec403b89

drivers/gpu/drm/drm_fb_helper.c

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -345,7 +345,11 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper)
	struct drm_crtc *crtc = mode_set->crtc;		struct drm_crtc *crtc = mode_set->crtc;
	int ret;		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);		ret = crtc->funcs->cursor_set(crtc, NULL, 0, 0, 0);
	if (ret)		if (ret)
	error = true;		error = true;