Commit e2d3c414 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-intel-fixes-2019-01-11' of... 

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

 into drm-fixes

i915 fixes for v5.0-rc2:
- Disable PSR for Apple panels
- Broxton ERR_PTR error state fix
- Kabylake VECS workaround fix
- Unwind failure on pinning the gen7 ppgtt
- GVT workload request allocation fix

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87pnt35z8h.fsf@intel.com
parents 95681cda f299e0bd

drivers/gpu/drm/drm_dp_helper.c

+2 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,8 @@ static const struct dpcd_quirk dpcd_quirk_list[] = { 
	{ OUI(0x00, 0x22, 0xb9), DEVICE_ID_ANY, true, BIT(DP_DPCD_QUIRK_CONSTANT_N) },

	/* LG LP140WF6-SPM1 eDP panel */

	{ OUI(0x00, 0x22, 0xb9), DEVICE_ID('s', 'i', 'v', 'a', 'r', 'T'), false, BIT(DP_DPCD_QUIRK_CONSTANT_N) },

	/* Apple panels need some additional handling to support PSR */

	{ OUI(0x00, 0x10, 0xfa), DEVICE_ID_ANY, false, BIT(DP_DPCD_QUIRK_NO_PSR) }

};



#undef OUI

drivers/gpu/drm/i915/gvt/scheduler.c

+42 −22
Original line number Diff line number Diff line
@@ -356,6 +356,33 @@ static int set_context_ppgtt_from_shadow(struct intel_vgpu_workload *workload, 
	return 0;

}



static int

intel_gvt_workload_req_alloc(struct intel_vgpu_workload *workload)

{

	struct intel_vgpu *vgpu = workload->vgpu;

	struct intel_vgpu_submission *s = &vgpu->submission;

	struct i915_gem_context *shadow_ctx = s->shadow_ctx;

	struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;

	struct intel_engine_cs *engine = dev_priv->engine[workload->ring_id];

	struct i915_request *rq;

	int ret = 0;



	lockdep_assert_held(&dev_priv->drm.struct_mutex);



	if (workload->req)

		goto out;



	rq = i915_request_alloc(engine, shadow_ctx);

	if (IS_ERR(rq)) {

		gvt_vgpu_err("fail to allocate gem request\n");

		ret = PTR_ERR(rq);

		goto out;

	}

	workload->req = i915_request_get(rq);

out:

	return ret;

}



/**

 * intel_gvt_scan_and_shadow_workload - audit the workload by scanning and

 * shadow it as well, include ringbuffer,wa_ctx and ctx.
@@ -372,12 +399,11 @@ int intel_gvt_scan_and_shadow_workload(struct intel_vgpu_workload *workload) 
	struct drm_i915_private *dev_priv = vgpu->gvt->dev_priv;

	struct intel_engine_cs *engine = dev_priv->engine[workload->ring_id];

	struct intel_context *ce;

	struct i915_request *rq;

	int ret;



	lockdep_assert_held(&dev_priv->drm.struct_mutex);



	if (workload->req)

	if (workload->shadow)

		return 0;



	ret = set_context_ppgtt_from_shadow(workload, shadow_ctx);
@@ -417,22 +443,8 @@ int intel_gvt_scan_and_shadow_workload(struct intel_vgpu_workload *workload) 
			goto err_shadow;

	}



	rq = i915_request_alloc(engine, shadow_ctx);

	if (IS_ERR(rq)) {

		gvt_vgpu_err("fail to allocate gem request\n");

		ret = PTR_ERR(rq);

		goto err_shadow;

	}

	workload->req = i915_request_get(rq);



	ret = populate_shadow_context(workload);

	if (ret)

		goto err_req;



	workload->shadow = true;

	return 0;

err_req:

	rq = fetch_and_zero(&workload->req);

	i915_request_put(rq);

err_shadow:

	release_shadow_wa_ctx(&workload->wa_ctx);

err_unpin:
@@ -671,23 +683,31 @@ static int dispatch_workload(struct intel_vgpu_workload *workload) 
	mutex_lock(&vgpu->vgpu_lock);

	mutex_lock(&dev_priv->drm.struct_mutex);



	ret = intel_gvt_workload_req_alloc(workload);

	if (ret)

		goto err_req;



	ret = intel_gvt_scan_and_shadow_workload(workload);

	if (ret)

		goto out;



	ret = prepare_workload(workload);

	ret = populate_shadow_context(workload);

	if (ret) {

		release_shadow_wa_ctx(&workload->wa_ctx);

		goto out;

	}



	ret = prepare_workload(workload);

out:

	if (ret)

		workload->status = ret;



	if (!IS_ERR_OR_NULL(workload->req)) {

		gvt_dbg_sched("ring id %d submit workload to i915 %p\n",

				ring_id, workload->req);

		i915_request_add(workload->req);

		workload->dispatched = true;

	}



err_req:

	if (ret)

		workload->status = ret;

	mutex_unlock(&dev_priv->drm.struct_mutex);

	mutex_unlock(&vgpu->vgpu_lock);

	return ret;

drivers/gpu/drm/i915/gvt/scheduler.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ struct intel_vgpu_workload { 
	struct i915_request *req;

	/* if this workload has been dispatched to i915? */

	bool dispatched;

	bool shadow;      /* if workload has done shadow of guest request */

	int status;



	struct intel_vgpu_mm *shadow_mm;

drivers/gpu/drm/i915/i915_debugfs.c

+9 −3
Original line number Diff line number Diff line
@@ -984,8 +984,8 @@ static int i915_gpu_info_open(struct inode *inode, struct file *file) 
	intel_runtime_pm_get(i915);

	gpu = i915_capture_gpu_state(i915);

	intel_runtime_pm_put(i915);

	if (!gpu)

		return -ENOMEM;

	if (IS_ERR(gpu))

		return PTR_ERR(gpu);



	file->private_data = gpu;

	return 0;
@@ -1018,7 +1018,13 @@ i915_error_state_write(struct file *filp, 


static int i915_error_state_open(struct inode *inode, struct file *file)

{

	file->private_data = i915_first_error_state(inode->i_private);

	struct i915_gpu_state *error;



	error = i915_first_error_state(inode->i_private);

	if (IS_ERR(error))

		return PTR_ERR(error);



	file->private_data  = error;

	return 0;

}

drivers/gpu/drm/i915/i915_gem_gtt.c

+12 −3
Original line number Diff line number Diff line
@@ -2075,6 +2075,7 @@ static struct i915_vma *pd_vma_create(struct gen6_hw_ppgtt *ppgtt, int size) 
int gen6_ppgtt_pin(struct i915_hw_ppgtt *base)

{

	struct gen6_hw_ppgtt *ppgtt = to_gen6_ppgtt(base);

	int err;



	/*

	 * Workaround the limited maximum vma->pin_count and the aliasing_ppgtt
@@ -2090,9 +2091,17 @@ int gen6_ppgtt_pin(struct i915_hw_ppgtt *base) 
	 * allocator works in address space sizes, so it's multiplied by page

	 * size. We allocate at the top of the GTT to avoid fragmentation.

	 */

	return i915_vma_pin(ppgtt->vma,

	err = i915_vma_pin(ppgtt->vma,

			   0, GEN6_PD_ALIGN,

			   PIN_GLOBAL | PIN_HIGH);

	if (err)

		goto unpin;



	return 0;



unpin:

	ppgtt->pin_count = 0;

	return err;

}



void gen6_ppgtt_unpin(struct i915_hw_ppgtt *base)

CRA Git | Maintained and supported by SUSTech CRA and CCSE