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=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 8F09AC433DF for ; Thu, 15 Oct 2020 18:31:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3EA6920872 for ; Thu, 15 Oct 2020 18:31:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730421AbgJOSbc (ORCPT ); Thu, 15 Oct 2020 14:31:32 -0400 Received: from mga01.intel.com ([192.55.52.88]:42034 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728820AbgJOSb3 (ORCPT ); Thu, 15 Oct 2020 14:31:29 -0400 IronPort-SDR: p0cBwZyLkXtIVbCzscIBek4LtKi1PpcUOFjBj3UKZoFI7nASXdGDX2IwnjM/lG4jPSD0RUPlgJ YykJgomYjpMg== X-IronPort-AV: E=McAfee;i="6000,8403,9775"; a="183977312" X-IronPort-AV: E=Sophos;i="5.77,380,1596524400"; d="scan'208";a="183977312" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2020 11:31:28 -0700 IronPort-SDR: 7GROFgBE4RCUigGB05d/0MNJRDcpjwBMp4DVTVwplIO3V8PkOlnsbghRcKmOUpz3ruAKKgNhWi h436yIC/KcPg== X-IronPort-AV: E=Sophos;i="5.77,380,1596524400"; d="scan'208";a="531365435" Received: from rdvivi-losangeles.jf.intel.com (HELO intel.com) ([10.165.21.201]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2020 11:31:28 -0700 Date: Thu, 15 Oct 2020 14:33:13 -0400 From: Rodrigo Vivi To: Lyude Paul Cc: intel-gfx@lists.freedesktop.org, David Airlie , open list , Vasily Khoruzhick , dri-devel@lists.freedesktop.org Subject: Re: [Intel-gfx] [RFC v2 4/8] drm/i915/dp: Rename eDP VESA backlight interface functions Message-ID: <20201015183313.GD2616619@intel.com> References: <20200916171855.129511-1-lyude@redhat.com> <20200916171855.129511-5-lyude@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200916171855.129511-5-lyude@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 16, 2020 at 01:18:51PM -0400, Lyude Paul wrote: > Since we're about to add support for a second type of backlight control > interface over DP AUX (specifically, Intel's proprietary HDR backlight > controls) let's rename all of the current backlight hooks we have for > vesa to make it clear that they're specific to the VESA interface and > not Intel's. > > Signed-off-by: Lyude Paul > Cc: thaytan@noraisin.net > Cc: Vasily Khoruzhick Reviewed-by: Rodrigo Vivi > --- > .../drm/i915/display/intel_dp_aux_backlight.c | 51 ++++++++++--------- > 1 file changed, 26 insertions(+), 25 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c > index acbd7eb66cbe3..f601bcbe8ee46 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c > @@ -25,7 +25,7 @@ > #include "intel_display_types.h" > #include "intel_dp_aux_backlight.h" > > -static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable) > +static void set_vesa_backlight_enable(struct intel_dp *intel_dp, bool enable) > { > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > u8 reg_val = 0; > @@ -56,7 +56,7 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable) > * Read the current backlight value from DPCD register(s) based > * on if 8-bit(MSB) or 16-bit(MSB and LSB) values are supported > */ > -static u32 intel_dp_aux_get_backlight(struct intel_connector *connector) > +static u32 intel_dp_aux_vesa_get_backlight(struct intel_connector *connector) > { > struct intel_dp *intel_dp = intel_attached_dp(connector); > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > @@ -99,7 +99,8 @@ static u32 intel_dp_aux_get_backlight(struct intel_connector *connector) > * 8-bit or 16 bit value (MSB and LSB) > */ > static void > -intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 level) > +intel_dp_aux_vesa_set_backlight(const struct drm_connector_state *conn_state, > + u32 level) > { > struct intel_connector *connector = to_intel_connector(conn_state->connector); > struct intel_dp *intel_dp = intel_attached_dp(connector); > @@ -129,7 +130,7 @@ intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 lev > * - Where P = 2^Pn, where Pn is the value programmed by field 4:0 of the > * EDP_PWMGEN_BIT_COUNT register (DPCD Address 00724h) > */ > -static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector) > +static bool intel_dp_aux_vesa_set_pwm_freq(struct intel_connector *connector) > { > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct intel_dp *intel_dp = intel_attached_dp(connector); > @@ -165,8 +166,8 @@ static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector) > return true; > } > > -static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_state, > - const struct drm_connector_state *conn_state) > +static void intel_dp_aux_vesa_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_dp *intel_dp = intel_attached_dp(connector); > @@ -206,7 +207,7 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st > } > > if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_FREQ_AUX_SET_CAP) > - if (intel_dp_aux_set_pwm_freq(connector)) > + if (intel_dp_aux_vesa_set_pwm_freq(connector)) > new_dpcd_buf |= DP_EDP_BACKLIGHT_FREQ_AUX_SET_ENABLE; > > if (new_dpcd_buf != dpcd_buf) { > @@ -217,18 +218,18 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st > } > } > > - intel_dp_aux_set_backlight(conn_state, > - connector->panel.backlight.level); > - set_aux_backlight_enable(intel_dp, true); > + intel_dp_aux_vesa_set_backlight(conn_state, > + connector->panel.backlight.level); > + set_vesa_backlight_enable(intel_dp, true); > } > > -static void intel_dp_aux_disable_backlight(const struct drm_connector_state *old_conn_state) > +static void intel_dp_aux_vesa_disable_backlight(const struct drm_connector_state *old_conn_state) > { > - set_aux_backlight_enable(enc_to_intel_dp(to_intel_encoder(old_conn_state->best_encoder)), > - false); > + set_vesa_backlight_enable(enc_to_intel_dp(to_intel_encoder(old_conn_state->best_encoder)), > + false); > } > > -static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector) > +static u32 intel_dp_aux_vesa_calc_max_backlight(struct intel_connector *connector) > { > struct drm_i915_private *i915 = to_i915(connector->base.dev); > struct intel_dp *intel_dp = intel_attached_dp(connector); > @@ -308,24 +309,24 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector) > return max_backlight; > } > > -static int intel_dp_aux_setup_backlight(struct intel_connector *connector, > - enum pipe pipe) > +static int intel_dp_aux_vesa_setup_backlight(struct intel_connector *connector, > + enum pipe pipe) > { > struct intel_panel *panel = &connector->panel; > > - panel->backlight.max = intel_dp_aux_calc_max_backlight(connector); > + panel->backlight.max = intel_dp_aux_vesa_calc_max_backlight(connector); > if (!panel->backlight.max) > return -ENODEV; > > panel->backlight.min = 0; > - panel->backlight.level = intel_dp_aux_get_backlight(connector); > + panel->backlight.level = intel_dp_aux_vesa_get_backlight(connector); > panel->backlight.enabled = panel->backlight.level != 0; > > return 0; > } > > static bool > -intel_dp_aux_display_control_capable(struct intel_connector *connector) > +intel_dp_aux_supports_vesa_backlight(struct intel_connector *connector) > { > struct intel_dp *intel_dp = intel_attached_dp(connector); > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > @@ -349,7 +350,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > > if (i915->params.enable_dpcd_backlight == 0 || > - !intel_dp_aux_display_control_capable(intel_connector)) > + !intel_dp_aux_supports_vesa_backlight(intel_connector)) > return -ENODEV; > > /* > @@ -371,11 +372,11 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) > return -ENODEV; > } > > - panel->backlight.setup = intel_dp_aux_setup_backlight; > - panel->backlight.enable = intel_dp_aux_enable_backlight; > - panel->backlight.disable = intel_dp_aux_disable_backlight; > - panel->backlight.set = intel_dp_aux_set_backlight; > - panel->backlight.get = intel_dp_aux_get_backlight; > + panel->backlight.setup = intel_dp_aux_vesa_setup_backlight; > + panel->backlight.enable = intel_dp_aux_vesa_enable_backlight; > + panel->backlight.disable = intel_dp_aux_vesa_disable_backlight; > + panel->backlight.set = intel_dp_aux_vesa_set_backlight; > + panel->backlight.get = intel_dp_aux_vesa_get_backlight; > > return 0; > } > -- > 2.26.2 > > _______________________________________________ > 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=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 07831C43457 for ; Thu, 15 Oct 2020 18:31:34 +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 9AAD22076D for ; Thu, 15 Oct 2020 18:31:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9AAD22076D 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 B531E6E270; Thu, 15 Oct 2020 18:31:30 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A0406E222; Thu, 15 Oct 2020 18:31:29 +0000 (UTC) IronPort-SDR: eJR7aiJlhJVaY4itvF0NghpFbFjoU8ujFjdk3kKSqUh8XOqFTWIkX6ORjxJHAnATqxVeqc9dXb QDBkxISZgrbg== X-IronPort-AV: E=McAfee;i="6000,8403,9775"; a="165644555" X-IronPort-AV: E=Sophos;i="5.77,380,1596524400"; d="scan'208";a="165644555" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2020 11:31:28 -0700 IronPort-SDR: 7GROFgBE4RCUigGB05d/0MNJRDcpjwBMp4DVTVwplIO3V8PkOlnsbghRcKmOUpz3ruAKKgNhWi h436yIC/KcPg== X-IronPort-AV: E=Sophos;i="5.77,380,1596524400"; d="scan'208";a="531365435" Received: from rdvivi-losangeles.jf.intel.com (HELO intel.com) ([10.165.21.201]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2020 11:31:28 -0700 Date: Thu, 15 Oct 2020 14:33:13 -0400 From: Rodrigo Vivi To: Lyude Paul Subject: Re: [Intel-gfx] [RFC v2 4/8] drm/i915/dp: Rename eDP VESA backlight interface functions Message-ID: <20201015183313.GD2616619@intel.com> References: <20200916171855.129511-1-lyude@redhat.com> <20200916171855.129511-5-lyude@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200916171855.129511-5-lyude@redhat.com> 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: David Airlie , Vasily Khoruzhick , intel-gfx@lists.freedesktop.org, open list , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, Sep 16, 2020 at 01:18:51PM -0400, Lyude Paul wrote: > Since we're about to add support for a second type of backlight control > interface over DP AUX (specifically, Intel's proprietary HDR backlight > controls) let's rename all of the current backlight hooks we have for > vesa to make it clear that they're specific to the VESA interface and > not Intel's. > > Signed-off-by: Lyude Paul > Cc: thaytan@noraisin.net > Cc: Vasily Khoruzhick Reviewed-by: Rodrigo Vivi > --- > .../drm/i915/display/intel_dp_aux_backlight.c | 51 ++++++++++--------- > 1 file changed, 26 insertions(+), 25 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c > index acbd7eb66cbe3..f601bcbe8ee46 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c > @@ -25,7 +25,7 @@ > #include "intel_display_types.h" > #include "intel_dp_aux_backlight.h" > > -static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable) > +static void set_vesa_backlight_enable(struct intel_dp *intel_dp, bool enable) > { > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > u8 reg_val = 0; > @@ -56,7 +56,7 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable) > * Read the current backlight value from DPCD register(s) based > * on if 8-bit(MSB) or 16-bit(MSB and LSB) values are supported > */ > -static u32 intel_dp_aux_get_backlight(struct intel_connector *connector) > +static u32 intel_dp_aux_vesa_get_backlight(struct intel_connector *connector) > { > struct intel_dp *intel_dp = intel_attached_dp(connector); > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > @@ -99,7 +99,8 @@ static u32 intel_dp_aux_get_backlight(struct intel_connector *connector) > * 8-bit or 16 bit value (MSB and LSB) > */ > static void > -intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 level) > +intel_dp_aux_vesa_set_backlight(const struct drm_connector_state *conn_state, > + u32 level) > { > struct intel_connector *connector = to_intel_connector(conn_state->connector); > struct intel_dp *intel_dp = intel_attached_dp(connector); > @@ -129,7 +130,7 @@ intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 lev > * - Where P = 2^Pn, where Pn is the value programmed by field 4:0 of the > * EDP_PWMGEN_BIT_COUNT register (DPCD Address 00724h) > */ > -static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector) > +static bool intel_dp_aux_vesa_set_pwm_freq(struct intel_connector *connector) > { > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct intel_dp *intel_dp = intel_attached_dp(connector); > @@ -165,8 +166,8 @@ static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector) > return true; > } > > -static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_state, > - const struct drm_connector_state *conn_state) > +static void intel_dp_aux_vesa_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_dp *intel_dp = intel_attached_dp(connector); > @@ -206,7 +207,7 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st > } > > if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_FREQ_AUX_SET_CAP) > - if (intel_dp_aux_set_pwm_freq(connector)) > + if (intel_dp_aux_vesa_set_pwm_freq(connector)) > new_dpcd_buf |= DP_EDP_BACKLIGHT_FREQ_AUX_SET_ENABLE; > > if (new_dpcd_buf != dpcd_buf) { > @@ -217,18 +218,18 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st > } > } > > - intel_dp_aux_set_backlight(conn_state, > - connector->panel.backlight.level); > - set_aux_backlight_enable(intel_dp, true); > + intel_dp_aux_vesa_set_backlight(conn_state, > + connector->panel.backlight.level); > + set_vesa_backlight_enable(intel_dp, true); > } > > -static void intel_dp_aux_disable_backlight(const struct drm_connector_state *old_conn_state) > +static void intel_dp_aux_vesa_disable_backlight(const struct drm_connector_state *old_conn_state) > { > - set_aux_backlight_enable(enc_to_intel_dp(to_intel_encoder(old_conn_state->best_encoder)), > - false); > + set_vesa_backlight_enable(enc_to_intel_dp(to_intel_encoder(old_conn_state->best_encoder)), > + false); > } > > -static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector) > +static u32 intel_dp_aux_vesa_calc_max_backlight(struct intel_connector *connector) > { > struct drm_i915_private *i915 = to_i915(connector->base.dev); > struct intel_dp *intel_dp = intel_attached_dp(connector); > @@ -308,24 +309,24 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector) > return max_backlight; > } > > -static int intel_dp_aux_setup_backlight(struct intel_connector *connector, > - enum pipe pipe) > +static int intel_dp_aux_vesa_setup_backlight(struct intel_connector *connector, > + enum pipe pipe) > { > struct intel_panel *panel = &connector->panel; > > - panel->backlight.max = intel_dp_aux_calc_max_backlight(connector); > + panel->backlight.max = intel_dp_aux_vesa_calc_max_backlight(connector); > if (!panel->backlight.max) > return -ENODEV; > > panel->backlight.min = 0; > - panel->backlight.level = intel_dp_aux_get_backlight(connector); > + panel->backlight.level = intel_dp_aux_vesa_get_backlight(connector); > panel->backlight.enabled = panel->backlight.level != 0; > > return 0; > } > > static bool > -intel_dp_aux_display_control_capable(struct intel_connector *connector) > +intel_dp_aux_supports_vesa_backlight(struct intel_connector *connector) > { > struct intel_dp *intel_dp = intel_attached_dp(connector); > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > @@ -349,7 +350,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > > if (i915->params.enable_dpcd_backlight == 0 || > - !intel_dp_aux_display_control_capable(intel_connector)) > + !intel_dp_aux_supports_vesa_backlight(intel_connector)) > return -ENODEV; > > /* > @@ -371,11 +372,11 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) > return -ENODEV; > } > > - panel->backlight.setup = intel_dp_aux_setup_backlight; > - panel->backlight.enable = intel_dp_aux_enable_backlight; > - panel->backlight.disable = intel_dp_aux_disable_backlight; > - panel->backlight.set = intel_dp_aux_set_backlight; > - panel->backlight.get = intel_dp_aux_get_backlight; > + panel->backlight.setup = intel_dp_aux_vesa_setup_backlight; > + panel->backlight.enable = intel_dp_aux_vesa_enable_backlight; > + panel->backlight.disable = intel_dp_aux_vesa_disable_backlight; > + panel->backlight.set = intel_dp_aux_vesa_set_backlight; > + panel->backlight.get = intel_dp_aux_vesa_get_backlight; > > return 0; > } > -- > 2.26.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ 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=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 98430C43467 for ; Thu, 15 Oct 2020 18:31:31 +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 345F0206B6 for ; Thu, 15 Oct 2020 18:31:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 345F0206B6 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 827F36E222; Thu, 15 Oct 2020 18:31:30 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A0406E222; Thu, 15 Oct 2020 18:31:29 +0000 (UTC) IronPort-SDR: eJR7aiJlhJVaY4itvF0NghpFbFjoU8ujFjdk3kKSqUh8XOqFTWIkX6ORjxJHAnATqxVeqc9dXb QDBkxISZgrbg== X-IronPort-AV: E=McAfee;i="6000,8403,9775"; a="165644555" X-IronPort-AV: E=Sophos;i="5.77,380,1596524400"; d="scan'208";a="165644555" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2020 11:31:28 -0700 IronPort-SDR: 7GROFgBE4RCUigGB05d/0MNJRDcpjwBMp4DVTVwplIO3V8PkOlnsbghRcKmOUpz3ruAKKgNhWi h436yIC/KcPg== X-IronPort-AV: E=Sophos;i="5.77,380,1596524400"; d="scan'208";a="531365435" Received: from rdvivi-losangeles.jf.intel.com (HELO intel.com) ([10.165.21.201]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2020 11:31:28 -0700 Date: Thu, 15 Oct 2020 14:33:13 -0400 From: Rodrigo Vivi To: Lyude Paul Message-ID: <20201015183313.GD2616619@intel.com> References: <20200916171855.129511-1-lyude@redhat.com> <20200916171855.129511-5-lyude@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200916171855.129511-5-lyude@redhat.com> Subject: Re: [Intel-gfx] [RFC v2 4/8] drm/i915/dp: Rename eDP VESA backlight interface functions 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: David Airlie , Vasily Khoruzhick , intel-gfx@lists.freedesktop.org, open list , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, Sep 16, 2020 at 01:18:51PM -0400, Lyude Paul wrote: > Since we're about to add support for a second type of backlight control > interface over DP AUX (specifically, Intel's proprietary HDR backlight > controls) let's rename all of the current backlight hooks we have for > vesa to make it clear that they're specific to the VESA interface and > not Intel's. > > Signed-off-by: Lyude Paul > Cc: thaytan@noraisin.net > Cc: Vasily Khoruzhick Reviewed-by: Rodrigo Vivi > --- > .../drm/i915/display/intel_dp_aux_backlight.c | 51 ++++++++++--------- > 1 file changed, 26 insertions(+), 25 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c > index acbd7eb66cbe3..f601bcbe8ee46 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c > @@ -25,7 +25,7 @@ > #include "intel_display_types.h" > #include "intel_dp_aux_backlight.h" > > -static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable) > +static void set_vesa_backlight_enable(struct intel_dp *intel_dp, bool enable) > { > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > u8 reg_val = 0; > @@ -56,7 +56,7 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable) > * Read the current backlight value from DPCD register(s) based > * on if 8-bit(MSB) or 16-bit(MSB and LSB) values are supported > */ > -static u32 intel_dp_aux_get_backlight(struct intel_connector *connector) > +static u32 intel_dp_aux_vesa_get_backlight(struct intel_connector *connector) > { > struct intel_dp *intel_dp = intel_attached_dp(connector); > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > @@ -99,7 +99,8 @@ static u32 intel_dp_aux_get_backlight(struct intel_connector *connector) > * 8-bit or 16 bit value (MSB and LSB) > */ > static void > -intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 level) > +intel_dp_aux_vesa_set_backlight(const struct drm_connector_state *conn_state, > + u32 level) > { > struct intel_connector *connector = to_intel_connector(conn_state->connector); > struct intel_dp *intel_dp = intel_attached_dp(connector); > @@ -129,7 +130,7 @@ intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 lev > * - Where P = 2^Pn, where Pn is the value programmed by field 4:0 of the > * EDP_PWMGEN_BIT_COUNT register (DPCD Address 00724h) > */ > -static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector) > +static bool intel_dp_aux_vesa_set_pwm_freq(struct intel_connector *connector) > { > struct drm_i915_private *dev_priv = to_i915(connector->base.dev); > struct intel_dp *intel_dp = intel_attached_dp(connector); > @@ -165,8 +166,8 @@ static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector) > return true; > } > > -static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_state, > - const struct drm_connector_state *conn_state) > +static void intel_dp_aux_vesa_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_dp *intel_dp = intel_attached_dp(connector); > @@ -206,7 +207,7 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st > } > > if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_FREQ_AUX_SET_CAP) > - if (intel_dp_aux_set_pwm_freq(connector)) > + if (intel_dp_aux_vesa_set_pwm_freq(connector)) > new_dpcd_buf |= DP_EDP_BACKLIGHT_FREQ_AUX_SET_ENABLE; > > if (new_dpcd_buf != dpcd_buf) { > @@ -217,18 +218,18 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st > } > } > > - intel_dp_aux_set_backlight(conn_state, > - connector->panel.backlight.level); > - set_aux_backlight_enable(intel_dp, true); > + intel_dp_aux_vesa_set_backlight(conn_state, > + connector->panel.backlight.level); > + set_vesa_backlight_enable(intel_dp, true); > } > > -static void intel_dp_aux_disable_backlight(const struct drm_connector_state *old_conn_state) > +static void intel_dp_aux_vesa_disable_backlight(const struct drm_connector_state *old_conn_state) > { > - set_aux_backlight_enable(enc_to_intel_dp(to_intel_encoder(old_conn_state->best_encoder)), > - false); > + set_vesa_backlight_enable(enc_to_intel_dp(to_intel_encoder(old_conn_state->best_encoder)), > + false); > } > > -static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector) > +static u32 intel_dp_aux_vesa_calc_max_backlight(struct intel_connector *connector) > { > struct drm_i915_private *i915 = to_i915(connector->base.dev); > struct intel_dp *intel_dp = intel_attached_dp(connector); > @@ -308,24 +309,24 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector) > return max_backlight; > } > > -static int intel_dp_aux_setup_backlight(struct intel_connector *connector, > - enum pipe pipe) > +static int intel_dp_aux_vesa_setup_backlight(struct intel_connector *connector, > + enum pipe pipe) > { > struct intel_panel *panel = &connector->panel; > > - panel->backlight.max = intel_dp_aux_calc_max_backlight(connector); > + panel->backlight.max = intel_dp_aux_vesa_calc_max_backlight(connector); > if (!panel->backlight.max) > return -ENODEV; > > panel->backlight.min = 0; > - panel->backlight.level = intel_dp_aux_get_backlight(connector); > + panel->backlight.level = intel_dp_aux_vesa_get_backlight(connector); > panel->backlight.enabled = panel->backlight.level != 0; > > return 0; > } > > static bool > -intel_dp_aux_display_control_capable(struct intel_connector *connector) > +intel_dp_aux_supports_vesa_backlight(struct intel_connector *connector) > { > struct intel_dp *intel_dp = intel_attached_dp(connector); > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > @@ -349,7 +350,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) > struct drm_i915_private *i915 = dp_to_i915(intel_dp); > > if (i915->params.enable_dpcd_backlight == 0 || > - !intel_dp_aux_display_control_capable(intel_connector)) > + !intel_dp_aux_supports_vesa_backlight(intel_connector)) > return -ENODEV; > > /* > @@ -371,11 +372,11 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) > return -ENODEV; > } > > - panel->backlight.setup = intel_dp_aux_setup_backlight; > - panel->backlight.enable = intel_dp_aux_enable_backlight; > - panel->backlight.disable = intel_dp_aux_disable_backlight; > - panel->backlight.set = intel_dp_aux_set_backlight; > - panel->backlight.get = intel_dp_aux_get_backlight; > + panel->backlight.setup = intel_dp_aux_vesa_setup_backlight; > + panel->backlight.enable = intel_dp_aux_vesa_enable_backlight; > + panel->backlight.disable = intel_dp_aux_vesa_disable_backlight; > + panel->backlight.set = intel_dp_aux_vesa_set_backlight; > + panel->backlight.get = intel_dp_aux_vesa_get_backlight; > > return 0; > } > -- > 2.26.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx