drm/i915/lspcon: change signature of lspcon_wait_pcon_mode()

Switch from struct intel_lspcon to struct intel_digital_port to unify.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/84a00791d3d7ee4e34c1224ef7471918546635aa.1738677489.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 3b2a20553f938f9917db870878232d729fec6d3d..e4676339c3eabe2fe8872224d5d617420151fad5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -3520,7 +3520,6 @@ void intel_dp_set_power(struct intel_dp *intel_dp, u8 mode)
                ret = drm_dp_dpcd_writeb(&intel_dp->aux, DP_SET_POWER, mode);
        } else {
                struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
-               struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp);
 
                lspcon_resume(dig_port);
 
@@ -3539,7 +3538,7 @@ void intel_dp_set_power(struct intel_dp *intel_dp, u8 mode)
                }
 
                if (ret == 1 && intel_lspcon_active(dig_port))
-                       lspcon_wait_pcon_mode(lspcon);
+                       lspcon_wait_pcon_mode(dig_port);
        }
 
        if (ret != 1)

diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c
index 2dd2b700b0f3aafd15d05c94eef28de3b90c2420..45b63fea3642e84ee87fcbd468986d80b58d388a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lspcon.c
+++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
@@ -656,8 +656,10 @@ u32 lspcon_infoframes_enabled(struct intel_encoder *encoder,
        return val;
 }
 
-void lspcon_wait_pcon_mode(struct intel_lspcon *lspcon)
+void lspcon_wait_pcon_mode(struct intel_digital_port *dig_port)
 {
+       struct intel_lspcon *lspcon = &dig_port->lspcon;
+
        lspcon_wait_mode(lspcon, DRM_LSPCON_MODE_PCON);
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_lspcon.h b/drivers/gpu/drm/i915/display/intel_lspcon.h
index 18cc15e5221d690e9d5f5372139206ed206f4fab..20581af1ddb2d1fb66c8d12f2461095a84987787 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lspcon.h
+++ b/drivers/gpu/drm/i915/display/intel_lspcon.h
@@ -8,18 +8,16 @@
 
 #include <linux/types.h>
 
-struct drm_connector;
 struct drm_connector_state;
 struct intel_crtc_state;
 struct intel_digital_port;
 struct intel_encoder;
-struct intel_lspcon;
 
 bool lspcon_init(struct intel_digital_port *dig_port);
 bool intel_lspcon_active(struct intel_digital_port *dig_port);
 bool lspcon_detect_hdr_capability(struct intel_digital_port *dig_port);
 void lspcon_resume(struct intel_digital_port *dig_port);
-void lspcon_wait_pcon_mode(struct intel_lspcon *lspcon);
+void lspcon_wait_pcon_mode(struct intel_digital_port *dig_port);
 void lspcon_write_infoframe(struct intel_encoder *encoder,
                            const struct intel_crtc_state *crtc_state,
                            unsigned int type,