Commit 295e276a authored by Jani Nikula's avatar Jani Nikula
Browse files

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



Switch from struct intel_lspcon to struct intel_digital_port to unify.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/84a00791d3d7ee4e34c1224ef7471918546635aa.1738677489.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent ab945e9a

drivers/gpu/drm/i915/display/intel_dp.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/i915/display/intel_lspcon.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/i915/display/intel_lspcon.h

+1 −3
Original line number Diff line number Diff line
@@ -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,