Commit c235509a authored by Lyude Paul's avatar Lyude Paul
Browse files

drm/dp_dual_mode: Pass drm_device to drm_dp_dual_mode_set_tmds_output() 



Another function that we'll need to pass a drm_device (and not drm_dp_aux)
down to so that we can move over to using drm_dbg_*().

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210423184309.207645-10-lyude@redhat.com


Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
parent 92ea2220

drivers/gpu/drm/drm_dp_dual_mode_helper.c

+2 −1
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ EXPORT_SYMBOL(drm_dp_dual_mode_get_tmds_output); 


/**

 * drm_dp_dual_mode_set_tmds_output - Enable/disable TMDS output buffers in the DP dual mode adaptor

 * @dev: &drm_device to use

 * @type: DP dual mode adaptor type

 * @adapter: I2C adapter for the DDC bus

 * @enable: enable (as opposed to disable) the TMDS output buffers
@@ -349,7 +350,7 @@ EXPORT_SYMBOL(drm_dp_dual_mode_get_tmds_output); 
 * Returns:

 * 0 on success, negative error code on failure

 */

int drm_dp_dual_mode_set_tmds_output(enum drm_dp_dual_mode_type type,

int drm_dp_dual_mode_set_tmds_output(const struct drm_device *dev, enum drm_dp_dual_mode_type type,

				     struct i2c_adapter *adapter, bool enable)

{

	uint8_t tmds_oen = enable ? 0 : DP_DUAL_MODE_TMDS_DISABLE;

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

+1 −2
Original line number Diff line number Diff line
@@ -1251,8 +1251,7 @@ void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable) 
	drm_dbg_kms(&dev_priv->drm, "%s DP dual mode adaptor TMDS output\n",

		    enable ? "Enabling" : "Disabling");



	drm_dp_dual_mode_set_tmds_output(hdmi->dp_dual_mode.type,

					 adapter, enable);

	drm_dp_dual_mode_set_tmds_output(&dev_priv->drm, hdmi->dp_dual_mode.type, adapter, enable);

}



static int intel_hdmi_hdcp_read(struct intel_digital_port *dig_port,

include/drm/drm_dp_dual_mode_helper.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ int drm_dp_dual_mode_max_tmds_clock(enum drm_dp_dual_mode_type type, 
				    struct i2c_adapter *adapter);

int drm_dp_dual_mode_get_tmds_output(enum drm_dp_dual_mode_type type,

				     struct i2c_adapter *adapter, bool *enabled);

int drm_dp_dual_mode_set_tmds_output(enum drm_dp_dual_mode_type type,

int drm_dp_dual_mode_set_tmds_output(const struct drm_device *dev, enum drm_dp_dual_mode_type type,

				     struct i2c_adapter *adapter, bool enable);

const char *drm_dp_get_dual_mode_type_name(enum drm_dp_dual_mode_type type);