From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754410AbdGNOGv (ORCPT ); Fri, 14 Jul 2017 10:06:51 -0400 Received: from mail-yw0-f194.google.com ([209.85.161.194]:34864 "EHLO mail-yw0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754028AbdGNOGt (ORCPT ); Fri, 14 Jul 2017 10:06:49 -0400 MIME-Version: 1.0 In-Reply-To: <20170713162538.22788-13-peda@axentia.se> References: <20170713162538.22788-1-peda@axentia.se> <20170713162538.22788-13-peda@axentia.se> From: Alex Deucher Date: Fri, 14 Jul 2017 10:06:47 -0400 Message-ID: Subject: Re: [PATCH v5 12/14] drm: radeon: remove dead code and pointless local lut storage To: Peter Rosin Cc: LKML , Jani Nikula , Boris Brezillon , Lionel Landwerlin , David Airlie , Maling list - DRI developers , =?UTF-8?Q?Christian_K=C3=B6nig?= , Sean Paul , amd-gfx list , Alex Deucher , Daniel Vetter Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 13, 2017 at 12:25 PM, Peter Rosin 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 > Signed-off-by: Peter Rosin Acked-by: Alex Deucher > --- > drivers/gpu/drm/radeon/atombios_crtc.c | 1 - > drivers/gpu/drm/radeon/radeon_connectors.c | 7 ++- > drivers/gpu/drm/radeon/radeon_display.c | 71 ++++++++++++----------------- > drivers/gpu/drm/radeon/radeon_fb.c | 2 - > drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 1 - > drivers/gpu/drm/radeon/radeon_mode.h | 4 -- > 6 files changed, 33 insertions(+), 53 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c > index 3c492a0aa6bd..02baaaf20e9d 100644 > --- a/drivers/gpu/drm/radeon/atombios_crtc.c > +++ b/drivers/gpu/drm/radeon/atombios_crtc.c > @@ -2217,7 +2217,6 @@ static const struct drm_crtc_helper_funcs atombios_helper_funcs = { > .mode_set_base_atomic = atombios_crtc_set_base_atomic, > .prepare = atombios_crtc_prepare, > .commit = atombios_crtc_commit, > - .load_lut = radeon_crtc_load_lut, > .disable = atombios_crtc_disable, > }; > > diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c > index 27affbde058c..2f642cbefd8e 100644 > --- a/drivers/gpu/drm/radeon/radeon_connectors.c > +++ b/drivers/gpu/drm/radeon/radeon_connectors.c > @@ -773,12 +773,15 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct > > if (connector->encoder->crtc) { > struct drm_crtc *crtc = connector->encoder->crtc; > - const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; > struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); > > radeon_crtc->output_csc = radeon_encoder->output_csc; > > - (*crtc_funcs->load_lut)(crtc); > + /* > + * Our .gamma_set assumes the .gamma_store has been > + * prefilled and don't care about its arguments. > + */ > + crtc->funcs->gamma_set(crtc, NULL, NULL, NULL, 0, NULL); > } > } > > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index 17d3dafc8319..8b7d7a0d3ca8 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -42,6 +42,7 @@ static void avivo_crtc_load_lut(struct drm_crtc *crtc) > struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); > struct drm_device *dev = crtc->dev; > struct radeon_device *rdev = dev->dev_private; > + u16 *r, *g, *b; > int i; > > DRM_DEBUG_KMS("%d\n", radeon_crtc->crtc_id); > @@ -60,11 +61,14 @@ static void avivo_crtc_load_lut(struct drm_crtc *crtc) > WREG32(AVIVO_DC_LUT_WRITE_EN_MASK, 0x0000003f); > > WREG8(AVIVO_DC_LUT_RW_INDEX, 0); > + r = crtc->gamma_store; > + g = r + crtc->gamma_size; > + b = g + crtc->gamma_size; > for (i = 0; i < 256; i++) { > WREG32(AVIVO_DC_LUT_30_COLOR, > - (radeon_crtc->lut_r[i] << 20) | > - (radeon_crtc->lut_g[i] << 10) | > - (radeon_crtc->lut_b[i] << 0)); > + ((*r++ & 0xffc0) << 14) | > + ((*g++ & 0xffc0) << 4) | > + (*b++ >> 6)); > } > > /* Only change bit 0 of LUT_SEL, other bits are set elsewhere */ > @@ -76,6 +80,7 @@ static void dce4_crtc_load_lut(struct drm_crtc *crtc) > struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); > struct drm_device *dev = crtc->dev; > struct radeon_device *rdev = dev->dev_private; > + u16 *r, *g, *b; > int i; > > DRM_DEBUG_KMS("%d\n", radeon_crtc->crtc_id); > @@ -93,11 +98,14 @@ static void dce4_crtc_load_lut(struct drm_crtc *crtc) > WREG32(EVERGREEN_DC_LUT_WRITE_EN_MASK + radeon_crtc->crtc_offset, 0x00000007); > > WREG32(EVERGREEN_DC_LUT_RW_INDEX + radeon_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(EVERGREEN_DC_LUT_30_COLOR + radeon_crtc->crtc_offset, > - (radeon_crtc->lut_r[i] << 20) | > - (radeon_crtc->lut_g[i] << 10) | > - (radeon_crtc->lut_b[i] << 0)); > + ((*r++ & 0xffc0) << 14) | > + ((*g++ & 0xffc0) << 4) | > + (*b++ >> 6)); > } > } > > @@ -106,6 +114,7 @@ static void dce5_crtc_load_lut(struct drm_crtc *crtc) > struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); > struct drm_device *dev = crtc->dev; > struct radeon_device *rdev = dev->dev_private; > + u16 *r, *g, *b; > int i; > > DRM_DEBUG_KMS("%d\n", radeon_crtc->crtc_id); > @@ -135,11 +144,14 @@ static void dce5_crtc_load_lut(struct drm_crtc *crtc) > WREG32(EVERGREEN_DC_LUT_WRITE_EN_MASK + radeon_crtc->crtc_offset, 0x00000007); > > WREG32(EVERGREEN_DC_LUT_RW_INDEX + radeon_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(EVERGREEN_DC_LUT_30_COLOR + radeon_crtc->crtc_offset, > - (radeon_crtc->lut_r[i] << 20) | > - (radeon_crtc->lut_g[i] << 10) | > - (radeon_crtc->lut_b[i] << 0)); > + ((*r++ & 0xffc0) << 14) | > + ((*g++ & 0xffc0) << 4) | > + (*b++ >> 6)); > } > > WREG32(NI_DEGAMMA_CONTROL + radeon_crtc->crtc_offset, > @@ -172,6 +184,7 @@ static void legacy_crtc_load_lut(struct drm_crtc *crtc) > struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); > struct drm_device *dev = crtc->dev; > struct radeon_device *rdev = dev->dev_private; > + u16 *r, *g, *b; > int i; > uint32_t dac2_cntl; > > @@ -183,11 +196,14 @@ static void legacy_crtc_load_lut(struct drm_crtc *crtc) > WREG32(RADEON_DAC_CNTL2, dac2_cntl); > > WREG8(RADEON_PALETTE_INDEX, 0); > + r = crtc->gamma_store; > + g = r + crtc->gamma_size; > + b = g + crtc->gamma_size; > for (i = 0; i < 256; i++) { > WREG32(RADEON_PALETTE_30_DATA, > - (radeon_crtc->lut_r[i] << 20) | > - (radeon_crtc->lut_g[i] << 10) | > - (radeon_crtc->lut_b[i] << 0)); > + ((*r++ & 0xffc0) << 14) | > + ((*g++ & 0xffc0) << 4) | > + (*b++ >> 6)); > } > } > > @@ -209,41 +225,10 @@ void radeon_crtc_load_lut(struct drm_crtc *crtc) > legacy_crtc_load_lut(crtc); > } > > -/** Sets the color ramps on behalf of fbcon */ > -void radeon_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, > - u16 blue, int regno) > -{ > - struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); > - > - radeon_crtc->lut_r[regno] = red >> 6; > - radeon_crtc->lut_g[regno] = green >> 6; > - radeon_crtc->lut_b[regno] = blue >> 6; > -} > - > -/** Gets the color ramps on behalf of fbcon */ > -void radeon_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, > - u16 *blue, int regno) > -{ > - struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); > - > - *red = radeon_crtc->lut_r[regno] << 6; > - *green = radeon_crtc->lut_g[regno] << 6; > - *blue = radeon_crtc->lut_b[regno] << 6; > -} > - > static int radeon_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, > u16 *blue, uint32_t size, > struct drm_modeset_acquire_ctx *ctx) > { > - struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); > - int i; > - > - /* userspace palettes are always correct as is */ > - for (i = 0; i < size; 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; > - } > radeon_crtc_load_lut(crtc); > > return 0; > diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c > index 356ad90a5238..638bcb5593c8 100644 > --- a/drivers/gpu/drm/radeon/radeon_fb.c > +++ b/drivers/gpu/drm/radeon/radeon_fb.c > @@ -332,8 +332,6 @@ static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfb > } > > static const struct drm_fb_helper_funcs radeon_fb_helper_funcs = { > - .gamma_set = radeon_crtc_fb_gamma_set, > - .gamma_get = radeon_crtc_fb_gamma_get, > .fb_probe = radeonfb_create, > }; > > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > index ce6cb6666212..1f1856e0b1e0 100644 > --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > @@ -1116,7 +1116,6 @@ static const struct drm_crtc_helper_funcs legacy_helper_funcs = { > .mode_set_base_atomic = radeon_crtc_set_base_atomic, > .prepare = radeon_crtc_prepare, > .commit = radeon_crtc_commit, > - .load_lut = radeon_crtc_load_lut, > .disable = radeon_crtc_disable > }; > > diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h > index 00f5ec5c12c7..da44ac234f64 100644 > --- a/drivers/gpu/drm/radeon/radeon_mode.h > +++ b/drivers/gpu/drm/radeon/radeon_mode.h > @@ -935,10 +935,6 @@ extern void > radeon_combios_encoder_crtc_scratch_regs(struct drm_encoder *encoder, int crtc); > extern void > radeon_combios_encoder_dpms_scratch_regs(struct drm_encoder *encoder, bool on); > -extern void radeon_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, > - u16 blue, int regno); > -extern void radeon_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, > - u16 *blue, int regno); > int radeon_framebuffer_init(struct drm_device *dev, > struct radeon_framebuffer *rfb, > const struct drm_mode_fb_cmd2 *mode_cmd, > -- > 2.11.0 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx