From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C7A5C63777 for ; Thu, 26 Nov 2020 10:54:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 96A6E21527 for ; Thu, 26 Nov 2020 10:54:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96A6E21527 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C6EE6E891; Thu, 26 Nov 2020 10:54:18 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 42D0A6E891; Thu, 26 Nov 2020 10:54:17 +0000 (UTC) IronPort-SDR: FpU4IkHElYnTO5wUwiwLqYXuPo0D7esLSXmOLuypOgWOELJweXuU6uwaM5Ef1Yclg6R0P0fDMo G0rAYH3VI+/Q== X-IronPort-AV: E=McAfee;i="6000,8403,9816"; a="151526603" X-IronPort-AV: E=Sophos;i="5.78,371,1599548400"; d="scan'208";a="151526603" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 02:54:16 -0800 IronPort-SDR: 4AarGaMBF+7BwfCGphXiafVOFaYgPa9JhZDJwwpxqgxNm0IvfnKWcKPbyEF9pzadymUU7iMUBy 3j2MWFG0wQzA== X-IronPort-AV: E=Sophos;i="5.78,371,1599548400"; d="scan'208";a="547674503" Received: from mpascu-mobl2.ger.corp.intel.com (HELO localhost) ([10.249.41.186]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 02:54:11 -0800 From: Jani Nikula To: Lyude Paul , intel-gfx@lists.freedesktop.org In-Reply-To: <20200916171855.129511-3-lyude@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200916171855.129511-1-lyude@redhat.com> <20200916171855.129511-3-lyude@redhat.com> Date: Thu, 26 Nov 2020 12:54:08 +0200 Message-ID: <87sg8wl773.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [RFC v2 2/8] drm/i915: Rename pwm_* backlight callbacks to ext_pwm_* X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , David Airlie , open list , dri-devel@lists.freedesktop.org, Chris Wilson , Vasily Khoruzhick , Wambui Karuga Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 16 Sep 2020, Lyude Paul wrote: > Since we're going to need to add a set of lower-level PWM backlight > control hooks to be shared by normal backlight controls and HDR > backlight controls in SDR mode, let's add a prefix to the external PWM > backlight functions so that the difference between them and the high > level PWM-only backlight functions is a bit more obvious. > > This introduces no functional changes. > > Signed-off-by: Lyude Paul > Reviewed-by: Rodrigo Vivi > Cc: thaytan@noraisin.net > Cc: Vasily Khoruzhick Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_panel.c | 24 +++++++++++----------- > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c > index 9f23bac0d7924..c0e36244bb07d 100644 > --- a/drivers/gpu/drm/i915/display/intel_panel.c > +++ b/drivers/gpu/drm/i915/display/intel_panel.c > @@ -589,7 +589,7 @@ static u32 bxt_get_backlight(struct intel_connector *connector) > BXT_BLC_PWM_DUTY(panel->backlight.controller)); > } > > -static u32 pwm_get_backlight(struct intel_connector *connector) > +static u32 ext_pwm_get_backlight(struct intel_connector *connector) > { > struct intel_panel *panel = &connector->panel; > struct pwm_state state; > @@ -666,7 +666,7 @@ static void bxt_set_backlight(const struct drm_connector_state *conn_state, u32 > BXT_BLC_PWM_DUTY(panel->backlight.controller), level); > } > > -static void pwm_set_backlight(const struct drm_connector_state *conn_state, u32 level) > +static void ext_pwm_set_backlight(const struct drm_connector_state *conn_state, u32 level) > { > struct intel_panel *panel = &to_intel_connector(conn_state->connector)->panel; > > @@ -835,7 +835,7 @@ static void cnp_disable_backlight(const struct drm_connector_state *old_conn_sta > tmp & ~BXT_BLC_PWM_ENABLE); > } > > -static void pwm_disable_backlight(const struct drm_connector_state *old_conn_state) > +static void ext_pwm_disable_backlight(const struct drm_connector_state *old_conn_state) > { > struct intel_connector *connector = to_intel_connector(old_conn_state->connector); > struct intel_panel *panel = &connector->panel; > @@ -1168,8 +1168,8 @@ static void cnp_enable_backlight(const struct intel_crtc_state *crtc_state, > pwm_ctl | BXT_BLC_PWM_ENABLE); > } > > -static void pwm_enable_backlight(const struct intel_crtc_state *crtc_state, > - const struct drm_connector_state *conn_state) > +static void ext_pwm_enable_backlight(const struct intel_crtc_state *crtc_state, > + const struct drm_connector_state *conn_state) > { > struct intel_connector *connector = to_intel_connector(conn_state->connector); > struct intel_panel *panel = &connector->panel; > @@ -1890,8 +1890,8 @@ cnp_setup_backlight(struct intel_connector *connector, enum pipe unused) > return 0; > } > > -static int pwm_setup_backlight(struct intel_connector *connector, > - enum pipe pipe) > +static int ext_pwm_setup_backlight(struct intel_connector *connector, > + enum pipe pipe) > { > struct drm_device *dev = connector->base.dev; > struct drm_i915_private *dev_priv = to_i915(dev); > @@ -2065,11 +2065,11 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) > panel->backlight.hz_to_pwm = pch_hz_to_pwm; > } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > if (connector->base.connector_type == DRM_MODE_CONNECTOR_DSI) { > - panel->backlight.setup = pwm_setup_backlight; > - panel->backlight.enable = pwm_enable_backlight; > - panel->backlight.disable = pwm_disable_backlight; > - panel->backlight.set = pwm_set_backlight; > - panel->backlight.get = pwm_get_backlight; > + panel->backlight.setup = ext_pwm_setup_backlight; > + panel->backlight.enable = ext_pwm_enable_backlight; > + panel->backlight.disable = ext_pwm_disable_backlight; > + panel->backlight.set = ext_pwm_set_backlight; > + panel->backlight.get = ext_pwm_get_backlight; > } else { > panel->backlight.setup = vlv_setup_backlight; > panel->backlight.enable = vlv_enable_backlight; -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0670EC56202 for ; Thu, 26 Nov 2020 10:54:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9EA8120DD4 for ; Thu, 26 Nov 2020 10:54:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9EA8120DD4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BA6096E896; Thu, 26 Nov 2020 10:54:18 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 42D0A6E891; Thu, 26 Nov 2020 10:54:17 +0000 (UTC) IronPort-SDR: FpU4IkHElYnTO5wUwiwLqYXuPo0D7esLSXmOLuypOgWOELJweXuU6uwaM5Ef1Yclg6R0P0fDMo G0rAYH3VI+/Q== X-IronPort-AV: E=McAfee;i="6000,8403,9816"; a="151526603" X-IronPort-AV: E=Sophos;i="5.78,371,1599548400"; d="scan'208";a="151526603" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 02:54:16 -0800 IronPort-SDR: 4AarGaMBF+7BwfCGphXiafVOFaYgPa9JhZDJwwpxqgxNm0IvfnKWcKPbyEF9pzadymUU7iMUBy 3j2MWFG0wQzA== X-IronPort-AV: E=Sophos;i="5.78,371,1599548400"; d="scan'208";a="547674503" Received: from mpascu-mobl2.ger.corp.intel.com (HELO localhost) ([10.249.41.186]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 02:54:11 -0800 From: Jani Nikula To: Lyude Paul , intel-gfx@lists.freedesktop.org Subject: Re: [RFC v2 2/8] drm/i915: Rename pwm_* backlight callbacks to ext_pwm_* In-Reply-To: <20200916171855.129511-3-lyude@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200916171855.129511-1-lyude@redhat.com> <20200916171855.129511-3-lyude@redhat.com> Date: Thu, 26 Nov 2020 12:54:08 +0200 Message-ID: <87sg8wl773.fsf@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thaytan@noraisin.net, Arnd Bergmann , David Airlie , open list , dri-devel@lists.freedesktop.org, Chris Wilson , Vasily Khoruzhick , Hans de Goede , Rodrigo Vivi , Manasi Navare , Wambui Karuga Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, 16 Sep 2020, Lyude Paul wrote: > Since we're going to need to add a set of lower-level PWM backlight > control hooks to be shared by normal backlight controls and HDR > backlight controls in SDR mode, let's add a prefix to the external PWM > backlight functions so that the difference between them and the high > level PWM-only backlight functions is a bit more obvious. > > This introduces no functional changes. > > Signed-off-by: Lyude Paul > Reviewed-by: Rodrigo Vivi > Cc: thaytan@noraisin.net > Cc: Vasily Khoruzhick Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_panel.c | 24 +++++++++++----------- > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c > index 9f23bac0d7924..c0e36244bb07d 100644 > --- a/drivers/gpu/drm/i915/display/intel_panel.c > +++ b/drivers/gpu/drm/i915/display/intel_panel.c > @@ -589,7 +589,7 @@ static u32 bxt_get_backlight(struct intel_connector *connector) > BXT_BLC_PWM_DUTY(panel->backlight.controller)); > } > > -static u32 pwm_get_backlight(struct intel_connector *connector) > +static u32 ext_pwm_get_backlight(struct intel_connector *connector) > { > struct intel_panel *panel = &connector->panel; > struct pwm_state state; > @@ -666,7 +666,7 @@ static void bxt_set_backlight(const struct drm_connector_state *conn_state, u32 > BXT_BLC_PWM_DUTY(panel->backlight.controller), level); > } > > -static void pwm_set_backlight(const struct drm_connector_state *conn_state, u32 level) > +static void ext_pwm_set_backlight(const struct drm_connector_state *conn_state, u32 level) > { > struct intel_panel *panel = &to_intel_connector(conn_state->connector)->panel; > > @@ -835,7 +835,7 @@ static void cnp_disable_backlight(const struct drm_connector_state *old_conn_sta > tmp & ~BXT_BLC_PWM_ENABLE); > } > > -static void pwm_disable_backlight(const struct drm_connector_state *old_conn_state) > +static void ext_pwm_disable_backlight(const struct drm_connector_state *old_conn_state) > { > struct intel_connector *connector = to_intel_connector(old_conn_state->connector); > struct intel_panel *panel = &connector->panel; > @@ -1168,8 +1168,8 @@ static void cnp_enable_backlight(const struct intel_crtc_state *crtc_state, > pwm_ctl | BXT_BLC_PWM_ENABLE); > } > > -static void pwm_enable_backlight(const struct intel_crtc_state *crtc_state, > - const struct drm_connector_state *conn_state) > +static void ext_pwm_enable_backlight(const struct intel_crtc_state *crtc_state, > + const struct drm_connector_state *conn_state) > { > struct intel_connector *connector = to_intel_connector(conn_state->connector); > struct intel_panel *panel = &connector->panel; > @@ -1890,8 +1890,8 @@ cnp_setup_backlight(struct intel_connector *connector, enum pipe unused) > return 0; > } > > -static int pwm_setup_backlight(struct intel_connector *connector, > - enum pipe pipe) > +static int ext_pwm_setup_backlight(struct intel_connector *connector, > + enum pipe pipe) > { > struct drm_device *dev = connector->base.dev; > struct drm_i915_private *dev_priv = to_i915(dev); > @@ -2065,11 +2065,11 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) > panel->backlight.hz_to_pwm = pch_hz_to_pwm; > } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > if (connector->base.connector_type == DRM_MODE_CONNECTOR_DSI) { > - panel->backlight.setup = pwm_setup_backlight; > - panel->backlight.enable = pwm_enable_backlight; > - panel->backlight.disable = pwm_disable_backlight; > - panel->backlight.set = pwm_set_backlight; > - panel->backlight.get = pwm_get_backlight; > + panel->backlight.setup = ext_pwm_setup_backlight; > + panel->backlight.enable = ext_pwm_enable_backlight; > + panel->backlight.disable = ext_pwm_disable_backlight; > + panel->backlight.set = ext_pwm_set_backlight; > + panel->backlight.get = ext_pwm_get_backlight; > } else { > panel->backlight.setup = vlv_setup_backlight; > panel->backlight.enable = vlv_enable_backlight; -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C04B8C56202 for ; Thu, 26 Nov 2020 10:54:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6448C20DD4 for ; Thu, 26 Nov 2020 10:54:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388606AbgKZKyR (ORCPT ); Thu, 26 Nov 2020 05:54:17 -0500 Received: from mga09.intel.com ([134.134.136.24]:61268 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726602AbgKZKyR (ORCPT ); Thu, 26 Nov 2020 05:54:17 -0500 IronPort-SDR: ceQwpg15OII09d4TlBgdZHd/oqJLGiD62NjjX+tErqoPO7W1HS5gm2xZd7O7OfwSDbZKPXE9Iy swk3v8NWopMQ== X-IronPort-AV: E=McAfee;i="6000,8403,9816"; a="172425482" X-IronPort-AV: E=Sophos;i="5.78,371,1599548400"; d="scan'208";a="172425482" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 02:54:16 -0800 IronPort-SDR: 4AarGaMBF+7BwfCGphXiafVOFaYgPa9JhZDJwwpxqgxNm0IvfnKWcKPbyEF9pzadymUU7iMUBy 3j2MWFG0wQzA== X-IronPort-AV: E=Sophos;i="5.78,371,1599548400"; d="scan'208";a="547674503" Received: from mpascu-mobl2.ger.corp.intel.com (HELO localhost) ([10.249.41.186]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 02:54:11 -0800 From: Jani Nikula To: Lyude Paul , intel-gfx@lists.freedesktop.org Cc: thaytan@noraisin.net, Arnd Bergmann , David Airlie , open list , Chris Wilson , Vasily Khoruzhick , Hans de Goede , dri-devel@lists.freedesktop.org, Rodrigo Vivi , Manasi Navare , Wambui Karuga Subject: Re: [RFC v2 2/8] drm/i915: Rename pwm_* backlight callbacks to ext_pwm_* In-Reply-To: <20200916171855.129511-3-lyude@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200916171855.129511-1-lyude@redhat.com> <20200916171855.129511-3-lyude@redhat.com> Date: Thu, 26 Nov 2020 12:54:08 +0200 Message-ID: <87sg8wl773.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 16 Sep 2020, Lyude Paul wrote: > Since we're going to need to add a set of lower-level PWM backlight > control hooks to be shared by normal backlight controls and HDR > backlight controls in SDR mode, let's add a prefix to the external PWM > backlight functions so that the difference between them and the high > level PWM-only backlight functions is a bit more obvious. > > This introduces no functional changes. > > Signed-off-by: Lyude Paul > Reviewed-by: Rodrigo Vivi > Cc: thaytan@noraisin.net > Cc: Vasily Khoruzhick Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_panel.c | 24 +++++++++++----------- > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c > index 9f23bac0d7924..c0e36244bb07d 100644 > --- a/drivers/gpu/drm/i915/display/intel_panel.c > +++ b/drivers/gpu/drm/i915/display/intel_panel.c > @@ -589,7 +589,7 @@ static u32 bxt_get_backlight(struct intel_connector *connector) > BXT_BLC_PWM_DUTY(panel->backlight.controller)); > } > > -static u32 pwm_get_backlight(struct intel_connector *connector) > +static u32 ext_pwm_get_backlight(struct intel_connector *connector) > { > struct intel_panel *panel = &connector->panel; > struct pwm_state state; > @@ -666,7 +666,7 @@ static void bxt_set_backlight(const struct drm_connector_state *conn_state, u32 > BXT_BLC_PWM_DUTY(panel->backlight.controller), level); > } > > -static void pwm_set_backlight(const struct drm_connector_state *conn_state, u32 level) > +static void ext_pwm_set_backlight(const struct drm_connector_state *conn_state, u32 level) > { > struct intel_panel *panel = &to_intel_connector(conn_state->connector)->panel; > > @@ -835,7 +835,7 @@ static void cnp_disable_backlight(const struct drm_connector_state *old_conn_sta > tmp & ~BXT_BLC_PWM_ENABLE); > } > > -static void pwm_disable_backlight(const struct drm_connector_state *old_conn_state) > +static void ext_pwm_disable_backlight(const struct drm_connector_state *old_conn_state) > { > struct intel_connector *connector = to_intel_connector(old_conn_state->connector); > struct intel_panel *panel = &connector->panel; > @@ -1168,8 +1168,8 @@ static void cnp_enable_backlight(const struct intel_crtc_state *crtc_state, > pwm_ctl | BXT_BLC_PWM_ENABLE); > } > > -static void pwm_enable_backlight(const struct intel_crtc_state *crtc_state, > - const struct drm_connector_state *conn_state) > +static void ext_pwm_enable_backlight(const struct intel_crtc_state *crtc_state, > + const struct drm_connector_state *conn_state) > { > struct intel_connector *connector = to_intel_connector(conn_state->connector); > struct intel_panel *panel = &connector->panel; > @@ -1890,8 +1890,8 @@ cnp_setup_backlight(struct intel_connector *connector, enum pipe unused) > return 0; > } > > -static int pwm_setup_backlight(struct intel_connector *connector, > - enum pipe pipe) > +static int ext_pwm_setup_backlight(struct intel_connector *connector, > + enum pipe pipe) > { > struct drm_device *dev = connector->base.dev; > struct drm_i915_private *dev_priv = to_i915(dev); > @@ -2065,11 +2065,11 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) > panel->backlight.hz_to_pwm = pch_hz_to_pwm; > } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > if (connector->base.connector_type == DRM_MODE_CONNECTOR_DSI) { > - panel->backlight.setup = pwm_setup_backlight; > - panel->backlight.enable = pwm_enable_backlight; > - panel->backlight.disable = pwm_disable_backlight; > - panel->backlight.set = pwm_set_backlight; > - panel->backlight.get = pwm_get_backlight; > + panel->backlight.setup = ext_pwm_setup_backlight; > + panel->backlight.enable = ext_pwm_enable_backlight; > + panel->backlight.disable = ext_pwm_disable_backlight; > + panel->backlight.set = ext_pwm_set_backlight; > + panel->backlight.get = ext_pwm_get_backlight; > } else { > panel->backlight.setup = vlv_setup_backlight; > panel->backlight.enable = vlv_enable_backlight; -- Jani Nikula, Intel Open Source Graphics Center