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

Commit 0b576372 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-intel-next' of... 

Merge branch 'drm-intel-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 into drm-fixes

* 'drm-intel-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6: (42 commits)
  drm/i915: allow cache sharing policy control
  drm/i915/hdmi: HDMI source product description infoframe support
  drm/i915/hdmi: split infoframe setting from infoframe type code
  drm: track CEA version number if present
  drm/i915: Try enabling RC6 by default (again)
  Revert "drm/i915/dp: Zero the DPCD data before connection probe"
  drm/i915/dp: wait for previous AUX channel activity to clear
  drm/i915: don't use uninitialized EDID bpc values when picking pipe bpp
  drm/i915/pch: Save/restore PCH_PORT_HOTPLUG across suspend
  drm/i915: apply phase pointer override on SNB+ too
  drm/i915: Add quirk to disable SSC on Sony Vaio Y2
  drm/i915: provide more error output when mode sets fail
  drm/i915: add GPU max frequency control file
  i915: add Dell OptiPlex FX170 to intel_no_lvds
  drm/i915: Ignore GPU wedged errors while pinning scanout buffers
  drm/i915/hdmi: send AVI info frames on ILK+ as well
  drm/i915: fix CB tuning check for ILK+
  drm/i915: Flush other plane register writes
  drm/i915: flush plane control changes on ILK+ as well
  drm/i915: apply timing generator bug workaround on CPT and PPT
  ...
parents c41b9ee9 07b7ddd9

drivers/gpu/drm/drm_edid.c

+9 −0
Original line number Diff line number Diff line
@@ -1439,6 +1439,8 @@ EXPORT_SYMBOL(drm_detect_monitor_audio); 
static void drm_add_display_info(struct edid *edid,

				 struct drm_display_info *info)

{

	u8 *edid_ext;



	info->width_mm = edid->width_cm * 10;

	info->height_mm = edid->height_cm * 10;
@@ -1483,6 +1485,13 @@ static void drm_add_display_info(struct edid *edid, 
		info->color_formats = DRM_COLOR_FORMAT_YCRCB444;

	if (info->color_formats & DRM_EDID_FEATURE_RGB_YCRCB422)

		info->color_formats = DRM_COLOR_FORMAT_YCRCB422;



	/* Get data from CEA blocks if present */

	edid_ext = drm_find_cea_extension(edid);

	if (!edid_ext)

		return;



	info->cea_rev = edid_ext[1];

}



/**

drivers/gpu/drm/i915/i915_debugfs.c

+189 −0
Original line number Diff line number Diff line
@@ -1338,6 +1338,155 @@ static const struct file_operations i915_wedged_fops = { 
	.llseek = default_llseek,

};



static int

i915_max_freq_open(struct inode *inode,

		   struct file *filp)

{

	filp->private_data = inode->i_private;

	return 0;

}



static ssize_t

i915_max_freq_read(struct file *filp,

		   char __user *ubuf,

		   size_t max,

		   loff_t *ppos)

{

	struct drm_device *dev = filp->private_data;

	drm_i915_private_t *dev_priv = dev->dev_private;

	char buf[80];

	int len;



	len = snprintf(buf, sizeof (buf),

		       "max freq: %d\n", dev_priv->max_delay * 50);



	if (len > sizeof (buf))

		len = sizeof (buf);



	return simple_read_from_buffer(ubuf, max, ppos, buf, len);

}



static ssize_t

i915_max_freq_write(struct file *filp,

		  const char __user *ubuf,

		  size_t cnt,

		  loff_t *ppos)

{

	struct drm_device *dev = filp->private_data;

	struct drm_i915_private *dev_priv = dev->dev_private;

	char buf[20];

	int val = 1;



	if (cnt > 0) {

		if (cnt > sizeof (buf) - 1)

			return -EINVAL;



		if (copy_from_user(buf, ubuf, cnt))

			return -EFAULT;

		buf[cnt] = 0;



		val = simple_strtoul(buf, NULL, 0);

	}



	DRM_DEBUG_DRIVER("Manually setting max freq to %d\n", val);



	/*

	 * Turbo will still be enabled, but won't go above the set value.

	 */

	dev_priv->max_delay = val / 50;



	gen6_set_rps(dev, val / 50);



	return cnt;

}



static const struct file_operations i915_max_freq_fops = {

	.owner = THIS_MODULE,

	.open = i915_max_freq_open,

	.read = i915_max_freq_read,

	.write = i915_max_freq_write,

	.llseek = default_llseek,

};



static int

i915_cache_sharing_open(struct inode *inode,

		   struct file *filp)

{

	filp->private_data = inode->i_private;

	return 0;

}



static ssize_t

i915_cache_sharing_read(struct file *filp,

		   char __user *ubuf,

		   size_t max,

		   loff_t *ppos)

{

	struct drm_device *dev = filp->private_data;

	drm_i915_private_t *dev_priv = dev->dev_private;

	char buf[80];

	u32 snpcr;

	int len;



	mutex_lock(&dev_priv->dev->struct_mutex);

	snpcr = I915_READ(GEN6_MBCUNIT_SNPCR);

	mutex_unlock(&dev_priv->dev->struct_mutex);



	len = snprintf(buf, sizeof (buf),

		       "%d\n", (snpcr & GEN6_MBC_SNPCR_MASK) >>

		       GEN6_MBC_SNPCR_SHIFT);



	if (len > sizeof (buf))

		len = sizeof (buf);



	return simple_read_from_buffer(ubuf, max, ppos, buf, len);

}



static ssize_t

