drm/i915/dp: Rename intel struct inside intel_panel

Rename intel to intel cap which is present inside panel.edp struct
to make it more sensible to tell us what it contains.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240507040407.1056061-3-suraj.kandpal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index a06a154d587b964ff05c2b3ce943035a9a51bce0..b7a385824f982a332c2f44643ce691375ea406e4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -401,7 +401,7 @@ struct intel_panel {
                        } vesa;
                        struct {
                                bool sdr_uses_aux;
-                       } intel;
+                       } intel_cap;
                } edp;
 
                struct backlight_device *device;

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 4f58efdc688af0e9f89d77cafe3fe879a36b3c7a..44bc6fa04332d9c92e2484d8cb52501644818c5e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
@@ -156,7 +156,7 @@ intel_dp_aux_supports_hdr_backlight(struct intel_connector *connector)
                return false;
        }
 
-       panel->backlight.edp.intel.sdr_uses_aux =
+       panel->backlight.edp.intel_cap.sdr_uses_aux =
                tcon_cap[2] & INTEL_EDP_SDR_TCON_BRIGHTNESS_AUX_CAP;
 
        return true;
@@ -178,7 +178,7 @@ intel_dp_aux_hdr_get_backlight(struct intel_connector *connector, enum pipe pipe
        }
 
        if (!(tmp & INTEL_EDP_HDR_TCON_BRIGHTNESS_AUX_ENABLE)) {
-               if (!panel->backlight.edp.intel.sdr_uses_aux) {
+               if (!panel->backlight.edp.intel_cap.sdr_uses_aux) {
                        u32 pwm_level = panel->backlight.pwm_funcs->get(connector, pipe);
 
                        return intel_backlight_level_from_pwm(connector, pwm_level);
@@ -221,7 +221,7 @@ intel_dp_aux_hdr_set_backlight(const struct drm_connector_state *conn_state, u32
        struct intel_connector *connector = to_intel_connector(conn_state->connector);
        struct intel_panel *panel = &connector->panel;
 
-       if (panel->backlight.edp.intel.sdr_uses_aux) {
+       if (panel->backlight.edp.intel_cap.sdr_uses_aux) {
                intel_dp_aux_hdr_set_aux_backlight(conn_state, level);
        } else {
                const u32 pwm_level = intel_backlight_level_to_pwm(connector, level);
@@ -251,7 +251,7 @@ intel_dp_aux_hdr_enable_backlight(const struct intel_crtc_state *crtc_state,
        }
 
        ctrl = old_ctrl;
-       if (panel->backlight.edp.intel.sdr_uses_aux) {
+       if (panel->backlight.edp.intel_cap.sdr_uses_aux) {
                ctrl |= INTEL_EDP_HDR_TCON_BRIGHTNESS_AUX_ENABLE;
                intel_dp_aux_hdr_set_aux_backlight(conn_state, level);
        } else {
@@ -275,7 +275,7 @@ intel_dp_aux_hdr_disable_backlight(const struct drm_connector_state *conn_state,
        struct intel_panel *panel = &connector->panel;
 
        /* Nothing to do for AUX based backlight controls */
-       if (panel->backlight.edp.intel.sdr_uses_aux)
+       if (panel->backlight.edp.intel_cap.sdr_uses_aux)
                return;
 
        /* Note we want the actual pwm_level to be 0, regardless of pwm_min */
@@ -298,9 +298,9 @@ intel_dp_aux_hdr_setup_backlight(struct intel_connector *connector, enum pipe pi
 
        drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s] SDR backlight is controlled through %s\n",
                    connector->base.base.id, connector->base.name,
-                   dpcd_vs_pwm_str(panel->backlight.edp.intel.sdr_uses_aux));
+                   dpcd_vs_pwm_str(panel->backlight.edp.intel_cap.sdr_uses_aux));
 
-       if (!panel->backlight.edp.intel.sdr_uses_aux) {
+       if (!panel->backlight.edp.intel_cap.sdr_uses_aux) {
                ret = panel->backlight.pwm_funcs->setup(connector, pipe);
                if (ret < 0) {
                        drm_err(&i915->drm,