From: Peter Rosin <peda@axentia.se>
To: linux-kernel@vger.kernel.org
Cc: Peter Rosin <peda@axentia.se>,
Daniel Vetter <daniel.vetter@intel.com>,
Jani Nikula <jani.nikula@linux.intel.com>,
Sean Paul <seanpaul@chromium.org>,
David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org,
Boris Brezillon <boris.brezillon@free-electrons.com>
Subject: [PATCH v3 02/16] drm/fb-helper: keep the .gamma_store updated in drm_fb_helper_setcmap
Date: Tue, 4 Jul 2017 12:36:58 +0200 [thread overview]
Message-ID: <1499164632-5582-3-git-send-email-peda@axentia.se> (raw)
In-Reply-To: <1499164632-5582-1-git-send-email-peda@axentia.se>
I think the gamma_store can end up invalid on error. But the way I read
it, that can happen in drm_mode_gamma_set_ioctl as well, so why should
this pesky legacy fbdev stuff be any better?
Signed-off-by: Peter Rosin <peda@axentia.se>
---
drivers/gpu/drm/drm_fb_helper.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 9c76b8c..41fd9e0 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1339,6 +1339,7 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info)
const struct drm_crtc_helper_funcs *crtc_funcs;
u16 *red, *green, *blue, *transp;
struct drm_crtc *crtc;
+ u16 *r, *g, *b;
int i, j, rc = 0;
int start;
@@ -1367,6 +1368,24 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info)
transp = cmap->transp;
start = cmap->start;
+ if (!crtc->gamma_size) {
+ rc = -EINVAL;
+ goto out;
+ }
+
+ if (cmap->start + cmap->len > crtc->gamma_size) {
+ rc = -EINVAL;
+ goto out;
+ }
+
+ r = crtc->gamma_store;
+ g = r + crtc->gamma_size;
+ b = g + crtc->gamma_size;
+
+ memcpy(r + cmap->start, cmap->red, cmap->len * sizeof(*r));
+ memcpy(g + cmap->start, cmap->green, cmap->len * sizeof(*g));
+ memcpy(b + cmap->start, cmap->blue, cmap->len * sizeof(*b));
+
for (j = 0; j < cmap->len; j++) {
u16 hred, hgreen, hblue, htransp = 0xffff;
--
2.1.4
next prev parent reply other threads:[~2017-07-04 10:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-04 10:36 [PATCH v3 00/16] improve the fb_setcmap helper Peter Rosin
2017-07-04 10:36 ` [PATCH v3 01/16] drm/fb-helper: factor out pseudo-palette Peter Rosin
2017-07-04 10:40 ` Peter Rosin
2017-07-05 6:03 ` Daniel Vetter
2017-07-04 10:36 ` Peter Rosin [this message]
2017-07-04 10:36 ` [PATCH v3 03/16] drm/fb-helper: remove drm_fb_helper_save_lut_atomic Peter Rosin
2017-07-06 8:37 ` Daniel Vetter
2017-07-04 10:37 ` [PATCH v3 04/16] drm/color-mgmt: move atomic state/commit out from .gamma_set Peter Rosin
2017-07-04 10:37 ` [PATCH v3 05/16] drm/fb-helper: do a generic fb_setcmap helper in terms of crtc .gamma_set Peter Rosin
2017-07-05 6:21 ` Daniel Vetter
2017-07-05 17:50 ` Peter Rosin
2017-07-06 5:55 ` Daniel Vetter
2017-07-06 6:18 ` Peter Rosin
2017-07-06 8:34 ` Daniel Vetter
2017-07-04 10:37 ` [PATCH v3 06/16] drm: amd: remove dead code and pointless local lut storage Peter Rosin
2017-07-04 10:37 ` [PATCH v3 07/16] drm: armada: remove dead empty functions Peter Rosin
2017-07-04 10:37 ` [PATCH v3 08/16] drm: ast: remove dead code and pointless local lut storage Peter Rosin
2017-07-04 10:37 ` [PATCH v3 09/16] drm: cirrus: " Peter Rosin
2017-07-04 10:37 ` [PATCH v3 10/16] drm: gma500: " Peter Rosin
2017-07-04 10:37 ` [PATCH v3 11/16] drm: i915: " Peter Rosin
2017-07-04 10:37 ` [PATCH v3 12/16] drm: mgag200: " Peter Rosin
2017-07-04 10:37 ` [PATCH v3 13/16] drm: nouveau: " Peter Rosin
2017-07-04 10:37 ` [PATCH v3 14/16] drm: radeon: " Peter Rosin
2017-07-04 10:37 ` [PATCH v3 15/16] drm: stm: " Peter Rosin
2017-07-04 10:37 ` [PATCH v3 16/16] drm: remove unused and redundant callbacks Peter Rosin
2017-07-05 6:08 ` [Intel-gfx] [PATCH v3 00/16] improve the fb_setcmap helper Daniel Vetter
2017-07-05 8:09 ` Peter Rosin
2017-07-05 20:19 ` 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=1499164632-5582-3-git-send-email-peda@axentia.se \
--to=peda@axentia.se \
--cc=airlied@linux.ie \
--cc=boris.brezillon@free-electrons.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=seanpaul@chromium.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
all inboxes | Powered by JetHome®