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

Commit c99d1530 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2015-05-22' of git://anongit.freedesktop.org/drm-intel into drm-next 

- cpt modeset sequence fixes from Ville
- more rps boosting tuning from Chris
- S3 support for skl (Damien)
- a pile of w/a for bxt from various people
- cleanup of primary plane pixel formats (Damien)
- a big pile of small patches with fixes and cleanups all over

* tag 'drm-intel-next-2015-05-22' of git://anongit.freedesktop.org/drm-intel: (90 commits)
  drm/i915: Update DRIVER_DATE to 20150522
  drm/i915: Introduce DRM_I915_THROTTLE_JIFFIES
  drm/i915: Use the correct destructor for freeing requests on error
  drm/i915/skl: don't fail colorkey + scaler request
  drm/i915: Enable GTT caching on gen8
  drm/i915: Move WaProgramL3SqcReg1Default:bdw to init_clock_gating()
  drm/i915: Use ilk_init_lp_watermarks() on BDW
  drm/i915: Disable FDI RX/TX before the ports
  drm/i915: Disable CRT port after pipe on PCH platforms
  drm/i915: Disable SDVO port after the pipe on PCH platforms
  drm/i915: Disable HDMI port after the pipe on PCH platforms
  drm/i915: Fix the IBX transcoder B workarounds
  drm/i915: Write the SDVO reg twice on IBX
  drm/i915: Fix DP enhanced framing for CPT
  drm/i915: Clean up the CPT DP .get_hw_state() port readout
  drm/i915: Clarfify the DP code platform checks
  drm/i915: Remove the double register write from intel_disable_hdmi()
  drm/i915: Remove a bogus 12bpc "toggle" from intel_disable_hdmi()
  drm/i915/skl: Deinit/init the display at suspend/resume
  drm/i915: Free RPS boosts for all laggards
  ...
parents a8a7cf02 82d5b58f

Documentation/DocBook/drm.tmpl

+6 −1
Original line number Diff line number Diff line
@@ -4153,6 +4153,12 @@ int num_ioctls;</synopsis> 
	  </tgroup>

	</table>

      </sect2>



      <sect2>

       <title>CSR firmware support for DMC</title>

!Pdrivers/gpu/drm/i915/intel_csr.c csr support for dmc

!Idrivers/gpu/drm/i915/intel_csr.c

      </sect2>

    </sect1>



    <sect1>
@@ -4204,7 +4210,6 @@ int num_ioctls;</synopsis> 
!Idrivers/gpu/drm/i915/i915_gem_shrinker.c

      </sect2>

    </sect1>



    <sect1>

      <title> Tracing </title>

      <para>

drivers/gpu/drm/i915/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -71,3 +71,11 @@ config DRM_I915_PRELIMINARY_HW_SUPPORT 
	  option changes the default for that module option.



	  If in doubt, say "N".



menu "DRM i915 Debugging"



depends on DRM_I915



source drivers/gpu/drm/i915/Kconfig.debug



endmenu

drivers/gpu/drm/i915/Kconfig.debug

0 → 100644
+5 −0
Original line number Diff line number Diff line 
config DRM_I915_WERROR

	bool "Force GCC to throw an error instead of a warning when compiling"

	default n

	---help---

	  Add -Werror to the build flags for (and only for) i915.ko

drivers/gpu/drm/i915/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Makefile for the drm device driver.  This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



subdir-ccflags-$(CONFIG_DRM_I915_WERROR) := -Werror



# Please keep these build lists sorted!



# core driver code

drivers/gpu/drm/i915/i915_debugfs.c

+50 −14
Original line number Diff line number Diff line
@@ -120,10 +120,13 @@ static inline const char *get_global_flag(struct drm_i915_gem_object *obj) 
static void

describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)

