From patchwork Wed Mar 30 09:51:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8694661 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 459E6C0553 for ; Wed, 30 Mar 2016 09:51:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7D66920374 for ; Wed, 30 Mar 2016 09:51:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id AC21220361 for ; Wed, 30 Mar 2016 09:51:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A15E6E766; Wed, 30 Mar 2016 09:51:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x22e.google.com (mail-wm0-x22e.google.com [IPv6:2a00:1450:400c:c09::22e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 612DE6E75C for ; Wed, 30 Mar 2016 09:51:30 +0000 (UTC) Received: by mail-wm0-x22e.google.com with SMTP id p65so63390773wmp.0 for ; Wed, 30 Mar 2016 02:51:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UnGHN1kag9hQdPVOsyK9Rim+DENQ52s4EYAnsgfAiCs=; b=Ewa1ulElqvCuwA8+IG2szquFRhorQX+TT3BZDQxM8rtFUNISiu0BE/nR+conGVSh5v 0UvwZLRl1Y27cyz9WA1if7Vz3e58JPTG3T3VIElXbCEWpWY8/+SIjA600chmAKt2AWaj fHVncDJnJeNg5mtqTI5mhJlYUI4+sQhQH3K3w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UnGHN1kag9hQdPVOsyK9Rim+DENQ52s4EYAnsgfAiCs=; b=DE2UcF2wokIhxeD2iGjZoRZhidkWe1Uk7lr8BoDoLr6CFtLvPKhYt7zPdQrYPXGuUr aY679rrddDABfi5/Wfczu0JLDWTJ589NFU70bulzTLDqn2pqFCX47D62osiX8AIvf6HG tgY87GEI9hTGcojFRr+gIM4gD9hsv0vKHS0NizkWsSbcWTh8NWgnBsqDneLH7O8PO4AE S1Dlaljj8LEipP8FdffGPAM2EOORqMgpwIyf9o+qeLGQQfCC7UMkhIA3APCpk5y5pPvu WL7nJcAZGZzANLKTtP690XAfDxUYJbg136uzCD5e1aufGJ74WbOetlMh8MGoSMZeFB0O hVwQ== X-Gm-Message-State: AD7BkJI34cXAD/J4TRR5N1afXI17pmfvW482OvYiYvHLP+F07TOAsDcDRFnip6vxLg85UA== X-Received: by 10.28.217.82 with SMTP id q79mr9011918wmg.29.1459331487932; Wed, 30 Mar 2016 02:51:27 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id by7sm3029541wjc.18.2016.03.30.02.51.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 02:51:27 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 02/10] drm/fb-helper: Remove dead code in setcolreg Date: Wed, 30 Mar 2016 11:51:17 +0200 Message-Id: <1459331485-28376-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459331485-28376-1-git-send-email-daniel.vetter@ffwll.ch> References: <1459331485-28376-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP DRM fbdev emulation only supports pallete_color with depth == 8, and truecolor with depth > 8. Handling depth == 16 for palettes is hence dead code, let's remove it. Signed-off-by: Daniel Vetter Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/drm_fb_helper.c | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 855108e6e1bd..39f9b8a41843 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -969,7 +969,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; @@ -1001,38 +1000,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; }