Commit 82e50ec8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2019-12-12' of... 

Merge tag 'drm-intel-fixes-2019-12-12' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Fix user reported issue #673: GPU hang on transition to idle
- Avoid corruption on the top of the screen on GLK+ by disabling FBC
- Fix non-privileged access to OA on Tigerlake
- Fix HDCP code not to touch global state when just computing commit
- Fix CI splat by saving irqstate around virtual_context_destroy
- Serialise context retirement possibly on another CPU

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191212100759.GA22260@jlahtine-desk.ger.corp.intel.com
parents 7315c0ed 750bde2f

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

+4 −1
Original line number Diff line number Diff line
@@ -3986,6 +3986,7 @@ static void intel_enable_ddi(struct intel_encoder *encoder, 
	if (conn_state->content_protection ==

	    DRM_MODE_CONTENT_PROTECTION_DESIRED)

		intel_hdcp_enable(to_intel_connector(conn_state->connector),

				  crtc_state->cpu_transcoder,

				  (u8)conn_state->hdcp_content_type);

}
@@ -4089,7 +4090,9 @@ static void intel_ddi_update_pipe(struct intel_encoder *encoder, 
	if (conn_state->content_protection ==

	    DRM_MODE_CONTENT_PROTECTION_DESIRED ||

	    content_protection_type_changed)

		intel_hdcp_enable(connector, (u8)conn_state->hdcp_content_type);

		intel_hdcp_enable(connector,

				  crtc_state->cpu_transcoder,

				  (u8)conn_state->hdcp_content_type);

}



static void

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

+0 −3
Original line number Diff line number Diff line
@@ -2414,9 +2414,6 @@ 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_fbc.c

+1 −1
Original line number Diff line number Diff line
@@ -1284,7 +1284,7 @@ static int intel_sanitize_fbc_option(struct drm_i915_private *dev_priv) 
		return 0;



	/* https://bugs.freedesktop.org/show_bug.cgi?id=108085 */

	if (IS_GEMINILAKE(dev_priv))

	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))

		return 0;



	if (IS_BROADWELL(dev_priv) || INTEL_GEN(dev_priv) >= 9)

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

+8 −18
Original line number Diff line number Diff line
@@ -1821,23 +1821,6 @@ enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_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)

{
@@ -1959,8 +1942,10 @@ int intel_hdcp_init(struct intel_connector *connector, 
	return 0;

}



int intel_hdcp_enable(struct intel_connector *connector, u8 content_type)

int intel_hdcp_enable(struct intel_connector *connector,

		      enum transcoder cpu_transcoder, u8 content_type)

{

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

	struct intel_hdcp *hdcp = &connector->hdcp;

	unsigned long check_link_interval = DRM_HDCP_CHECK_PERIOD_MS;

	int ret = -EINVAL;
@@ -1972,6 +1957,11 @@ int intel_hdcp_enable(struct intel_connector *connector, u8 content_type) 
	WARN_ON(hdcp->value == DRM_MODE_CONTENT_PROTECTION_ENABLED);

	hdcp->content_type = content_type;



	if (INTEL_GEN(dev_priv) >= 12) {

		hdcp->cpu_transcoder = cpu_transcoder;

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

	}



	/*

	 * Considering that HDCP2.2 is more secure than HDCP1.4, If the setup

	 * is capable of HDCP2.2, it is preferred to use HDCP2.2.

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

+2 −3
Original line number Diff line number Diff line
@@ -21,11 +21,10 @@ 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);

int intel_hdcp_enable(struct intel_connector *connector,

		      enum transcoder cpu_transcoder, u8 content_type);

int intel_hdcp_disable(struct intel_connector *connector);

bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port);

bool intel_hdcp_capable(struct intel_connector *connector);

CRA Git | Maintained and supported by SUSTech CRA and CCSE