{

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

	struct intel_engine_cs *ring;

	struct i915_vma *vma;

	int pin_count = 0;

	int i;



	seq_printf(m, "%pK: %s%s%s%s %8zdKiB %02x %02x %x %x %x%s%s%s",

	seq_printf(m, "%pK: %s%s%s%s %8zdKiB %02x %02x [ ",

		   &obj->base,

		   obj->active ? "*" : " ",

		   get_pin_flag(obj),
@@ -131,8 +134,11 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) 
		   get_global_flag(obj),

		   obj->base.size / 1024,

		   obj->base.read_domains,

		   obj->base.write_domain,

		   i915_gem_request_get_seqno(obj->last_read_req),

		   obj->base.write_domain);

	for_each_ring(ring, dev_priv, i)

		seq_printf(m, "%x ",

				i915_gem_request_get_seqno(obj->last_read_req[i]));

	seq_printf(m, "] %x %x%s%s%s",

		   i915_gem_request_get_seqno(obj->last_write_req),

		   i915_gem_request_get_seqno(obj->last_fenced_req),

		   i915_cache_level_str(to_i915(obj->base.dev), obj->cache_level),
@@ -169,9 +175,9 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) 
		*t = '\0';

		seq_printf(m, " (%s mappable)", s);

	}

	if (obj->last_read_req != NULL)

	if (obj->last_write_req != NULL)

		seq_printf(m, " (%s)",

			   i915_gem_request_get_ring(obj->last_read_req)->name);

			   i915_gem_request_get_ring(obj->last_write_req)->name);

	if (obj->frontbuffer_bits)

		seq_printf(m, " (frontbuffer: 0x%03x)", obj->frontbuffer_bits);

}
@@ -665,7 +671,7 @@ static int i915_gem_request_info(struct seq_file *m, void *data) 
	struct drm_device *dev = node->minor->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_engine_cs *ring;

	struct drm_i915_gem_request *rq;

	struct drm_i915_gem_request *req;

	int ret, any, i;



	ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -677,22 +683,22 @@ static int i915_gem_request_info(struct seq_file *m, void *data) 
		int count;



		count = 0;

		list_for_each_entry(rq, &ring->request_list, list)

		list_for_each_entry(req, &ring->request_list, list)

			count++;

		if (count == 0)

			continue;



		seq_printf(m, "%s requests: %d\n", ring->name, count);

		list_for_each_entry(rq, &ring->request_list, list) {

		list_for_each_entry(req, &ring->request_list, list) {

			struct task_struct *task;



			rcu_read_lock();

			task = NULL;

			if (rq->pid)

				task = pid_task(rq->pid, PIDTYPE_PID);

			if (req->pid)

				task = pid_task(req->pid, PIDTYPE_PID);

			seq_printf(m, "    %x @ %d: %s [%d]\n",

				   rq->seqno,

				   (int) (jiffies - rq->emitted_jiffies),

				   req->seqno,

				   (int) (jiffies - req->emitted_jiffies),

				   task ? task->comm : "<unknown>",

				   task ? task->pid : -1);

			rcu_read_unlock();
@@ -2276,6 +2282,18 @@ static int i915_ppgtt_info(struct seq_file *m, void *data) 
	return 0;

}



static int count_irq_waiters(struct drm_i915_private *i915)

{

	struct intel_engine_cs *ring;

	int count = 0;

	int i;



	for_each_ring(ring, i915, i)

		count += ring->irq_refcount;



	return count;

}



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

{

	struct drm_info_node *node = m->private;
@@ -2292,6 +2310,15 @@ static int i915_rps_boost_info(struct seq_file *m, void *data) 
	if (ret)

		goto unlock;



	seq_printf(m, "RPS enabled? %d\n", dev_priv->rps.enabled);

	seq_printf(m, "GPU busy? %d\n", dev_priv->mm.busy);

	seq_printf(m, "CPU waiting? %d\n", count_irq_waiters(dev_priv));

	seq_printf(m, "Frequency requested %d; min hard:%d, soft:%d; max soft:%d, hard:%d\n",

		   intel_gpu_freq(dev_priv, dev_priv->rps.cur_freq),

		   intel_gpu_freq(dev_priv, dev_priv->rps.min_freq),

		   intel_gpu_freq(dev_priv, dev_priv->rps.min_freq_softlimit),

		   intel_gpu_freq(dev_priv, dev_priv->rps.max_freq_softlimit),

		   intel_gpu_freq(dev_priv, dev_priv->rps.max_freq));

	list_for_each_entry_reverse(file, &dev->filelist, lhead) {

		struct drm_i915_file_private *file_priv = file->driver_priv;

		struct task_struct *task;
@@ -2301,10 +2328,16 @@ static int i915_rps_boost_info(struct seq_file *m, void *data) 
		seq_printf(m, "%s [%d]: %d boosts%s\n",

			   task ? task->comm : "<unknown>",

			   task ? task->pid : -1,

			   file_priv->rps_boosts,

			   list_empty(&file_priv->rps_boost) ? "" : ", active");

			   file_priv->rps.boosts,

			   list_empty(&file_priv->rps.link) ? "" : ", active");

		rcu_read_unlock();

	}

	seq_printf(m, "Semaphore boosts: %d%s\n",

		   dev_priv->rps.semaphores.boosts,

		   list_empty(&dev_priv->rps.semaphores.link) ? "" : ", active");

	seq_printf(m, "MMIO flip boosts: %d%s\n",

		   dev_priv->rps.mmioflips.boosts,

		   list_empty(&dev_priv->rps.mmioflips.link) ? "" : ", active");

	seq_printf(m, "Kernel boosts: %d\n", dev_priv->rps.boosts);



	mutex_unlock(&dev_priv->rps.hw_lock);
@@ -5154,6 +5187,9 @@ static int i915_dpcd_show(struct seq_file *m, void *data) 
	ssize_t err;

	int i;



	if (connector->status != connector_status_connected)

		return -ENODEV;



	for (i = 0; i < ARRAY_SIZE(i915_dpcd_debug); i++) {

		const struct dpcd_block *b = &i915_dpcd_debug[i];

		size_t size = b->end ? b->end - b->offset + 1 : (b->size ?: 1);