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

Commit 7ea77283 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/core: Change declaration for gamma_set. 



Change return value to int to propagate errors from gamma_set,
and remove start parameter. Updates always use the full size,
and some drivers even ignore the start parameter altogether.

This is needed for atomic drivers, where an atomic commit can
fail with -EINTR or -ENOMEM and should be restarted. This is already
and issue for drm_atomic_helper_legacy_set_gamma, which this patch
fixes up.

Changes since v1:
- Fix compiler warning. (Emil)
- Fix commit message (Daniel)

Cc: Alex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Mathieu Larouche <mathieu.larouche@matrox.com>
Cc: Thierry Reding <treding@nvidia.com>
Acked-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
[danvet: Improve commit message a bit more, mention that this fixes
the helper.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/742944bc-9f41-1acb-df4f-0fd4c8a10168@linux.intel.com
parent ddac4b5a

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+6 −4
Original line number Diff line number Diff line
@@ -2667,19 +2667,21 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc) 
	}

}



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

				    u16 *blue, uint32_t start, uint32_t size)

static int dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				    u16 *blue, uint32_t size)

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

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

	int i;



	/* userspace palettes are always correct as is */

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

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

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

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

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

	}

	dce_v10_0_crtc_load_lut(crtc);



	return 0;

}



static void dce_v10_0_crtc_destroy(struct drm_crtc *crtc)

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+6 −4
Original line number Diff line number Diff line
@@ -2678,19 +2678,21 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc) 
	}

}



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

				    u16 *blue, uint32_t start, uint32_t size)

static int dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				    u16 *blue, uint32_t size)

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

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

	int i;



	/* userspace palettes are always correct as is */

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

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

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

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

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

	}

	dce_v11_0_crtc_load_lut(crtc);



	return 0;

}



static void dce_v11_0_crtc_destroy(struct drm_crtc *crtc)

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+6 −4
Original line number Diff line number Diff line
@@ -2574,19 +2574,21 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc) 
	}

}



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

				    u16 *blue, uint32_t start, uint32_t size)

static int dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				   u16 *blue, uint32_t size)

{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);

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

	int i;



	/* userspace palettes are always correct as is */

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

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

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

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

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

	}

	dce_v8_0_crtc_load_lut(crtc);



	return 0;

}



static void dce_v8_0_crtc_destroy(struct drm_crtc *crtc)

drivers/gpu/drm/ast/ast_mode.c

+6 −4
Original line number Diff line number Diff line
@@ -624,19 +624,21 @@ static void ast_crtc_reset(struct drm_crtc *crtc) 


}



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

				 u16 *blue, uint32_t start, uint32_t size)

static int ast_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

			      u16 *blue, uint32_t size)

{

	struct ast_crtc *ast_crtc = to_ast_crtc(crtc);

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

	int i;



	/* userspace palettes are always correct as is */

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

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

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

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

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

	}

	ast_crtc_load_lut(crtc);



	return 0;

}

drivers/gpu/drm/cirrus/cirrus_mode.c

+5 −3
Original line number Diff line number Diff line
@@ -325,18 +325,20 @@ static void cirrus_crtc_commit(struct drm_crtc *crtc) 
 * use this for 8-bit mode so can't perform smooth fades on deeper modes,

 * but it's a requirement that we provide the function

 */

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

				  u16 *blue, uint32_t start, uint32_t size)

static int cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,

				 u16 *blue, uint32_t size)

{

	struct cirrus_crtc *cirrus_crtc = to_cirrus_crtc(crtc);

	int i;



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

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

		cirrus_crtc->lut_r[i] = red[i];

		cirrus_crtc->lut_g[i] = green[i];

		cirrus_crtc->lut_b[i] = blue[i];

	}

	cirrus_crtc_load_lut(crtc);



	return 0;

}



/* Simple cleanup function */