lkml.org 
[lkml]   [2021]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC v4 07/11] drm/i915/dpcd_bl: Move VESA backlight enabling code closer together
    Date
    No functional changes, just move set_vesa_backlight_enable() closer to it's
    only caller: intel_dp_aux_vesa_enable_backlight().

    Signed-off-by: Lyude Paul <lyude@redhat.com>
    Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
    ---
    .../drm/i915/display/intel_dp_aux_backlight.c | 54 +++++++++----------
    1 file changed, 27 insertions(+), 27 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 74001b479d80..611eb3a7cc08 100644
    --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
    +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
    @@ -270,33 +270,6 @@ intel_dp_aux_hdr_setup_backlight(struct intel_connector *connector, enum pipe pi
    }

    /* VESA backlight callbacks */
    -static void set_vesa_backlight_enable(struct intel_connector *connector, bool enable)
    -{
    - struct intel_dp *intel_dp = intel_attached_dp(connector);
    - struct drm_i915_private *i915 = dp_to_i915(intel_dp);
    - u8 reg_val = 0;
    -
    - /* Early return when display use other mechanism to enable backlight. */
    - if (!connector->panel.backlight.edp.vesa.aux_enable)
    - return;
    -
    - if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_DISPLAY_CONTROL_REGISTER, &reg_val) != 1) {
    - drm_dbg_kms(&i915->drm, "Failed to read DPCD register 0x%x\n",
    - DP_EDP_DISPLAY_CONTROL_REGISTER);
    - return;
    - }
    - if (enable)
    - reg_val |= DP_EDP_BACKLIGHT_ENABLE;
    - else
    - reg_val &= ~(DP_EDP_BACKLIGHT_ENABLE);
    -
    - if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_EDP_DISPLAY_CONTROL_REGISTER,
    - reg_val) != 1) {
    - drm_dbg_kms(&i915->drm, "Failed to %s aux backlight\n",
    - enable ? "enable" : "disable");
    - }
    -}
    -
    static bool intel_dp_aux_vesa_backlight_dpcd_mode(struct intel_connector *connector)
    {
    struct intel_dp *intel_dp = intel_attached_dp(connector);
    @@ -378,6 +351,33 @@ intel_dp_aux_vesa_set_backlight(const struct drm_connector_state *conn_state,
    }
    }

    +static void set_vesa_backlight_enable(struct intel_connector *connector, bool enable)
    +{
    + struct intel_dp *intel_dp = intel_attached_dp(connector);
    + struct drm_i915_private *i915 = dp_to_i915(intel_dp);
    + u8 reg_val = 0;
    +
    + /* Early return when display use other mechanism to enable backlight. */
    + if (!connector->panel.backlight.edp.vesa.aux_enable)
    + return;
    +
    + if (drm_dp_dpcd_readb(&intel_dp->aux, DP_EDP_DISPLAY_CONTROL_REGISTER, &reg_val) != 1) {
    + drm_dbg_kms(&i915->drm, "Failed to read DPCD register 0x%x\n",
    + DP_EDP_DISPLAY_CONTROL_REGISTER);
    + return;
    + }
    + if (enable)
    + reg_val |= DP_EDP_BACKLIGHT_ENABLE;
    + else
    + reg_val &= ~(DP_EDP_BACKLIGHT_ENABLE);
    +
    + if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_EDP_DISPLAY_CONTROL_REGISTER,
    + reg_val) != 1) {
    + drm_dbg_kms(&i915->drm, "Failed to %s aux backlight\n",
    + enable ? "enable" : "disable");
    + }
    +}
    +
    static void
    intel_dp_aux_vesa_enable_backlight(const struct intel_crtc_state *crtc_state,
    const struct drm_connector_state *conn_state, u32 level)
    --
    2.29.2
    \
     
     \ /
      Last update: 2021-02-09 00:43    [W:25.665 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site