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

Commit 19524f7c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/core-stuff-2014-09-15' of git://anongit.freedesktop.org/drm-intel into drm-next 

Here's the updated topic/core-stuff pull request with the two patches
already merged into drm-fixes dropped.

* tag 'topic/core-stuff-2014-09-15' of git://anongit.freedesktop.org/drm-intel:
  drm: Drop modeset locking from crtc init function
  drm/i915/hdmi: Enable pipe pixel replication for SD interlaced modes
  drm/edid: Reduce horizontal timings for pixel replicated modes
  drm: Include task->name and master status in debugfs clients info
  drm/gem: Fix kerneldoc typo
  drm: use c99 initializers in structures
  drm: fix drm_modeset_lock.h kernel-doc notation
parents 98faa78c d0fa1af4

drivers/gpu/drm/drm_crtc.c

+0 −5
Original line number Diff line number Diff line
@@ -680,11 +680,7 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc, 
	crtc->funcs = funcs;

	crtc->invert_dimensions = false;



	drm_modeset_lock_all(dev);

	drm_modeset_lock_init(&crtc->mutex);

	/* dropped by _unlock_all(): */

	drm_modeset_lock(&crtc->mutex, config->acquire_ctx);



	ret = drm_mode_object_get(dev, &crtc->base, DRM_MODE_OBJECT_CRTC);

	if (ret)

		goto out;
@@ -702,7 +698,6 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc, 
		cursor->possible_crtcs = 1 << drm_crtc_index(crtc);



 out:

	drm_modeset_unlock_all(dev);



	return ret;

}

drivers/gpu/drm/drm_edid.c

