Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eff97b2 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2016-12-07' of... 

Merge tag 'drm-intel-next-fixes-2016-12-07' of git://anongit.freedesktop.org/git/drm-intel into drm-next

first set of fixes for -next.

* tag 'drm-intel-next-fixes-2016-12-07' of git://anongit.freedesktop.org/git/drm-intel:
  drm/i915: Move priority bumping for flips earlier
  drm/i915: Hold a reference on the request for its fence chain
  drm/i915/audio: fix hdmi audio noise issue
  drm/i915/debugfs: Increment return value of gt.next_seqno
  drm/i915/debugfs: Drop i915_hws_info
  drm/i915: Initialize dev_priv->atomic_cdclk_freq at init time
  drm/i915: Fix cdclk vs. dev_cdclk mess when not recomputing things
  drm/i915: Make skl_write_{plane,cursor}_wm() static
  drm/i915: Complete requests in nop_submit_request
  drm/i915/gvt: fix lock not released bug for dispatch_workload() err path
  drm/i915/gvt: fix getting 64bit bar size error
  drm/i915/gvt: fix missing init param.primary
parents 81662557 7a9e1025

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

+2 −0
Original line number Diff line number Diff line
@@ -361,6 +361,8 @@ static inline void intel_vgpu_write_pci_bar(struct intel_vgpu *vgpu, 
		 * leave the bit 3 - bit 0 unchanged.

		 */

		*pval = (val & GENMASK(31, 4)) | (*pval & GENMASK(3, 0));

	} else {

		*pval = val;

	}

}

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

+6 −4
Original line number Diff line number Diff line
@@ -177,8 +177,8 @@ static int dispatch_workload(struct intel_vgpu_workload *workload) 
	rq = i915_gem_request_alloc(dev_priv->engine[ring_id], shadow_ctx);

	if (IS_ERR(rq)) {

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

		workload->status = PTR_ERR(rq);

		return workload->status;

		ret = PTR_ERR(rq);

		goto out;

	}



	gvt_dbg_sched("ring id %d get i915 gem request %p\n", ring_id, rq);
@@ -212,6 +212,7 @@ static int dispatch_workload(struct intel_vgpu_workload *workload) 
	if (ret)

		workload->status = ret;



	if (!IS_ERR_OR_NULL(rq))

		i915_add_request_no_flush(rq);

	mutex_unlock(&dev_priv->drm.struct_mutex);

	return ret;
@@ -460,6 +461,7 @@ static int workload_thread(void *priv) 


		complete_current_workload(gvt, ring_id);



		if (workload->req)

			i915_gem_request_put(fetch_and_zero(&workload->req));



		if (need_force_wake)

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

+1 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ struct intel_vgpu *intel_gvt_create_vgpu(struct intel_gvt *gvt, 
	struct intel_vgpu *vgpu;



	param.handle = 0;

	param.primary = 1;

	param.low_gm_sz = type->low_gm_size;

	param.high_gm_sz = type->high_gm_size;

	param.fence_sz = type->fence;

drivers/gpu/drm/i915/i915_debugfs.c

+1 −26
Original line number Diff line number Diff line
@@ -935,27 +935,6 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data) 
	return 0;

}



static int i915_hws_info(struct seq_file *m, void *data)

{

	struct drm_info_node *node = m->private;

	struct drm_i915_private *dev_priv = node_to_i915(node);

	struct intel_engine_cs *engine;

	const u32 *hws;

	int i;



	engine = dev_priv->engine[(uintptr_t)node->info_ent->data];

	hws = engine->status_page.page_addr;

	if (hws == NULL)

		return 0;



	for (i = 0; i < 4096 / sizeof(u32) / 4; i += 4) {

		seq_printf(m, "0x%08x: 0x%08x 0x%08x 0x%08x 0x%08x\n",

			   i * 4,

			   hws[i], hws[i + 1], hws[i + 2], hws[i + 3]);

	}

	return 0;

}



#if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)



static ssize_t
@@ -1047,7 +1026,7 @@ i915_next_seqno_get(void *data, u64 *val) 
{

	struct drm_i915_private *dev_priv = data;



	*val = atomic_read(&dev_priv->gt.global_timeline.next_seqno);

	*val = 1 + atomic_read(&dev_priv->gt.global_timeline.next_seqno);

	return 0;

}
@@ -5403,10 +5382,6 @@ static const struct drm_info_list i915_debugfs_list[] = { 
	{"i915_gem_seqno", i915_gem_seqno_info, 0},

	{"i915_gem_fence_regs", i915_gem_fence_regs_info, 0},

	{"i915_gem_interrupt", i915_interrupt_info, 0},

	{"i915_gem_hws", i915_hws_info, 0, (void *)RCS},

	{"i915_gem_hws_blt", i915_hws_info, 0, (void *)BCS},

	{"i915_gem_hws_bsd", i915_hws_info, 0, (void *)VCS},

	{"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS},

	{"i915_gem_batch_pool", i915_gem_batch_pool_info, 0},

	{"i915_guc_info", i915_guc_info, 0},

	{"i915_guc_load_status", i915_guc_load_status_info, 0},

drivers/gpu/drm/i915/i915_gem.c

+2 −0
Original line number Diff line number Diff line
@@ -2764,6 +2764,8 @@ void i915_gem_reset(struct drm_i915_private *dev_priv) 


static void nop_submit_request(struct drm_i915_gem_request *request)

{

	i915_gem_request_submit(request);

	intel_engine_init_global_seqno(request->engine, request->global_seqno);

}



static void i915_gem_cleanup_engine(struct intel_engine_cs *engine)