From patchwork Mon Feb 19 10:13:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 128786 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3330272ljc; Mon, 19 Feb 2018 02:14:39 -0800 (PST) X-Google-Smtp-Source: AH8x224UBW5vKcgV4kJnM+pSIA4B2BerwTng58q1EJS0RufsjChFORGg/ZztnvDMgrrYXNz2nq7N X-Received: by 10.99.141.200 with SMTP id z191mr11757144pgd.418.1519035279245; Mon, 19 Feb 2018 02:14:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519035279; cv=none; d=google.com; s=arc-20160816; b=kz0+7yXVjUlit2vPbfMnh25ocxE3HebbbSTgOQ477hs7/+IzcAYeB1G6nUqaWwO9Xn qJsLTbrBaxIAlEpXs07Er6C4x5GIi7Ko20bhCuz4saDMoBjH7CmtOnl5awdW3syXb7p4 Fn6Cb25iwUiNKWDLrharQiZCZ8YkRxqs1ugZAT1aFmrLV2QDWivtbE3X7+kbMl7Mi0rW 63HotbzEbVPeidoXnkNAlt8AXrlxRlfxj7bXD1Udp9l9BYOCEMxpUpUo6GlM1b4uNvNf NFynngaK1XW79a2NNUQLgi83/po3do4lvQOg8pT9JoX0ja46WozgJT7vcz4r2I+ruYSU R3WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=9tlNaJmQImxCGEgovGBvlohY/2u1zXVnsturf7rUYM0=; b=bsEXGYZDbVwq5uM8oVLFQcX/PztFumF2dWm9Y5tsRJo4NVnJitCUDeyGINGjLcoe1C Qhmc9fKjD/FCSxztUPX4kojRXfPl6mNgkOmbGWDPMNXsxv50p6990/0MxfZMqGyjX+rj JePCV+QrkccvXvDxtjBGvGaHCgNg/dtcPfDWEl2owJBSA2V2fWVTpJWE0ESH3AQA7k+s XBxq9bwhwxOeLAyEuu0scYmOBvIAOviFExtpjvctYzuCHwnoaSVXxMOj5LSlHbh+5Oog ZY3c7asqnu5hcM0VQr9kZAfdMmhG6ie5uHhMre4R/qDBobWL66Mfj/VYfzPPnLFmKIzh 7OTQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y2si3789769pfa.311.2018.02.19.02.14.38; Mon, 19 Feb 2018 02:14:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752528AbeBSKOe (ORCPT + 28 others); Mon, 19 Feb 2018 05:14:34 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:36599 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752474AbeBSKOc (ORCPT ); Mon, 19 Feb 2018 05:14:32 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.129]) with ESMTPA (Nemesis) id 0M9RBC-1euqG50Wi6-00Cfi4; Mon, 19 Feb 2018 11:14:19 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Cc: Greg KH , linux-kernel@vger.kernel.org, Arnd Bergmann , Daniel Vetter , Daniel Vetter , Jani Nikula , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [4.9-stable 2/9] drm/i915: hide unused intel_panel_set_backlight function Date: Mon, 19 Feb 2018 11:13:21 +0100 Message-Id: <20180219101343.2922561-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180219101343.2922561-1-arnd@arndb.de> References: <20180219101343.2922561-1-arnd@arndb.de> X-Provags-ID: V03:K0:syI17ig/669v7CKzy4JLez8SJzddAwYBFjG3JNgvz/oGUinw0Be jMduc6xQvGZcXf5FlO/Az9fuwDT0Z9pjz2hm+coBNStTvRmpHTLaf3WD6BuAVLp360ALxwS EwY6KsAqynyE38Y7GFHA4/+OxlQ9+LDLx8ownuXIcSSnJfUxyFPfjTjj5y3ckQmc9su3kQh lIUYFGIkMGVpW9+Aq1uPQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:XHnaQBslcDM=:bGKL52b3bWGd8VrG42bwGR BPodTtPPRufGNi8aVVZ9plBLLVfZNmjPdbUX57vD/JgF2kkLl6gWTA4to+ymI7U+phwKtUrid mRVCN6bMUXVtaxQHJGTSfaoa0QV5r8+gqo94uv989I2mhbQstXVHzsHKnX3oklXfbkMykTB5+ 7Lb7wMUW0D9XRO//UJGMkLSR9Eu7bUyWAw9TMDOj262DxmzF6poNAhHHdf4HlqsqC5BJOigKW 2/JXhO9EUCNuY9K2nPWGZ/4whsUKdUs3yuby/l6wyFFYRvk/HiWuZWuBugKeUpMCAGKXQzvaP oyAaYZtjDs8Cd+SZTeGGFFPqguEDVHHPYCqwlENjFGa9NEZ8mjq0j44CJXw5O7gj6LvfXShVg fvUgkOQmPfxEecA1yDxGfmJRgwZ5VMin5NzIeakd7Aq56JmFCrXZfkRIJ9XWtAGSYpOycJDfj 0R/RvFL8aSeNBZ7p76qzlAjEYYlTZk/yoGUhAxAkcyItCg25pHMTBZDV1I940+XxO+3lcoXVy sqObtMuHRPw1TGtJyVgTz2gLBZ1zbjdXwb1mtqSv4n1VKx8sz3yeLvgtSOeszIBmF28Qy0ZdJ uoEHicz95JKriYltgVueNobjHWceMpb49SKBgRNk6WxWqpZOqwxYor+ZQ2HxgP/g+6tVDCFit yBZgqLMVke9Un5JIQip56UnSv9UanVciBRTrwtEA/QFL5mlTm+X4xgN5A9eLQkQVH76aKvbFk AWN+WHKIETP1igsczYCU3Y+svOX2rQ9K1MnYag== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit fd94d53e55bd487368dfee9f1af24da78b2bb582 upstream. Building i915 without backlight support results in a harmless warning for intel_panel_set_backlight: drivers/gpu/drm/i915/intel_panel.c:653:13: error: 'intel_panel_set_backlight' defined but not used [-Werror=unused-function] This moves it into the CONFIG_BACKLIGHT_CLASS_DEVICE section that its caller is in. Signed-off-by: Arnd Bergmann Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20171127151239.1813673-2-arnd@arndb.de [arnd: manually rebased to 4.9] Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/i915/intel_panel.c | 86 +++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 43 deletions(-) -- 2.9.0 diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index be4b4d546fd9..1cb1b01e4471 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -544,25 +544,6 @@ static u32 pwm_get_backlight(struct intel_connector *connector) return DIV_ROUND_UP(duty_ns * 100, CRC_PMIC_PWM_PERIOD_NS); } -static u32 intel_panel_get_backlight(struct intel_connector *connector) -{ - struct drm_i915_private *dev_priv = to_i915(connector->base.dev); - struct intel_panel *panel = &connector->panel; - u32 val = 0; - - mutex_lock(&dev_priv->backlight_lock); - - if (panel->backlight.enabled) { - val = panel->backlight.get(connector); - val = intel_panel_compute_brightness(connector, val); - } - - mutex_unlock(&dev_priv->backlight_lock); - - DRM_DEBUG_DRIVER("get backlight PWM = %d\n", val); - return val; -} - static void lpt_set_backlight(struct intel_connector *connector, u32 level) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); @@ -646,30 +627,6 @@ intel_panel_actually_set_backlight(struct intel_connector *connector, u32 level) panel->backlight.set(connector, level); } -/* set backlight brightness to level in range [0..max], scaling wrt hw min */ -static void intel_panel_set_backlight(struct intel_connector *connector, - u32 user_level, u32 user_max) -{ - struct drm_i915_private *dev_priv = to_i915(connector->base.dev); - struct intel_panel *panel = &connector->panel; - u32 hw_level; - - if (!panel->backlight.present) - return; - - mutex_lock(&dev_priv->backlight_lock); - - WARN_ON(panel->backlight.max == 0); - - hw_level = scale_user_to_hw(connector, user_level, user_max); - panel->backlight.level = hw_level; - - if (panel->backlight.enabled) - intel_panel_actually_set_backlight(connector, hw_level); - - mutex_unlock(&dev_priv->backlight_lock); -} - /* set backlight brightness to level in range [0..max], assuming hw min is * respected. */ @@ -1122,6 +1079,49 @@ void intel_panel_enable_backlight(struct intel_connector *connector) } #if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE) +static u32 intel_panel_get_backlight(struct intel_connector *connector) +{ + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); + struct intel_panel *panel = &connector->panel; + u32 val = 0; + + mutex_lock(&dev_priv->backlight_lock); + + if (panel->backlight.enabled) { + val = panel->backlight.get(connector); + val = intel_panel_compute_brightness(connector, val); + } + + mutex_unlock(&dev_priv->backlight_lock); + + DRM_DEBUG_DRIVER("get backlight PWM = %d\n", val); + return val; +} + +/* set backlight brightness to level in range [0..max], scaling wrt hw min */ +static void intel_panel_set_backlight(struct intel_connector *connector, + u32 user_level, u32 user_max) +{ + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); + struct intel_panel *panel = &connector->panel; + u32 hw_level; + + if (!panel->backlight.present) + return; + + mutex_lock(&dev_priv->backlight_lock); + + WARN_ON(panel->backlight.max == 0); + + hw_level = scale_user_to_hw(connector, user_level, user_max); + panel->backlight.level = hw_level; + + if (panel->backlight.enabled) + intel_panel_actually_set_backlight(connector, hw_level); + + mutex_unlock(&dev_priv->backlight_lock); +} + static int intel_backlight_device_update_status(struct backlight_device *bd) { struct intel_connector *connector = bl_get_data(bd);