Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3562a0e authored by Peter Rosin's avatar Peter Rosin Committed by Daniel Vetter
Browse files

drm/fb-helper: keep the .gamma_store updated in drm_fb_helper_setcmap 



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: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1499164632-5582-3-git-send-email-peda@axentia.se
parent b8e2b019

drivers/gpu/drm/drm_fb_helper.c

+19 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,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;
@@ -1305,6 +1306,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;