+60 −57
Original line number Diff line number Diff line
@@ -632,27 +632,27 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |

			DRM_MODE_FLAG_INTERLACE),

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 6 - 1440x480i@60Hz */

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

	/* 6 - 720(1440)x480i@60Hz */

	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,

		   801, 858, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },

	/* 7 - 1440x480i@60Hz */

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

	/* 7 - 720(1440)x480i@60Hz */

	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,

		   801, 858, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 8 - 1440x240@60Hz */

	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,

		   1602, 1716, 0, 240, 244, 247, 262, 0,

	/* 8 - 720(1440)x240@60Hz */

	{ DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,

		   801, 858, 0, 240, 244, 247, 262, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },

	/* 9 - 1440x240@60Hz */

	{ DRM_MODE("1440x240", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1478,

		   1602, 1716, 0, 240, 244, 247, 262, 0,

	/* 9 - 720(1440)x240@60Hz */

	{ DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500, 720, 739,

		   801, 858, 0, 240, 244, 247, 262, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
@@ -714,27 +714,27 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC |

			DRM_MODE_FLAG_INTERLACE),

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 21 - 1440x576i@50Hz */

	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,

		   1590, 1728, 0, 576, 580, 586, 625, 0,

	/* 21 - 720(1440)x576i@50Hz */

	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,

		   795, 864, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },

	/* 22 - 1440x576i@50Hz */

	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,

		   1590, 1728, 0, 576, 580, 586, 625, 0,

	/* 22 - 720(1440)x576i@50Hz */

	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,

		   795, 864, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 23 - 1440x288@50Hz */

	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,

		   1590, 1728, 0, 288, 290, 293, 312, 0,

	/* 23 - 720(1440)x288@50Hz */

	{ DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,

		   795, 864, 0, 288, 290, 293, 312, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },

	/* 24 - 1440x288@50Hz */

	{ DRM_MODE("1440x288", DRM_MODE_TYPE_DRIVER, 27000, 1440, 1464,

		   1590, 1728, 0, 288, 290, 293, 312, 0,

	/* 24 - 720(1440)x288@50Hz */

	{ DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500, 720, 732,

		   795, 864, 0, 288, 290, 293, 312, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
@@ -837,15 +837,15 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   796, 864, 0, 576, 581, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),

	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 44 - 1440x576i@100Hz */

	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,

		   1590, 1728, 0, 576, 580, 586, 625, 0,

	/* 44 - 720(1440)x576i@100Hz */

	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,

		   795, 864, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },

	/* 45 - 1440x576i@100Hz */

	{ DRM_MODE("1440x576", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1464,

		   1590, 1728, 0, 576, 580, 586, 625, 0,

	/* 45 - 720(1440)x576i@100Hz */

	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,

		   795, 864, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
@@ -870,15 +870,15 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   798, 858, 0, 480, 489, 495, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),

	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 50 - 1440x480i@120Hz */

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

	/* 50 - 720(1440)x480i@120Hz */

	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 27000, 720, 739,

		   801, 858, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },

	/* 51 - 1440x480i@120Hz */

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 54000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

	/* 51 - 720(1440)x480i@120Hz */

	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 27000, 720, 739,

		   801, 858, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
@@ -892,15 +892,15 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   796, 864, 0, 576, 581, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),

	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 54 - 1440x576i@200Hz */

	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,

		   1590, 1728, 0, 576, 580, 586, 625, 0,

	/* 54 - 720(1440)x576i@200Hz */

	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,

		   795, 864, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },

	/* 55 - 1440x576i@200Hz */

	{ DRM_MODE("1440x576i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1464,

		   1590, 1728, 0, 576, 580, 586, 625, 0,

	/* 55 - 720(1440)x576i@200Hz */

	{ DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 54000, 720, 732,

		   795, 864, 0, 576, 580, 586, 625, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 200, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
@@ -914,15 +914,15 @@ static const struct drm_display_mode edid_cea_modes[] = { 
		   798, 858, 0, 480, 489, 495, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),

	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },

	/* 58 - 1440x480i@240 */

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

	/* 58 - 720(1440)x480i@240 */

	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 54000, 720, 739,

		   801, 858, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },

	/* 59 - 1440x480i@240 */

	{ DRM_MODE("1440x480i", DRM_MODE_TYPE_DRIVER, 108000, 1440, 1478,

		   1602, 1716, 0, 480, 488, 494, 525, 0,

	/* 59 - 720(1440)x480i@240 */

	{ DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 54000, 720, 739,

		   801, 858, 0, 480, 488, 494, 525, 0,

		   DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC |

			DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK),

	  .vrefresh = 240, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
@@ -2103,7 +2103,8 @@ static int 
add_inferred_modes(struct drm_connector *connector, struct edid *edid)

{

	struct detailed_mode_closure closure = {

		connector, edid, 0, 0, 0

		.connector = connector,

		.edid = edid,

	};



	if (version_greater(edid, 1, 0))
@@ -2169,7 +2170,8 @@ add_established_modes(struct drm_connector *connector, struct edid *edid) 
		((edid->established_timings.mfg_rsvd & 0x80) << 9);

	int i, modes = 0;

	struct detailed_mode_closure closure = {

		connector, edid, 0, 0, 0

		.connector = connector,

		.edid = edid,

	};



	for (i = 0; i <= EDID_EST_TIMINGS; i++) {
@@ -2227,7 +2229,8 @@ add_standard_modes(struct drm_connector *connector, struct edid *edid) 
{

	int i, modes = 0;

	struct detailed_mode_closure closure = {

		connector, edid, 0, 0, 0

		.connector = connector,

		.edid = edid,

	};



	for (i = 0; i < EDID_STD_TIMINGS; i++) {
@@ -2313,7 +2316,8 @@ static int 
add_cvt_modes(struct drm_connector *connector, struct edid *edid)

{	

	struct detailed_mode_closure closure = {

		connector, edid, 0, 0, 0

		.connector = connector,

		.edid = edid,

	};



	if (version_greater(edid, 1, 2))
@@ -2357,11 +2361,10 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, 
		   u32 quirks)

{

	struct detailed_mode_closure closure = {

		connector,

		edid,

		1,

		quirks,

		0

		.connector = connector,

		.edid = edid,

		.preferred = 1,

		.quirks = quirks,

	};



	if (closure.preferred && !version_greater(edid, 1, 3))

drivers/gpu/drm/drm_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ int drm_gem_object_init(struct drm_device *dev, 
EXPORT_SYMBOL(drm_gem_object_init);



/**

 * drm_gem_object_init - initialize an allocated private GEM object

 * drm_gem_private_object_init - initialize an allocated private GEM object

 * @dev: drm_device the object should be initialized for

 * @obj: drm_gem_object to initialize

 * @size: object size

drivers/gpu/drm/drm_info.c

+22 −5
Original line number Diff line number Diff line
@@ -184,15 +184,32 @@ int drm_clients_info(struct seq_file *m, void *data) 
	struct drm_device *dev = node->minor->dev;

	struct drm_file *priv;



	seq_printf(m,

		   "%20s %5s %3s master a %5s %10s\n",

		   "command",

		   "pid",

		   "dev",

		   "uid",

		   "magic");



	/* dev->filelist is sorted youngest first, but we want to present

	 * oldest first (i.e. kernel, servers, clients), so walk backwardss.

	 */

	mutex_lock(&dev->struct_mutex);

	seq_printf(m, "a dev	pid    uid	magic\n\n");

	list_for_each_entry(priv, &dev->filelist, lhead) {

		seq_printf(m, "%c %3d %5d %5d %10u\n",

			   priv->authenticated ? 'y' : 'n',

			   priv->minor->index,

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

		struct task_struct *task;



		rcu_read_lock(); /* locks pid_task()->comm */

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

		seq_printf(m, "%20s %5d %3d   %c    %c %5d %10u\n",

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

			   pid_vnr(priv->pid),

			   priv->minor->index,

			   priv->is_master ? 'y' : 'n',

			   priv->authenticated ? 'y' : 'n',

			   from_kuid_munged(seq_user_ns(m), priv->uid),

			   priv->magic);

		rcu_read_unlock();

	}

	mutex_unlock(&dev->struct_mutex);

	return 0;

drivers/gpu/drm/i915/intel_hdmi.c

+12 −3
Original line number Diff line number Diff line
@@ -864,10 +864,15 @@ static enum drm_mode_status 
intel_hdmi_mode_valid(struct drm_connector *connector,

		      struct drm_display_mode *mode)

{

	if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector),

	int clock = mode->clock;



	if (mode->flags & DRM_MODE_FLAG_DBLCLK)

		clock *= 2;



	if (clock > hdmi_portclock_limit(intel_attached_hdmi(connector),

					 true))

		return MODE_CLOCK_HIGH;

	if (mode->clock < 20000)

	if (clock < 20000)

		return MODE_CLOCK_LOW;



	if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
@@ -921,6 +926,10 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, 
			intel_hdmi->color_range = 0;

	}



	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK) {

		pipe_config->pixel_multiplier = 2;

	}



	if (intel_hdmi->color_range)

		pipe_config->limited_color_range = true;