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

Commit 7203425a authored by James Simmons's avatar James Simmons Committed by Dave Airlie
Browse files

drm: expand gamma_set 



Expand the crtc_gamma_set function to accept a starting offset. The
reason for this is to eventually use this function for setcolreg from
drm_fb_helper.c. The fbdev colormap function can start at any offset in
the color map.

Signed-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 38fcbb67

drivers/gpu/drm/drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -2541,7 +2541,7 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, 
		goto out;

	}



	crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, crtc->gamma_size);

	crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, 0, crtc->gamma_size);



out:

	mutex_unlock(&dev->mode_config.mutex);

drivers/gpu/drm/i915/intel_display.c

+3 −6
Original line number Diff line number Diff line
@@ -4330,15 +4330,12 @@ void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, 
}



static void intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				 u16 *blue, uint32_t size)

				 u16 *blue, uint32_t start, uint32_t size)

{

	int end = (start + size > 256) ? 256 : start + size, i;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	int i;



	if (size != 256)

		return;



	for (i = 0; i < 256; i++) {

	for (i = start; i < end; i++) {

		intel_crtc->lut_r[i] = red[i] >> 8;

		intel_crtc->lut_g[i] = green[i] >> 8;

		intel_crtc->lut_b[i] = blue[i] >> 8;

drivers/gpu/drm/nouveau/nv04_crtc.c

+4 −6
Original line number Diff line number Diff line
@@ -742,15 +742,13 @@ nv_crtc_gamma_load(struct drm_crtc *crtc) 
}



static void

nv_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b, uint32_t size)

nv_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b, uint32_t start,

		  uint32_t size)

{

	int end = (start + size > 256) ? 256 : start + size, i;

	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	int i;



	if (size != 256)

		return;



	for (i = 0; i < 256; i++) {

	for (i = start; i < end; i++) {

		nv_crtc->lut.r[i] = r[i];

		nv_crtc->lut.g[i] = g[i];

		nv_crtc->lut.b[i] = b[i];

drivers/gpu/drm/nouveau/nv50_crtc.c

+3 −6
Original line number Diff line number Diff line
@@ -398,15 +398,12 @@ nv50_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) 


static void

nv50_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,

		    uint32_t size)

		    uint32_t start, uint32_t size)

{

	int end = (start + size > 256) ? 256 : start + size, i;

	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	int i;



	if (size != 256)

		return;



	for (i = 0; i < 256; i++) {

	for (i = start; i < end; i++) {

		nv_crtc->lut.r[i] = r[i];

		nv_crtc->lut.g[i] = g[i];

		nv_crtc->lut.b[i] = b[i];

drivers/gpu/drm/radeon/radeon_display.c

+3 −7
Original line number Diff line number Diff line
@@ -161,17 +161,13 @@ void radeon_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, 
}



static void radeon_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				  u16 *blue, uint32_t size)

				  u16 *blue, uint32_t start, uint32_t size)

{

	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);

	int i;



	if (size != 256) {

		return;

	}

	int end = (start + size > 256) ? 256 : start + size, i;



	/* userspace palettes are always correct as is */

	for (i = 0; i < 256; i++) {

	for (i = start; i < end; i++) {

		radeon_crtc->lut_r[i] = red[i] >> 6;

		radeon_crtc->lut_g[i] = green[i] >> 6;

		radeon_crtc->lut_b[i] = blue[i] >> 6;