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 <ly...@redhat.com>
> Cc: thay...@noraisin.net
> Cc: Vasily Khoruzhick <anars...@gmail.com>
Reviewed-by: Rodrigo Vivi <rodrigo.v...@intel.com>
> ---
> .../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-...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
