1 files changed, 2 insertions, 31 deletions

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 7c2eb75db60f..7590df5e2e72 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1042,7 +1042,6 @@ static int setcolreg(struct drm_crtc *crtc, u16 red, u16 green,
 {
         struct drm_fb_helper *fb_helper = info->par;
         struct drm_framebuffer *fb = fb_helper->fb;
-        int pindex;
 
         if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
                 u32 *palette;
@@ -1074,38 +1073,10 @@ static int setcolreg(struct drm_crtc *crtc, u16 red, u16 green,
                     !fb_helper->funcs->gamma_get))
                 return -EINVAL;
 
-        pindex = regno;
+        WARN_ON(fb->bits_per_pixel != 8);
 
-        if (fb->bits_per_pixel == 16) {
-                pindex = regno << 3;
+        fb_helper->funcs->gamma_set(crtc, red, green, blue, regno);
 
-                if (fb->depth == 16 && regno > 63)
-                        return -EINVAL;
-                if (fb->depth == 15 && regno > 31)
-                        return -EINVAL;
-
-                if (fb->depth == 16) {
-                        u16 r, g, b;
-                        int i;
-                        if (regno < 32) {
-                                for (i = 0; i < 8; i++)
-                                        fb_helper->funcs->gamma_set(crtc, red,
-                                                green, blue, pindex + i);
-                        }
-
-                        fb_helper->funcs->gamma_get(crtc, &r,
-                                                    &g, &b,
-                                                    pindex >> 1);
-
-                        for (i = 0; i < 4; i++)
-                                fb_helper->funcs->gamma_set(crtc, r,
-                                                            green, b,
-                                                            (pindex >> 1) + i);
-                }
-        }
-
-        if (fb->depth != 16)
-                fb_helper->funcs->gamma_set(crtc, red, green, blue, pindex);
         return 0;
 }