Commit 39e2df09 authored by Ramalingam C's avatar Ramalingam C Committed by Uma Shankar
Browse files

drm/i915/hdcp: update current transcoder into intel_hdcp 



On gen12+ platforms, HDCP HW is associated to the transcoder.
Hence on every modeset update associated transcoder into the
intel_hdcp of the port.

v2:
  s/trans/cpu_transcoder [Jani]
v3:
  comment is added for fw_ddi init for gen12+ [Shashank]
  only hdcp capable transcoder is translated into fw_tc [Shashank]
v4:
  fw_tc initialization is kept for modeset. [Tomas]
  few extra doc is added at port_data init [Tomas]
v5:
  Few comments are improvised [Tomas]

Signed-off-by: default avatarRamalingam C <ramalingam.c@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarShashank Sharma <shashank.sharma@intel.com>
Signed-off-by: default avatarUma Shankar <uma.shankar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190828164216.405-6-ramalingam.c@intel.com
parent 2d15cf1b

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

+7 −0
Original line number Diff line number Diff line
@@ -388,6 +388,13 @@ struct intel_hdcp { 
	wait_queue_head_t cp_irq_queue;

	atomic_t cp_irq_count;

	int cp_irq_count_cached;



	/*

	 * HDCP register access for gen12+ need the transcoder associated.

	 * Transcoder attached to the connector could be changed at modeset.

	 * Hence caching the transcoder here.

	 */

	enum transcoder cpu_transcoder;

};



struct intel_connector {

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

+3 −0
Original line number Diff line number Diff line
@@ -2261,6 +2261,9 @@ intel_dp_compute_config(struct intel_encoder *encoder, 


	intel_psr_compute_config(intel_dp, pipe_config);



	intel_hdcp_transcoder_config(intel_connector,

				     pipe_config->cpu_transcoder);



	return 0;

}

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

+46 −1
Original line number Diff line number Diff line
@@ -1764,13 +1764,58 @@ enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port) 
	}

}



static inline

enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder)

{

	switch (cpu_transcoder) {

	case TRANSCODER_A ... TRANSCODER_D:

		return (enum mei_fw_tc)(cpu_transcoder | 0x10);

	default: /* eDP, DSI TRANSCODERS are non HDCP capable */

		return MEI_INVALID_TRANSCODER;

	}

}



void intel_hdcp_transcoder_config(struct intel_connector *connector,

				  enum transcoder cpu_transcoder)

{

	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);

	struct intel_hdcp *hdcp = &connector->hdcp;



	if (!hdcp->shim)

		return;



	if (INTEL_GEN(dev_priv) >= 12) {

		mutex_lock(&hdcp->mutex);

		hdcp->cpu_transcoder = cpu_transcoder;

		hdcp->port_data.fw_tc = intel_get_mei_fw_tc(cpu_transcoder);

		mutex_unlock(&hdcp->mutex);

	}

}



static inline int initialize_hdcp_port_data(struct intel_connector *connector,

					    const struct intel_hdcp_shim *shim)

{

	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);

	struct intel_hdcp *hdcp = &connector->hdcp;

	struct hdcp_port_data *data = &hdcp->port_data;



	data->fw_ddi = intel_get_mei_fw_ddi_index(connector->encoder->port);

	if (INTEL_GEN(dev_priv) < 12)

		data->fw_ddi =

			intel_get_mei_fw_ddi_index(connector->encoder->port);

	else

		/*

		 * As per ME FW API expectation, for GEN 12+, fw_ddi is filled

		 * with zero(INVALID PORT index).

		 */

		data->fw_ddi = MEI_DDI_INVALID_PORT;



	/*

	 * As associated transcoder is set and modified at modeset, here fw_tc

	 * is initialized to zero (invalid transcoder index). This will be

	 * retained for <Gen12 forever.

	 */

	data->fw_tc = MEI_INVALID_TRANSCODER;



	data->port_type = (u8)HDCP_PORT_TYPE_INTEGRATED;

	data->protocol = (u8)shim->protocol;

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

+3 −0
Original line number Diff line number Diff line
@@ -16,10 +16,13 @@ struct drm_i915_private; 
struct intel_connector;

struct intel_hdcp_shim;

enum port;

enum transcoder;



void intel_hdcp_atomic_check(struct drm_connector *connector,

			     struct drm_connector_state *old_state,

			     struct drm_connector_state *new_state);

void intel_hdcp_transcoder_config(struct intel_connector *connector,

				  enum transcoder cpu_transcoder);

int intel_hdcp_init(struct intel_connector *connector,

		    const struct intel_hdcp_shim *hdcp_shim);

int intel_hdcp_enable(struct intel_connector *connector, u8 content_type);

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

+3 −0
Original line number Diff line number Diff line
@@ -2431,6 +2431,9 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, 
		return -EINVAL;

	}



	intel_hdcp_transcoder_config(intel_hdmi->attached_connector,

				     pipe_config->cpu_transcoder);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE