From: Peter Rosin <peda@axentia.se>
To: linux-kernel@vger.kernel.org
Cc: "Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David Airlie" <airlied@linux.ie>,
"Russell King" <linux@armlinux.org.uk>,
"Dave Airlie" <airlied@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Daniel Vetter" <daniel.vetter@intel.com>,
"Jani Nikula" <jani.nikula@linux.intel.com>,
"Sean Paul" <seanpaul@chromium.org>,
"Patrik Jakobsson" <patrik.r.jakobsson@gmail.com>,
"Ben Skeggs" <bskeggs@redhat.com>,
"Yannick Fertre" <yannick.fertre@st.com>,
"Philippe Cornu" <philippe.cornu@st.com>,
"Benjamin Gaignard" <benjamin.gaignard@linaro.org>,
"Vincent Abriou" <vincent.abriou@st.com>,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
virtualization@lists.linux-foundation.org,
intel-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org,
"Boris Brezillon" <boris.brezillon@free-electrons.com>
Subject: [PATCH v2 01/14] drm/fb-helper: keep the .gamma_store updated in drm_fb_helper_setcmap
Date: Thu, 22 Jun 2017 12:17:00 +0200 [thread overview]
Message-ID: <0c8e535a-e8bf-f9cb-1950-036893ae282d@axentia.se> (raw)
In-Reply-To: <1498111597-10714-2-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 | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
This is an alternative version rebased on top of Daniels "fbdev helper
locking rework and deferred setup" series.
Cheers,
peda
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index a4cfef9..c7122c9 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1330,12 +1330,16 @@ 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;
if (oops_in_progress)
return -EBUSY;
+ if (cmap->start + cmap->len < cmap->start)
+ return -EINVAL;
+
mutex_lock(&fb_helper->lock);
if (!drm_fb_helper_is_bound(fb_helper)) {
mutex_unlock(&fb_helper->lock);
@@ -1353,6 +1357,29 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info)
transp = cmap->transp;
start = cmap->start;
+ if (info->fix.visual != FB_VISUAL_TRUECOLOR) {
+ 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(u16));
+ memcpy(g + cmap->start, cmap->green,
+ cmap->len * sizeof(u16));
+ memcpy(b + cmap->start, cmap->blue,
+ cmap->len * sizeof(u16));
+ }
+
for (j = 0; j < cmap->len; j++) {
u16 hred, hgreen, hblue, htransp = 0xffff;
--
2.1.4
next prev parent reply other threads:[~2017-06-22 10:17 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-22 6:06 [PATCH v2 00/14] improve the fb_setcmap helper Peter Rosin
2017-06-22 6:06 ` [PATCH v2 01/14] drm/fb-helper: keep the .gamma_store updated in drm_fb_helper_setcmap Peter Rosin
2017-06-22 10:17 ` Peter Rosin [this message]
2017-06-26 9:27 ` Daniel Vetter
2017-06-22 6:06 ` [PATCH v2 02/14] drm/fb-helper: remove drm_fb_helper_save_lut_atomic Peter Rosin
2017-06-26 9:18 ` Daniel Vetter
2017-06-22 6:06 ` [PATCH v2 03/14] drm/fb-helper: do a generic fb_setcmap helper in terms of crtc .gamma_set Peter Rosin
2017-06-22 10:22 ` Peter Rosin
2017-06-26 9:30 ` Daniel Vetter
2017-06-26 9:23 ` Daniel Vetter
2017-06-22 6:06 ` [PATCH v2 04/14] drm: amd: remove dead code and pointless local lut storage Peter Rosin
2017-06-22 6:06 ` [PATCH v2 05/14] drm: armada: remove dead empty functions Peter Rosin
2017-06-22 6:06 ` [PATCH v2 06/14] drm: ast: remove dead code and pointless local lut storage Peter Rosin
2017-06-22 6:06 ` [PATCH v2 07/14] drm: cirrus: " Peter Rosin
2017-06-22 6:06 ` [PATCH v2 08/14] drm: gma500: " Peter Rosin
2017-06-22 6:06 ` [PATCH v2 09/14] drm: i915: " Peter Rosin
2017-06-22 6:06 ` [PATCH v2 10/14] drm: mgag200: " Peter Rosin
2017-06-22 6:06 ` [PATCH v2 11/14] drm: nouveau: " Peter Rosin
2017-06-22 6:06 ` [PATCH v2 12/14] drm: radeon: " Peter Rosin
2017-06-22 6:06 ` [PATCH v2 13/14] drm: stm: " Peter Rosin
2017-06-22 11:49 ` Philippe CORNU
2017-06-23 5:29 ` Peter Rosin
2017-06-23 9:35 ` [Intel-gfx] " Daniel Vetter
2017-06-22 6:06 ` [PATCH v2 14/14] drm: remove unused and redundant callbacks Peter Rosin
2017-06-26 9:35 ` [PATCH v2 00/14] improve the fb_setcmap helper Daniel Vetter
2017-06-26 19:13 ` Peter Rosin
2017-06-26 19:50 ` Dave Airlie
2017-06-27 7:19 ` [Nouveau] " 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=0c8e535a-e8bf-f9cb-1950-036893ae282d@axentia.se \
--to=peda@axentia.se \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=benjamin.gaignard@linaro.org \
--cc=boris.brezillon@free-electrons.com \
--cc=bskeggs@redhat.com \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=nouveau@lists.freedesktop.org \
--cc=patrik.r.jakobsson@gmail.com \
--cc=philippe.cornu@st.com \
--cc=seanpaul@chromium.org \
--cc=vincent.abriou@st.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=yannick.fertre@st.com \
/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).