From: Peter Rosin <peda@axentia.se> To: Chuhong Yuan <hslester96@gmail.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/fb-helper: Add missed unlocks in setcmap_legacy() Date: Thu, 3 Dec 2020 17:11:28 +0100 [thread overview] Message-ID: <e6ebb634-4cb5-34d4-c661-4cebbe2fdbf1@axentia.se> (raw) In-Reply-To: <20201203144248.418281-1-hslester96@gmail.com> Hi! On 2020-12-03 15:42, Chuhong Yuan wrote: > setcmap_legacy() does not call drm_modeset_unlock_all() in some exits, > add the missed unlocks with goto to fix it. > > Fixes: 964c60063bff ("drm/fb-helper: separate the fb_setcmap helper into atomic and legacy paths") > Signed-off-by: Chuhong Yuan <hslester96@gmail.com> Yup, my patch fumbled the locking. Sorry, and thanks for cleaning up my mess! Acked-by: Peter Rosin <peda@axentia.se> (Spelled that as Ached-by at first, what does that mean??) Cheers, Peter > --- > drivers/gpu/drm/drm_fb_helper.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 1543d9d10970..8033467db4be 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -923,11 +923,15 @@ static int setcmap_legacy(struct fb_cmap *cmap, struct fb_info *info) > drm_modeset_lock_all(fb_helper->dev); > drm_client_for_each_modeset(modeset, &fb_helper->client) { > crtc = modeset->crtc; > - if (!crtc->funcs->gamma_set || !crtc->gamma_size) > - return -EINVAL; > + if (!crtc->funcs->gamma_set || !crtc->gamma_size) { > + ret = -EINVAL; > + goto out; > + } > > - if (cmap->start + cmap->len > crtc->gamma_size) > - return -EINVAL; > + if (cmap->start + cmap->len > crtc->gamma_size) { > + ret = -EINVAL; > + goto out; > + } > > r = crtc->gamma_store; > g = r + crtc->gamma_size; > @@ -940,8 +944,9 @@ static int setcmap_legacy(struct fb_cmap *cmap, struct fb_info *info) > ret = crtc->funcs->gamma_set(crtc, r, g, b, > crtc->gamma_size, NULL); > if (ret) > - return ret; > + goto out; > } > +out: > drm_modeset_unlock_all(fb_helper->dev); > > return ret; >
WARNING: multiple messages have this Message-ID (diff)
From: Peter Rosin <peda@axentia.se> To: Chuhong Yuan <hslester96@gmail.com> Cc: Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@linux.ie>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH] drm/fb-helper: Add missed unlocks in setcmap_legacy() Date: Thu, 3 Dec 2020 17:11:28 +0100 [thread overview] Message-ID: <e6ebb634-4cb5-34d4-c661-4cebbe2fdbf1@axentia.se> (raw) In-Reply-To: <20201203144248.418281-1-hslester96@gmail.com> Hi! On 2020-12-03 15:42, Chuhong Yuan wrote: > setcmap_legacy() does not call drm_modeset_unlock_all() in some exits, > add the missed unlocks with goto to fix it. > > Fixes: 964c60063bff ("drm/fb-helper: separate the fb_setcmap helper into atomic and legacy paths") > Signed-off-by: Chuhong Yuan <hslester96@gmail.com> Yup, my patch fumbled the locking. Sorry, and thanks for cleaning up my mess! Acked-by: Peter Rosin <peda@axentia.se> (Spelled that as Ached-by at first, what does that mean??) Cheers, Peter > --- > drivers/gpu/drm/drm_fb_helper.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 1543d9d10970..8033467db4be 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -923,11 +923,15 @@ static int setcmap_legacy(struct fb_cmap *cmap, struct fb_info *info) > drm_modeset_lock_all(fb_helper->dev); > drm_client_for_each_modeset(modeset, &fb_helper->client) { > crtc = modeset->crtc; > - if (!crtc->funcs->gamma_set || !crtc->gamma_size) > - return -EINVAL; > + if (!crtc->funcs->gamma_set || !crtc->gamma_size) { > + ret = -EINVAL; > + goto out; > + } > > - if (cmap->start + cmap->len > crtc->gamma_size) > - return -EINVAL; > + if (cmap->start + cmap->len > crtc->gamma_size) { > + ret = -EINVAL; > + goto out; > + } > > r = crtc->gamma_store; > g = r + crtc->gamma_size; > @@ -940,8 +944,9 @@ static int setcmap_legacy(struct fb_cmap *cmap, struct fb_info *info) > ret = crtc->funcs->gamma_set(crtc, r, g, b, > crtc->gamma_size, NULL); > if (ret) > - return ret; > + goto out; > } > +out: > drm_modeset_unlock_all(fb_helper->dev); > > return ret; > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-12-03 16:12 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-03 14:42 [PATCH] drm/fb-helper: Add missed unlocks in setcmap_legacy() Chuhong Yuan 2020-12-03 14:42 ` Chuhong Yuan 2020-12-03 16:11 ` Peter Rosin [this message] 2020-12-03 16:11 ` Peter Rosin 2020-12-03 16:39 ` Daniel Vetter 2020-12-03 16:39 ` 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=e6ebb634-4cb5-34d4-c661-4cebbe2fdbf1@axentia.se \ --to=peda@axentia.se \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=hslester96@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=mripard@kernel.org \ --cc=tzimmermann@suse.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.