Commit 5f9986a6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2021-01-21' of... 

Merge tag 'drm-intel-fixes-2021-01-21' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v5.11-rc5:
- HDCP fixes
- PMU wakeref fix
- Fix HWSP validity race
- Fix DP protocol converter accidental 4:4:4->4:2:0 conversion for RGB

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87a6t2kzgb.fsf@intel.com
parents f722f5be 1c4995b0

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

+1 −1
Original line number Diff line number Diff line
@@ -3725,7 +3725,7 @@ static void hsw_ddi_pre_enable_dp(struct intel_atomic_state *state, 
	intel_ddi_init_dp_buf_reg(encoder, crtc_state);

	if (!is_mst)

		intel_dp_set_power(intel_dp, DP_SET_POWER_D0);

	intel_dp_configure_protocol_converter(intel_dp);

	intel_dp_configure_protocol_converter(intel_dp, crtc_state);

	intel_dp_sink_set_decompression_state(intel_dp, crtc_state,

					      true);

	intel_dp_sink_set_fec_ready(intel_dp, crtc_state);

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

+5 −4
Original line number Diff line number Diff line
@@ -4014,7 +4014,8 @@ static void intel_dp_enable_port(struct intel_dp *intel_dp, 
	intel_de_posting_read(dev_priv, intel_dp->output_reg);

}



void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp)

void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp,

					   const struct intel_crtc_state *crtc_state)

{

	struct drm_i915_private *i915 = dp_to_i915(intel_dp);

	u8 tmp;
@@ -4033,8 +4034,8 @@ void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp) 
		drm_dbg_kms(&i915->drm, "Failed to set protocol converter HDMI mode to %s\n",

			    enableddisabled(intel_dp->has_hdmi_sink));



	tmp = intel_dp->dfp.ycbcr_444_to_420 ?

		DP_CONVERSION_TO_YCBCR420_ENABLE : 0;

	tmp = crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444 &&

		intel_dp->dfp.ycbcr_444_to_420 ? DP_CONVERSION_TO_YCBCR420_ENABLE : 0;



	if (drm_dp_dpcd_writeb(&intel_dp->aux,

			       DP_PROTOCOL_CONVERTER_CONTROL_1, tmp) != 1)
@@ -4088,7 +4089,7 @@ static void intel_enable_dp(struct intel_atomic_state *state, 
	}



	intel_dp_set_power(intel_dp, DP_SET_POWER_D0);

	intel_dp_configure_protocol_converter(intel_dp);

	intel_dp_configure_protocol_converter(intel_dp, pipe_config);

	intel_dp_start_link_train(intel_dp, pipe_config);

	intel_dp_stop_link_train(intel_dp, pipe_config);

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

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, 
int intel_dp_retrain_link(struct intel_encoder *encoder,

			  struct drm_modeset_acquire_ctx *ctx);

void intel_dp_set_power(struct intel_dp *intel_dp, u8 mode);

void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp);

void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp,

					   const struct intel_crtc_state *crtc_state);

void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp,

					   const struct intel_crtc_state *crtc_state,

					   bool enable);

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

+9 −0
Original line number Diff line number Diff line
@@ -2210,6 +2210,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state, 
	if (content_protection_type_changed) {

		mutex_lock(&hdcp->mutex);

		hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED;

		drm_connector_get(&connector->base);

		schedule_work(&hdcp->prop_work);

		mutex_unlock(&hdcp->mutex);

	}
@@ -2221,6 +2222,14 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state, 
		desired_and_not_enabled =

			hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED;

		mutex_unlock(&hdcp->mutex);

		/*

		 * If HDCP already ENABLED and CP property is DESIRED, schedule

		 * prop_work to update correct CP property to user space.

		 */

		if (!desired_and_not_enabled && !content_protection_type_changed) {

			drm_connector_get(&connector->base);

			schedule_work(&hdcp->prop_work);

		}

	}



	if (desired_and_not_enabled || content_protection_type_changed)

drivers/gpu/drm/i915/gt/intel_breadcrumbs.c

+2 −7
Original line number Diff line number Diff line
@@ -134,11 +134,6 @@ static bool remove_signaling_context(struct intel_breadcrumbs *b, 
	return true;

}



static inline bool __request_completed(const struct i915_request *rq)

{

	return i915_seqno_passed(__hwsp_seqno(rq), rq->fence.seqno);

}



__maybe_unused static bool

check_signal_order(struct intel_context *ce, struct i915_request *rq)

{
@@ -257,7 +252,7 @@ static void signal_irq_work(struct irq_work *work) 
		list_for_each_entry_rcu(rq, &ce->signals, signal_link) {

			bool release;



			if (!__request_completed(rq))

			if (!__i915_request_is_complete(rq))

				break;



			if (!test_and_clear_bit(I915_FENCE_FLAG_SIGNAL,
@@ -379,7 +374,7 @@ static void insert_breadcrumb(struct i915_request *rq) 
	 * straight onto a signaled list, and queue the irq worker for

	 * its signal completion.

	 */

	if (__request_completed(rq)) {

	if (__i915_request_is_complete(rq)) {

		if (__signal_request(rq) &&

		    llist_add(&rq->signal_node, &b->signaled_requests))

			irq_work_queue(&b->irq_work);