From: "Michel Dänzer" <michel@daenzer.net>
To: Alex Deucher <alexdeucher@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 1/2] drm: handle cursor_set2 in restore_fbdev_mode
Date: Thu, 1 Oct 2015 12:50:54 +0900 [thread overview]
Message-ID: <560CAD9E.2080701@daenzer.net> (raw)
In-Reply-To: <1443638858-16895-1-git-send-email-alexander.deucher@amd.com>
On 01.10.2015 03:47, Alex Deucher wrote:
> 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;
>
Hah, nice catch. The series is
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
(I assume you tested with something like killall -9 Xorg and confirming
sure the cursor doesn't stay visible in console)
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-10-01 3:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=560CAD9E.2080701@daenzer.net \
--to=michel@daenzer.net \
--cc=alexdeucher@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox