Commit fea0f9ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Just a few straggling fixes I hoovered up, and an intel fixes pull
  from Daniel which fixes some regressions, and some mgag200 fixes from
  Matrox."

* 'drm-next' of git://people.freedesktop.org/~airlied/linux:
  drm/mgag200: Fix framebuffer base address programming
  drm/mgag200: Convert counter delays to jiffies
  drm/mgag200: Fix writes into MGA1064_PIX_CLK_CTL register
  drm/mgag200: Don't change unrelated registers during modeset
  drm: Only print a debug message when the polled connector has changed
  drm: Make the HPD status updates debug logs more readable
  drm: Use names of ioctls in debug traces
  drm: Remove pointless '-' characters from drm_fb_helper documentation
  drm: Add kernel-doc for drm_fb_helper_funcs->initial_config
  drm: refactor call to request_module
  drm: Don't prune modes loudly when a connector is disconnected
  drm: Add missing break in the command line mode parsing code
  drm/i915: clear the stolen fb before resuming
  Revert "drm/i915: Calculate correct stolen size for GEN7+"
  drm/i915: hsw: fix link training for eDP on port-A
  Revert "drm/i915: revert eDP bpp clamping code changes"
  drm: don't check modeset locks in panic handler
  drm/i915: Fix pipe enabled mask for pipe C in WM calculations
  drm/mm: fix dump table BUG
  drm/i915: Always normalize return timeout for wait_timeout_ioctl
parents aef2ea91 9f1d0366

drivers/gpu/drm/drm_crtc.c

+5 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ void drm_warn_on_modeset_not_all_locked(struct drm_device *dev) 
{

	struct drm_crtc *crtc;



	/* Locking is currently fubar in the panic handler. */

	if (oops_in_progress)

		return;



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

		WARN_ON(!mutex_is_locked(&crtc->mutex));
@@ -246,6 +250,7 @@ char *drm_get_connector_status_name(enum drm_connector_status status) 
	else

		return "unknown";

}

EXPORT_SYMBOL(drm_get_connector_status_name);



/**

 * drm_mode_object_get - allocate a new modeset identifier

drivers/gpu/drm/drm_crtc_helper.c

+19 −8
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, 
		connector->helper_private;

	int count = 0;

	int mode_flags = 0;

	bool verbose_prune = true;



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id,

			drm_get_connector_name(connector));
@@ -149,6 +150,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, 
		DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n",

			connector->base.id, drm_get_connector_name(connector));

		drm_mode_connector_update_edid_property(connector, NULL);

		verbose_prune = false;

		goto prune;

	}
@@ -182,7 +184,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, 
	}



prune:

	drm_mode_prune_invalid(dev, &connector->modes, true);

	drm_mode_prune_invalid(dev, &connector->modes, verbose_prune);



	if (list_empty(&connector->modes))

		return 0;
@@ -1005,13 +1007,21 @@ static void output_poll_execute(struct work_struct *work) 
			continue;



		connector->status = connector->funcs->detect(connector, false);

		DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %d to %d\n",

		if (old_status != connector->status) {

			const char *old, *new;



			old = drm_get_connector_status_name(old_status);

			new = drm_get_connector_status_name(connector->status);



			DRM_DEBUG_KMS("[CONNECTOR:%d:%s] "

				      "status updated from %s to %s\n",

				      connector->base.id,

				      drm_get_connector_name(connector),

			      old_status, connector->status);

		if (old_status != connector->status)

				      old, new);



			changed = true;

		}

	}



	mutex_unlock(&dev->mode_config.mutex);
@@ -1083,10 +1093,11 @@ void drm_helper_hpd_irq_event(struct drm_device *dev) 
		old_status = connector->status;



		connector->status = connector->funcs->detect(connector, false);

		DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %d to %d\n",

		DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n",

			      connector->base.id,

			      drm_get_connector_name(connector),

			      old_status, connector->status);

			      drm_get_connector_status_name(old_status),

			      drm_get_connector_status_name(connector->status));

		if (old_status != connector->status)

			changed = true;

	}

drivers/gpu/drm/drm_drv.c

+13 −7
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int drm_version(struct drm_device *dev, void *data, 
		       struct drm_file *file_priv);



#define DRM_IOCTL_DEF(ioctl, _func, _flags) \

	[DRM_IOCTL_NR(ioctl)] = {.cmd = ioctl, .func = _func, .flags = _flags, .cmd_drv = 0}

	[DRM_IOCTL_NR(ioctl)] = {.cmd = ioctl, .func = _func, .flags = _flags, .cmd_drv = 0, .name = #ioctl}



/** Ioctl table */

