On Thu, Jul 13, 2017 at 12:25 PM, Peter Rosin <peda at axentia.se> wrote:
> The redundant fb helpers .load_lut, .gamma_set and .gamma_get are
> no longer used. Remove the dead code and hook up the crtc .gamma_set
> to use the crtc gamma_store directly instead of duplicating that
> info locally.
>
> Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> Signed-off-by: Peter Rosin <peda at axentia.se>
Acked-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 24 ------------------------
> drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 -
> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 27 +++++++--------------------
> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 27 +++++++--------------------
> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 27 +++++++--------------------
> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 27 +++++++--------------------
> drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 23 -----------------------
> 7 files changed, 28 insertions(+), 128 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> index c0d8c6ff6380..7dc378013a42 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> @@ -312,31 +312,7 @@ static int amdgpu_fbdev_destroy(struct drm_device *dev, struct amdgpu_fbdev *rfb
> return 0;
> }
>
> -/** Sets the color ramps on behalf of fbcon */
> -static void amdgpu_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
> - u16 blue, int regno)
> -{
> - struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> -
> - amdgpu_crtc->lut_r[regno] = red >> 6;
> - amdgpu_crtc->lut_g[regno] = green >> 6;
> - amdgpu_crtc->lut_b[regno] = blue >> 6;
> -}
> -
> -/** Gets the color ramps on behalf of fbcon */
> -static void amdgpu_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
> - u16 *blue, int regno)
> -{
> - struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> -
> - *red = amdgpu_crtc->lut_r[regno] << 6;
> - *green = amdgpu_crtc->lut_g[regno] << 6;
> - *blue = amdgpu_crtc->lut_b[regno] << 6;
> -}
> -
> static const struct drm_fb_helper_funcs amdgpu_fb_helper_funcs = {
> - .gamma_set = amdgpu_crtc_fb_gamma_set,
> - .gamma_get = amdgpu_crtc_fb_gamma_get,
> .fb_probe = amdgpufb_create,
> };
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> index 43a9d3aec6c4..39f7eda6091e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> @@ -369,7 +369,6 @@ struct amdgpu_atom_ss {
> struct amdgpu_crtc {
> struct drm_crtc base;
> int crtc_id;
> - u16 lut_r[256], lut_g[256], lut_b[256];
> bool enabled;
> bool can_tile;
> uint32_t crtc_offset;
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index 9f78c03a2e31..c9580235e35b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -2267,6 +2267,7 @@ static void dce_v10_0_crtc_load_lut(struct drm_crtc *crtc)
> struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> struct drm_device *dev = crtc->dev;
> struct amdgpu_device *adev = dev->dev_private;
> + u16 *r, *g, *b;
> int i;
> u32 tmp;
>
> @@ -2304,11 +2305,14 @@ static void dce_v10_0_crtc_load_lut(struct drm_crtc *crtc)
> WREG32(mmDC_LUT_WRITE_EN_MASK + amdgpu_crtc->crtc_offset, 0x00000007);
>
> WREG32(mmDC_LUT_RW_INDEX + amdgpu_crtc->crtc_offset, 0);
> + r = crtc->gamma_store;
> + g = r + crtc->gamma_size;
> + b = g + crtc->gamma_size;
> for (i = 0; i < 256; i++) {
> WREG32(mmDC_LUT_30_COLOR + amdgpu_crtc->crtc_offset,
> - (amdgpu_crtc->lut_r[i] << 20) |
> - (amdgpu_crtc->lut_g[i] << 10) |
> - (amdgpu_crtc->lut_b[i] << 0));
> + ((*r++ & 0xffc0) << 14) |
> + ((*g++ & 0xffc0) << 4) |
> + (*b++ >> 6));
> }
>
> tmp = RREG32(mmDEGAMMA_CONTROL + amdgpu_crtc->crtc_offset);
> @@ -2624,15 +2628,6 @@ static int dce_v10_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
> u16 *blue, uint32_t size,
> struct drm_modeset_acquire_ctx *ctx)
> {
> - struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> - int i;
> -
> - /* userspace palettes are always correct as is */
> - 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;
> @@ -2844,14 +2839,12 @@ static const struct drm_crtc_helper_funcs dce_v10_0_crtc_helper_funcs = {
> .mode_set_base_atomic = dce_v10_0_crtc_set_base_atomic,
> .prepare = dce_v10_0_crtc_prepare,
> .commit = dce_v10_0_crtc_commit,
> - .load_lut = dce_v10_0_crtc_load_lut,
> .disable = dce_v10_0_crtc_disable,
> };
>
> static int dce_v10_0_crtc_init(struct amdgpu_device *adev, int index)
> {
> struct amdgpu_crtc *amdgpu_crtc;
> - int i;
>
> amdgpu_crtc = kzalloc(sizeof(struct amdgpu_crtc) +
> (AMDGPUFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL);
> @@ -2869,12 +2862,6 @@ static int dce_v10_0_crtc_init(struct amdgpu_device *adev, int index)
> adev->ddev->mode_config.cursor_width = amdgpu_crtc->max_cursor_width;
> adev->ddev->mode_config.cursor_height = amdgpu_crtc->max_cursor_height;
>
> - for (i = 0; i < 256; i++) {
> - amdgpu_crtc->lut_r[i] = i << 2;
> - amdgpu_crtc->lut_g[i] = i << 2;
> - amdgpu_crtc->lut_b[i] = i << 2;
> - }
> -
> switch (amdgpu_crtc->crtc_id) {
> case 0:
> default:
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index 4bcf01dc567a..7e14f532df59 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -2251,6 +2251,7 @@ static void dce_v11_0_crtc_load_lut(struct drm_crtc *crtc)
> struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> struct drm_device *dev = crtc->dev;
> struct amdgpu_device *adev = dev->dev_private;
> + u16 *r, *g, *b;
> int i;
> u32 tmp;
>
> @@ -2282,11 +2283,14 @@ static void dce_v11_0_crtc_load_lut(struct drm_crtc *crtc)
> WREG32(mmDC_LUT_WRITE_EN_MASK + amdgpu_crtc->crtc_offset, 0x00000007);
>
> WREG32(mmDC_LUT_RW_INDEX + amdgpu_crtc->crtc_offset, 0);
> + r = crtc->gamma_store;
> + g = r + crtc->gamma_size;
> + b = g + crtc->gamma_size;
> for (i = 0; i < 256; i++) {
> WREG32(mmDC_LUT_30_COLOR + amdgpu_crtc->crtc_offset,
> - (amdgpu_crtc->lut_r[i] << 20) |
> - (amdgpu_crtc->lut_g[i] << 10) |
> - (amdgpu_crtc->lut_b[i] << 0));
> + ((*r++ & 0xffc0) << 14) |
> + ((*g++ & 0xffc0) << 4) |
> + (*b++ >> 6));
> }
>
> tmp = RREG32(mmDEGAMMA_CONTROL + amdgpu_crtc->crtc_offset);
> @@ -2644,15 +2648,6 @@ static int dce_v11_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
> u16 *blue, uint32_t size,
> struct drm_modeset_acquire_ctx *ctx)
> {
> - struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> - int i;
> -
> - /* userspace palettes are always correct as is */
> - 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;
> @@ -2892,14 +2887,12 @@ static const struct drm_crtc_helper_funcs dce_v11_0_crtc_helper_funcs = {
> .mode_set_base_atomic = dce_v11_0_crtc_set_base_atomic,
> .prepare = dce_v11_0_crtc_prepare,
> .commit = dce_v11_0_crtc_commit,
> - .load_lut = dce_v11_0_crtc_load_lut,
> .disable = dce_v11_0_crtc_disable,
> };
>
> static int dce_v11_0_crtc_init(struct amdgpu_device *adev, int index)
> {
> struct amdgpu_crtc *amdgpu_crtc;
> - int i;
>
> amdgpu_crtc = kzalloc(sizeof(struct amdgpu_crtc) +
> (AMDGPUFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL);
> @@ -2917,12 +2910,6 @@ static int dce_v11_0_crtc_init(struct amdgpu_device *adev, int index)
> adev->ddev->mode_config.cursor_width = amdgpu_crtc->max_cursor_width;
> adev->ddev->mode_config.cursor_height = amdgpu_crtc->max_cursor_height;
>
> - for (i = 0; i < 256; i++) {
> - amdgpu_crtc->lut_r[i] = i << 2;
> - amdgpu_crtc->lut_g[i] = i << 2;
> - amdgpu_crtc->lut_b[i] = i << 2;
> - }
> -
> switch (amdgpu_crtc->crtc_id) {
> case 0:
> default:
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> index fd134a4629d7..d773b50afa60 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> @@ -2182,6 +2182,7 @@ static void dce_v6_0_crtc_load_lut(struct drm_crtc *crtc)
> struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> struct drm_device *dev = crtc->dev;
> struct amdgpu_device *adev = dev->dev_private;
> + u16 *r, *g, *b;
> int i;
>
> DRM_DEBUG_KMS("%d\n", amdgpu_crtc->crtc_id);
> @@ -2211,11 +2212,14 @@ static void dce_v6_0_crtc_load_lut(struct drm_crtc *crtc)
> WREG32(mmDC_LUT_WRITE_EN_MASK + amdgpu_crtc->crtc_offset, 0x00000007);
>
> WREG32(mmDC_LUT_RW_INDEX + amdgpu_crtc->crtc_offset, 0);
> + r = crtc->gamma_store;
> + g = r + crtc->gamma_size;
> + b = g + crtc->gamma_size;
> for (i = 0; i < 256; i++) {
> WREG32(mmDC_LUT_30_COLOR + amdgpu_crtc->crtc_offset,
> - (amdgpu_crtc->lut_r[i] << 20) |
> - (amdgpu_crtc->lut_g[i] << 10) |
> - (amdgpu_crtc->lut_b[i] << 0));
> + ((*r++ & 0xffc0) << 14) |
> + ((*g++ & 0xffc0) << 4) |
> + (*b++ >> 6));
> }
>
> WREG32(mmDEGAMMA_CONTROL + amdgpu_crtc->crtc_offset,
> @@ -2496,15 +2500,6 @@ static int dce_v6_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
> u16 *blue, uint32_t size,
> struct drm_modeset_acquire_ctx *ctx)
> {
> - struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> - int i;
> -
> - /* userspace palettes are always correct as is */
> - 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_v6_0_crtc_load_lut(crtc);
>
> return 0;
> @@ -2712,14 +2707,12 @@ static const struct drm_crtc_helper_funcs dce_v6_0_crtc_helper_funcs = {
> .mode_set_base_atomic = dce_v6_0_crtc_set_base_atomic,
> .prepare = dce_v6_0_crtc_prepare,
> .commit = dce_v6_0_crtc_commit,
> - .load_lut = dce_v6_0_crtc_load_lut,
> .disable = dce_v6_0_crtc_disable,
> };
>
> static int dce_v6_0_crtc_init(struct amdgpu_device *adev, int index)
> {
> struct amdgpu_crtc *amdgpu_crtc;
> - int i;
>
> amdgpu_crtc = kzalloc(sizeof(struct amdgpu_crtc) +
> (AMDGPUFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL);
> @@ -2737,12 +2730,6 @@ static int dce_v6_0_crtc_init(struct amdgpu_device *adev, int index)
> adev->ddev->mode_config.cursor_width = amdgpu_crtc->max_cursor_width;
> adev->ddev->mode_config.cursor_height = amdgpu_crtc->max_cursor_height;
>
> - for (i = 0; i < 256; i++) {
> - amdgpu_crtc->lut_r[i] = i << 2;
> - amdgpu_crtc->lut_g[i] = i << 2;
> - amdgpu_crtc->lut_b[i] = i << 2;
> - }
> -
> amdgpu_crtc->crtc_offset = crtc_offsets[amdgpu_crtc->crtc_id];
>
> amdgpu_crtc->pll_id = ATOM_PPLL_INVALID;
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> index a9e869554627..4eb63f6a41ab 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> @@ -2124,6 +2124,7 @@ static void dce_v8_0_crtc_load_lut(struct drm_crtc *crtc)
> struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> struct drm_device *dev = crtc->dev;
> struct amdgpu_device *adev = dev->dev_private;
> + u16 *r, *g, *b;
> int i;
>
> DRM_DEBUG_KMS("%d\n", amdgpu_crtc->crtc_id);
> @@ -2153,11 +2154,14 @@ static void dce_v8_0_crtc_load_lut(struct drm_crtc *crtc)
> WREG32(mmDC_LUT_WRITE_EN_MASK + amdgpu_crtc->crtc_offset, 0x00000007);
>
> WREG32(mmDC_LUT_RW_INDEX + amdgpu_crtc->crtc_offset, 0);
> + r = crtc->gamma_store;
> + g = r + crtc->gamma_size;
> + b = g + crtc->gamma_size;
> for (i = 0; i < 256; i++) {
> WREG32(mmDC_LUT_30_COLOR + amdgpu_crtc->crtc_offset,
> - (amdgpu_crtc->lut_r[i] << 20) |
> - (amdgpu_crtc->lut_g[i] << 10) |
> - (amdgpu_crtc->lut_b[i] << 0));
> + ((*r++ & 0xffc0) << 14) |
> + ((*g++ & 0xffc0) << 4) |
> + (*b++ >> 6));
> }
>
> WREG32(mmDEGAMMA_CONTROL + amdgpu_crtc->crtc_offset,
> @@ -2475,15 +2479,6 @@ static int dce_v8_0_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
> u16 *blue, uint32_t size,
> struct drm_modeset_acquire_ctx *ctx)
> {
> - struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> - int i;
> -
> - /* userspace palettes are always correct as is */
> - 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;
> @@ -2702,14 +2697,12 @@ static const struct drm_crtc_helper_funcs dce_v8_0_crtc_helper_funcs = {
> .mode_set_base_atomic = dce_v8_0_crtc_set_base_atomic,
> .prepare = dce_v8_0_crtc_prepare,
> .commit = dce_v8_0_crtc_commit,
> - .load_lut = dce_v8_0_crtc_load_lut,
> .disable = dce_v8_0_crtc_disable,
> };
>
> static int dce_v8_0_crtc_init(struct amdgpu_device *adev, int index)
> {
> struct amdgpu_crtc *amdgpu_crtc;
> - int i;
>
> amdgpu_crtc = kzalloc(sizeof(struct amdgpu_crtc) +
> (AMDGPUFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL);
> @@ -2727,12 +2720,6 @@ static int dce_v8_0_crtc_init(struct amdgpu_device *adev, int index)
> adev->ddev->mode_config.cursor_width = amdgpu_crtc->max_cursor_width;
> adev->ddev->mode_config.cursor_height = amdgpu_crtc->max_cursor_height;
>
> - for (i = 0; i < 256; i++) {
> - amdgpu_crtc->lut_r[i] = i << 2;
> - amdgpu_crtc->lut_g[i] = i << 2;
> - amdgpu_crtc->lut_b[i] = i << 2;
> - }
> -
> amdgpu_crtc->crtc_offset = crtc_offsets[amdgpu_crtc->crtc_id];
>
> amdgpu_crtc->pll_id = ATOM_PPLL_INVALID;
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> index 90bb08309a53..ecf34bc77a63 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> @@ -168,16 +168,6 @@ static int dce_virtual_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,
> u16 *green, u16 *blue, uint32_t size,
> struct drm_modeset_acquire_ctx *ctx)
> {
> - struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> - int i;
> -
> - /* userspace palettes are always correct as is */
> - 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;
> - }
> -
> return 0;
> }
>
> @@ -289,11 +279,6 @@ static int dce_virtual_crtc_set_base(struct drm_crtc *crtc, int x, int y,
> return 0;
> }
>
> -static void dce_virtual_crtc_load_lut(struct drm_crtc *crtc)
> -{
> - return;
> -}
> -
> static int dce_virtual_crtc_set_base_atomic(struct drm_crtc *crtc,
> struct drm_framebuffer *fb,
> int x, int y, enum mode_set_atomic state)
> @@ -309,14 +294,12 @@ static const struct drm_crtc_helper_funcs dce_virtual_crtc_helper_funcs = {
> .mode_set_base_atomic = dce_virtual_crtc_set_base_atomic,
> .prepare = dce_virtual_crtc_prepare,
> .commit = dce_virtual_crtc_commit,
> - .load_lut = dce_virtual_crtc_load_lut,
> .disable = dce_virtual_crtc_disable,
> };
>
> static int dce_virtual_crtc_init(struct amdgpu_device *adev, int index)
> {
> struct amdgpu_crtc *amdgpu_crtc;
> - int i;
>
> amdgpu_crtc = kzalloc(sizeof(struct amdgpu_crtc) +
> (AMDGPUFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL);
> @@ -329,12 +312,6 @@ static int dce_virtual_crtc_init(struct amdgpu_device *adev, int index)
> amdgpu_crtc->crtc_id = index;
> adev->mode_info.crtcs[index] = amdgpu_crtc;
>
> - for (i = 0; i < 256; i++) {
> - amdgpu_crtc->lut_r[i] = i << 2;
> - amdgpu_crtc->lut_g[i] = i << 2;
> - amdgpu_crtc->lut_b[i] = i << 2;
> - }
> -
> amdgpu_crtc->pll_id = ATOM_PPLL_INVALID;
> amdgpu_crtc->encoder = NULL;
> amdgpu_crtc->connector = NULL;
> --
> 2.11.0
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