i915_cache_sharing_write(struct file *filp,

		  const char __user *ubuf,

		  size_t cnt,

		  loff_t *ppos)

{

	struct drm_device *dev = filp->private_data;

	struct drm_i915_private *dev_priv = dev->dev_private;

	char buf[20];

	u32 snpcr;

	int val = 1;



	if (cnt > 0) {

		if (cnt > sizeof (buf) - 1)

			return -EINVAL;



		if (copy_from_user(buf, ubuf, cnt))

			return -EFAULT;

		buf[cnt] = 0;



		val = simple_strtoul(buf, NULL, 0);

	}



	if (val < 0 || val > 3)

		return -EINVAL;



	DRM_DEBUG_DRIVER("Manually setting uncore sharing to %d\n", val);



	/* Update the cache sharing policy here as well */

	snpcr = I915_READ(GEN6_MBCUNIT_SNPCR);

	snpcr &= ~GEN6_MBC_SNPCR_MASK;

	snpcr |= (val << GEN6_MBC_SNPCR_SHIFT);

	I915_WRITE(GEN6_MBCUNIT_SNPCR, snpcr);



	return cnt;

}



static const struct file_operations i915_cache_sharing_fops = {

	.owner = THIS_MODULE,

	.open = i915_cache_sharing_open,

	.read = i915_cache_sharing_read,

	.write = i915_cache_sharing_write,

	.llseek = default_llseek,

};



/* As the drm_debugfs_init() routines are called before dev->dev_private is

 * allocated we need to hook into the minor for release. */

static int
@@ -1437,6 +1586,36 @@ static int i915_forcewake_create(struct dentry *root, struct drm_minor *minor) 
	return drm_add_fake_info_node(minor, ent, &i915_forcewake_fops);

}



static int i915_max_freq_create(struct dentry *root, struct drm_minor *minor)

{

	struct drm_device *dev = minor->dev;

	struct dentry *ent;



	ent = debugfs_create_file("i915_max_freq",

				  S_IRUGO | S_IWUSR,

				  root, dev,

				  &i915_max_freq_fops);

	if (IS_ERR(ent))

		return PTR_ERR(ent);



	return drm_add_fake_info_node(minor, ent, &i915_max_freq_fops);

}



static int i915_cache_sharing_create(struct dentry *root, struct drm_minor *minor)

{

	struct drm_device *dev = minor->dev;

	struct dentry *ent;



	ent = debugfs_create_file("i915_cache_sharing",

				  S_IRUGO | S_IWUSR,

				  root, dev,

				  &i915_cache_sharing_fops);

	if (IS_ERR(ent))

		return PTR_ERR(ent);



	return drm_add_fake_info_node(minor, ent, &i915_cache_sharing_fops);

}



static struct drm_info_list i915_debugfs_list[] = {

	{"i915_capabilities", i915_capabilities, 0},

	{"i915_gem_objects", i915_gem_object_info, 0},
@@ -1488,6 +1667,12 @@ int i915_debugfs_init(struct drm_minor *minor) 
		return ret;



	ret = i915_forcewake_create(minor->debugfs_root, minor);

	if (ret)

		return ret;

	ret = i915_max_freq_create(minor->debugfs_root, minor);

	if (ret)

		return ret;

	ret = i915_cache_sharing_create(minor->debugfs_root, minor);

	if (ret)

		return ret;
@@ -1504,6 +1689,10 @@ void i915_debugfs_cleanup(struct drm_minor *minor) 
				 1, minor);

	drm_debugfs_remove_files((struct drm_info_list *) &i915_wedged_fops,

				 1, minor);

	drm_debugfs_remove_files((struct drm_info_list *) &i915_max_freq_fops,

				 1, minor);

	drm_debugfs_remove_files((struct drm_info_list *) &i915_cache_sharing_fops,

				 1, minor);

}



#endif /* CONFIG_DEBUG_FS */

drivers/gpu/drm/i915/i915_dma.c

+2 −4
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static void i915_write_hws_pga(struct drm_device *dev) 
static int i915_init_phys_hws(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct intel_ring_buffer *ring = LP_RING(dev_priv);



	/* Program Hardware Status Page */

	dev_priv->status_page_dmah =
@@ -71,10 +70,9 @@ static int i915_init_phys_hws(struct drm_device *dev) 
		DRM_ERROR("Can not allocate hardware status page\n");

		return -ENOMEM;

	}

	ring->status_page.page_addr =

		(void __force __iomem *)dev_priv->status_page_dmah->vaddr;



	memset_io(ring->status_page.page_addr, 0, PAGE_SIZE);

	memset_io((void __force __iomem *)dev_priv->status_page_dmah->vaddr,

		  0, PAGE_SIZE);



	i915_write_hws_pga(dev);

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ module_param_named(semaphores, i915_semaphores, int, 0600); 
MODULE_PARM_DESC(semaphores,

		"Use semaphores for inter-ring sync (default: false)");



unsigned int i915_enable_rc6 __read_mostly = 0;

unsigned int i915_enable_rc6 __read_mostly = 1;

module_param_named(i915_enable_rc6, i915_enable_rc6, int, 0600);

MODULE_PARM_DESC(i915_enable_rc6,

		"Enable power-saving render C-state 6 (default: true)");

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ typedef struct drm_i915_private { 
	u32 savePIPEB_LINK_M1;

	u32 savePIPEB_LINK_N1;

	u32 saveMCHBAR_RENDER_STANDBY;

	u32 savePCH_PORT_HOTPLUG;



	struct {

		/** Bridge to intel-gtt-ko */