drm: mgag200: remove dead code and pointless local lut storage

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@ffwll.ch>
Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20170713162538.22788-11-peda@axentia.se

diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h
index c88b6ec88dd2b2ee56d68f383079559a4cbec626..04f1dfba12e5993ead71b7ef1639ac208c0be938 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.h
@@ -237,11 +237,6 @@ mgag200_bo(struct ttm_buffer_object *bo)
 {
        return container_of(bo, struct mgag200_bo, bo);
 }
-                               /* mgag200_crtc.c */
-void mga_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
-                            u16 blue, int regno);
-void mga_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
-                            u16 *blue, int regno);
 
                                /* mgag200_mode.c */
 int mgag200_modeset_init(struct mga_device *mdev);

diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c
index e94d78a32fe0b3777a09ca43849ef5330d7c8658..9d914ca69996b93bb0a0f1275e4a553d04432dfd 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_fb.c
+++ b/drivers/gpu/drm/mgag200/mgag200_fb.c
@@ -257,8 +257,6 @@ static int mga_fbdev_destroy(struct drm_device *dev,
 }
 
 static const struct drm_fb_helper_funcs mga_fb_helper_funcs = {
-       .gamma_set = mga_crtc_fb_gamma_set,
-       .gamma_get = mga_crtc_fb_gamma_get,
        .fb_probe = mgag200fb_create,
 };
 

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index f4b53588e071e4cdc10ecbf152fcb0cee3d55e10..5e9cd4c0e8b631be790148c1df05d9573f7068cf 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -27,15 +27,19 @@
 
 static void mga_crtc_load_lut(struct drm_crtc *crtc)
 {
-       struct mga_crtc *mga_crtc = to_mga_crtc(crtc);
        struct drm_device *dev = crtc->dev;
        struct mga_device *mdev = dev->dev_private;
        struct drm_framebuffer *fb = crtc->primary->fb;
+       u16 *r_ptr, *g_ptr, *b_ptr;
        int i;
 
        if (!crtc->enabled)
                return;
 
+       r_ptr = crtc->gamma_store;
+       g_ptr = r_ptr + crtc->gamma_size;
+       b_ptr = g_ptr + crtc->gamma_size;
+
        WREG8(DAC_INDEX + MGA1064_INDEX, 0);
 
        if (fb && fb->format->cpp[0] * 8 == 16) {
@@ -46,25 +50,27 @@ static void mga_crtc_load_lut(struct drm_crtc *crtc)
                                if (i > (MGAG200_LUT_SIZE >> 1)) {
                                        r = b = 0;
                                } else {
-                                       r = mga_crtc->lut_r[i << 1];
-                                       b = mga_crtc->lut_b[i << 1];
+                                       r = *r_ptr++ >> 8;
+                                       b = *b_ptr++ >> 8;
+                                       r_ptr++;
+                                       b_ptr++;
                                }
                        } else {
-                               r = mga_crtc->lut_r[i];
-                               b = mga_crtc->lut_b[i];
+                               r = *r_ptr++ >> 8;
+                               b = *b_ptr++ >> 8;
                        }
                        /* VGA registers */
                        WREG8(DAC_INDEX + MGA1064_COL_PAL, r);
-                       WREG8(DAC_INDEX + MGA1064_COL_PAL, mga_crtc->lut_g[i]);
+                       WREG8(DAC_INDEX + MGA1064_COL_PAL, *g_ptr++ >> 8);
                        WREG8(DAC_INDEX + MGA1064_COL_PAL, b);
                }
                return;
        }
        for (i = 0; i < MGAG200_LUT_SIZE; i++) {
                /* VGA registers */
-               WREG8(DAC_INDEX + MGA1064_COL_PAL, mga_crtc->lut_r[i]);
-               WREG8(DAC_INDEX + MGA1064_COL_PAL, mga_crtc->lut_g[i]);
-               WREG8(DAC_INDEX + MGA1064_COL_PAL, mga_crtc->lut_b[i]);
+               WREG8(DAC_INDEX + MGA1064_COL_PAL, *r_ptr++ >> 8);
+               WREG8(DAC_INDEX + MGA1064_COL_PAL, *g_ptr++ >> 8);
+               WREG8(DAC_INDEX + MGA1064_COL_PAL, *b_ptr++ >> 8);
        }
 }
 
@@ -1399,14 +1405,6 @@ static int mga_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
                              u16 *blue, uint32_t size,
                              struct drm_modeset_acquire_ctx *ctx)
 {
-       struct mga_crtc *mga_crtc = to_mga_crtc(crtc);
-       int i;
-
-       for (i = 0; i < size; i++) {
-               mga_crtc->lut_r[i] = red[i] >> 8;
-               mga_crtc->lut_g[i] = green[i] >> 8;
-               mga_crtc->lut_b[i] = blue[i] >> 8;
-       }
        mga_crtc_load_lut(crtc);
 
        return 0;
@@ -1455,14 +1453,12 @@ static const struct drm_crtc_helper_funcs mga_helper_funcs = {
        .mode_set_base = mga_crtc_mode_set_base,
        .prepare = mga_crtc_prepare,
        .commit = mga_crtc_commit,
-       .load_lut = mga_crtc_load_lut,
 };
 
 /* CRTC setup */
 static void mga_crtc_init(struct mga_device *mdev)
 {
        struct mga_crtc *mga_crtc;
-       int i;
 
        mga_crtc = kzalloc(sizeof(struct mga_crtc) +
                              (MGAG200FB_CONN_LIMIT * sizeof(struct drm_connector *)),
@@ -1476,37 +1472,9 @@ static void mga_crtc_init(struct mga_device *mdev)
        drm_mode_crtc_set_gamma_size(&mga_crtc->base, MGAG200_LUT_SIZE);
        mdev->mode_info.crtc = mga_crtc;
 
-       for (i = 0; i < MGAG200_LUT_SIZE; i++) {
-               mga_crtc->lut_r[i] = i;
-               mga_crtc->lut_g[i] = i;
-               mga_crtc->lut_b[i] = i;
-       }
-
        drm_crtc_helper_add(&mga_crtc->base, &mga_helper_funcs);
 }
 
-/** Sets the color ramps on behalf of fbcon */
-void mga_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
-                             u16 blue, int regno)
-{
-       struct mga_crtc *mga_crtc = to_mga_crtc(crtc);
-
-       mga_crtc->lut_r[regno] = red >> 8;
-       mga_crtc->lut_g[regno] = green >> 8;
-       mga_crtc->lut_b[regno] = blue >> 8;
-}
-
-/** Gets the color ramps on behalf of fbcon */
-void mga_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
-                             u16 *blue, int regno)
-{
-       struct mga_crtc *mga_crtc = to_mga_crtc(crtc);
-
-       *red = (u16)mga_crtc->lut_r[regno] << 8;
-       *green = (u16)mga_crtc->lut_g[regno] << 8;
-       *blue = (u16)mga_crtc->lut_b[regno] << 8;
-}
-
 /*
  * The encoder comes after the CRTC in the output pipeline, but before
  * the connector. It's responsible for ensuring that the digital