From: Thomas Zimmermann <tzimmermann@suse.de>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
DRI Development <dri-devel@lists.freedesktop.org>
Cc: David Airlie <airlied@linux.ie>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH] drm/fb-helper: Add locking to sysrq handling
Date: Thu, 8 Oct 2020 11:22:02 +0200 [thread overview]
Message-ID: <fedcb884-fdb0-8f32-34ce-e0a2d3238413@suse.de> (raw)
In-Reply-To: <20201007133036.1541639-1-daniel.vetter@ffwll.ch>
[-- Attachment #1.1.1: Type: text/plain, Size: 3019 bytes --]
Hi
Am 07.10.20 um 15:30 schrieb Daniel Vetter:
> We didn't take the kernel_fb_helper_lock mutex, which protects that
> code. While at it, simplify the code
> - inline the function (originally shared with kgdb I think)
> - drop the error tracking and all the complications
> - drop the pointless early out, it served nothing
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> ---
> drivers/gpu/drm/drm_fb_helper.c | 26 +++++---------------------
> 1 file changed, 5 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index 8697554ccd41..c2f72bb6afb1 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -281,18 +281,12 @@ int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper)
> EXPORT_SYMBOL(drm_fb_helper_restore_fbdev_mode_unlocked);
>
> #ifdef CONFIG_MAGIC_SYSRQ
> -/*
> - * restore fbcon display for all kms driver's using this helper, used for sysrq
> - * and panic handling.
> - */
> -static bool drm_fb_helper_force_kernel_mode(void)
> +/* emergency restore, don't bother with error reporting */
> +static void drm_fb_helper_restore_work_fn(struct work_struct *ignored)
> {
> - bool ret, error = false;
> struct drm_fb_helper *helper;
>
> - if (list_empty(&kernel_fb_helper_list))
> - return false;
> -
> + mutex_lock(&kernel_fb_helper_lock);
> list_for_each_entry(helper, &kernel_fb_helper_list, kernel_fb_list) {
> struct drm_device *dev = helper->dev;
>
> @@ -300,22 +294,12 @@ static bool drm_fb_helper_force_kernel_mode(void)
> continue;
>
> mutex_lock(&helper->lock);
> - ret = drm_client_modeset_commit_locked(&helper->client);
> - if (ret)
> - error = true;
> + drm_client_modeset_commit_locked(&helper->client);
> mutex_unlock(&helper->lock);
> }
> - return error;
> + mutex_unlock(&kernel_fb_helper_lock);
> }
>
> -static void drm_fb_helper_restore_work_fn(struct work_struct *ignored)
> -{
> - bool ret;
> -
> - ret = drm_fb_helper_force_kernel_mode();
> - if (ret == true)
> - DRM_ERROR("Failed to restore crtc configuration\n");
Is there a specific reason for removing that warning? Even if it doesn't
show up on screen, is it not helpful in the kernel's log?
In any case, the rest looks good.
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Best regards
Thomas
> -}
> static DECLARE_WORK(drm_fb_helper_restore_work, drm_fb_helper_restore_work_fn);
>
> static void drm_fb_helper_sysrq(int dummy1)
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 516 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-10-08 9:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 13:30 [PATCH] drm/fb-helper: Add locking to sysrq handling Daniel Vetter
2020-10-08 9:22 ` Thomas Zimmermann [this message]
2020-10-08 9:29 ` Daniel Vetter
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=fedcb884-fdb0-8f32-34ce-e0a2d3238413@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@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;
as well as URLs for NNTP newsgroup(s).