static const struct drm_ioctl_desc drm_ioctls[] = {
@@ -375,7 +375,7 @@ long drm_ioctl(struct file *filp, 
{

	struct drm_file *file_priv = filp->private_data;

	struct drm_device *dev;

	const struct drm_ioctl_desc *ioctl;

	const struct drm_ioctl_desc *ioctl = NULL;

	drm_ioctl_t *func;

	unsigned int nr = DRM_IOCTL_NR(cmd);

	int retcode = -EINVAL;
@@ -392,11 +392,6 @@ long drm_ioctl(struct file *filp, 
	atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);

	++file_priv->ioctl_count;



	DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",

		  task_pid_nr(current), cmd, nr,

		  (long)old_encode_dev(file_priv->minor->device),

		  file_priv->authenticated);



	if ((nr >= DRM_CORE_IOCTL_COUNT) &&

	    ((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END)))

		goto err_i1;
@@ -417,6 +412,11 @@ long drm_ioctl(struct file *filp, 
	} else

		goto err_i1;



	DRM_DEBUG("pid=%d, dev=0x%lx, auth=%d, %s\n",

		  task_pid_nr(current),

		  (long)old_encode_dev(file_priv->minor->device),

		  file_priv->authenticated, ioctl->name);



	/* Do not trust userspace, use our own definition */

	func = ioctl->func;

	/* is there a local override? */
@@ -471,6 +471,12 @@ long drm_ioctl(struct file *filp, 
	}



      err_i1:

	if (!ioctl)

		DRM_DEBUG("invalid iotcl: pid=%d, dev=0x%lx, auth=%d, cmd=0x%02x, nr=0x%02x\n",

			  task_pid_nr(current),

			  (long)old_encode_dev(file_priv->minor->device),

			  file_priv->authenticated, cmd, nr);



	if (kdata != stack_kdata)

		kfree(kdata);

	atomic_dec(&dev->ioctl_count);

drivers/gpu/drm/drm_encoder_slave.c

+1 −5
Original line number Diff line number Diff line
@@ -54,16 +54,12 @@ int drm_i2c_encoder_init(struct drm_device *dev, 
			 struct i2c_adapter *adap,

			 const struct i2c_board_info *info)

{

	char modalias[sizeof(I2C_MODULE_PREFIX)

		      + I2C_NAME_SIZE];

	struct module *module = NULL;

	struct i2c_client *client;

	struct drm_i2c_encoder_driver *encoder_drv;

	int err = 0;



	snprintf(modalias, sizeof(modalias),

		 "%s%s", I2C_MODULE_PREFIX, info->type);

	request_module(modalias);

	request_module("%s%s", I2C_MODULE_PREFIX, info->type);



	client = i2c_new_device(adap, info);

	if (!client) {

drivers/gpu/drm/drm_mm.c

+18 −16
Original line number Diff line number Diff line
@@ -755,33 +755,35 @@ void drm_mm_debug_table(struct drm_mm *mm, const char *prefix) 
EXPORT_SYMBOL(drm_mm_debug_table);



#if defined(CONFIG_DEBUG_FS)

int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm)

static unsigned long drm_mm_dump_hole(struct seq_file *m, struct drm_mm_node *entry)

{

	struct drm_mm_node *entry;

	unsigned long total_used = 0, total_free = 0, total = 0;

	unsigned long hole_start, hole_end, hole_size;



	hole_start = drm_mm_hole_node_start(&mm->head_node);

	hole_end = drm_mm_hole_node_end(&mm->head_node);

	if (entry->hole_follows) {

		hole_start = drm_mm_hole_node_start(entry);

		hole_end = drm_mm_hole_node_end(entry);

		hole_size = hole_end - hole_start;

	if (hole_size)

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

				hole_start, hole_end, hole_size);

	total_free += hole_size;

		return hole_size;

	}



	return 0;

}



int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm)

{

	struct drm_mm_node *entry;

	unsigned long total_used = 0, total_free = 0, total = 0;



	total_free += drm_mm_dump_hole(m, &mm->head_node);



	drm_mm_for_each_node(entry, mm) {

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

				entry->start, entry->start + entry->size,

				entry->size);

		total_used += entry->size;

		if (entry->hole_follows) {

			hole_start = drm_mm_hole_node_start(entry);

			hole_end = drm_mm_hole_node_end(entry);

			hole_size = hole_end - hole_start;

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

					hole_start, hole_end, hole_size);

			total_free += hole_size;

		}

		total_free += drm_mm_dump_hole(m, entry);

	}

	total = total_free + total_used;

CRA Git | Maintained and supported by SUSTech CRA and CCSE