Merge tag 'drm-intel-next-fixes-2020-06-10' of... (addb1e23) · Commits · 戴 / test

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -5206,6 +5206,9 @@ void intel_read_dp_sdp(struct intel_encoder *encoder,
		struct intel_crtc_state *crtc_state,
		unsigned int type)
		{
		if (encoder->type != INTEL_OUTPUT_DDI)
		return;

		switch (type) {
		case DP_SDP_VSC:
		intel_read_dp_vsc_sdp(encoder, crtc_state,

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+48 −8

Original line number	Diff line number	Diff line
		@@ -1988,6 +1988,38 @@ static const struct dma_fence_work_ops eb_parse_ops = {
		.release = __eb_parse_release,
		};

		static inline int
		__parser_mark_active(struct i915_vma *vma,
		struct intel_timeline *tl,
		struct dma_fence *fence)
		{
		struct intel_gt_buffer_pool_node *node = vma->private;

		return i915_active_ref(&node->active, tl, fence);
		}

		static int
		parser_mark_active(struct eb_parse_work pw, struct intel_timeline tl)
		{
		int err;

		mutex_lock(&tl->mutex);

		err = __parser_mark_active(pw->shadow, tl, &pw->base.dma);
		if (err)
		goto unlock;

		if (pw->trampoline) {
		err = __parser_mark_active(pw->trampoline, tl, &pw->base.dma);
		if (err)
		goto unlock;
		}

		unlock:
		mutex_unlock(&tl->mutex);
		return err;
		}

		static int eb_parse_pipeline(struct i915_execbuffer *eb,
		struct i915_vma *shadow,
		struct i915_vma *trampoline)
		@@ -2022,20 +2054,25 @@ static int eb_parse_pipeline(struct i915_execbuffer *eb,
		pw->shadow = shadow;
		pw->trampoline = trampoline;

		/* Mark active refs early for this worker, in case we get interrupted */
		err = parser_mark_active(pw, eb->context->timeline);
		if (err)
		goto err_commit;

		err = dma_resv_lock_interruptible(pw->batch->resv, NULL);
		if (err)
		goto err_trampoline;
		goto err_commit;

		err = dma_resv_reserve_shared(pw->batch->resv, 1);
		if (err)
		goto err_batch_unlock;
		goto err_commit_unlock;

		/* Wait for all writes (and relocs) into the batch to complete */
		err = i915_sw_fence_await_reservation(&pw->base.chain,
		pw->batch->resv, NULL, false,
		0, I915_FENCE_GFP);
		if (err < 0)
		goto err_batch_unlock;
		goto err_commit_unlock;

		/* Keep the batch alive and unwritten as we parse */
		dma_resv_add_shared_fence(pw->batch->resv, &pw->base.dma);
		@@ -2050,11 +2087,13 @@ static int eb_parse_pipeline(struct i915_execbuffer *eb,
		dma_fence_work_commit_imm(&pw->base);
		return 0;

		err_batch_unlock:
		err_commit_unlock:
		dma_resv_unlock(pw->batch->resv);
		err_trampoline:
		if (trampoline)
		i915_active_release(&trampoline->active);
		err_commit:
		i915_sw_fence_set_error_once(&pw->base.chain, err);
		dma_fence_work_commit_imm(&pw->base);
		return err;

		err_shadow:
		i915_active_release(&shadow->active);
		err_batch:
		@@ -2100,6 +2139,7 @@ static int eb_parse(struct i915_execbuffer *eb)
		goto err;
		}
		i915_gem_object_set_readonly(shadow->obj);
		shadow->private = pool;

		trampoline = NULL;
		if (CMDPARSER_USES_GGTT(eb->i915)) {
		@@ -2113,6 +2153,7 @@ static int eb_parse(struct i915_execbuffer *eb)
		shadow = trampoline;
		goto err_shadow;
		}
		shadow->private = pool;

		eb->batch_flags \|= I915_DISPATCH_SECURE;
		}
		@@ -2129,7 +2170,6 @@ static int eb_parse(struct i915_execbuffer *eb)
		eb->trampoline = trampoline;
		eb->batch_start_offset = 0;

		shadow->private = pool;
		return 0;

		err_trampoline:

drivers/gpu/drm/i915/i915_params.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ i915_param_named_unsafe(vbt_sdvo_panel_type, int, 0400,
		"Override/Ignore selection of SDVO panel mode in the VBT "
		"(-2=ignore, -1=auto [default], index in VBT BIOS table)");

		i915_param_named_unsafe(reset, int, 0600,
		i915_param_named_unsafe(reset, uint, 0600,
		"Attempt GPU resets (0=disabled, 1=full gpu reset, 2=engine reset [default])");

		i915_param_named_unsafe(vbt_firmware, charp, 0400,

Admin message