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

Merge remote branch 'intel/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes 

* 'intel/drm-intel-fixes' of /ssd/git/drm-next:
  drm/i915: Only bind to function 0 of the PCI device
  drm/i915: Suppress spurious vblank interrupts
  drm: Avoid leak of adjusted mode along quick set_mode paths
  drm: Simplify and defend later checks when disabling a crtc
  drm: Don't switch fb when disabling an output
  drm/i915: Reset crtc after resume
  drm/i915/crt: Force the initial probe after reset
  drm/i915: Reset state after a GPU reset or resume
  drm: Add an interface to reset the device
  drm/i915/sdvo: If at first we don't succeed in reading the response, wait
parents e468e001 5fe49d86

drivers/gpu/drm/drm_crtc.c

+20 −0
Original line number Diff line number Diff line
@@ -2674,3 +2674,23 @@ out: 
	mutex_unlock(&dev->mode_config.mutex);

	return ret;

}



void drm_mode_config_reset(struct drm_device *dev)

{

	struct drm_crtc *crtc;

	struct drm_encoder *encoder;

	struct drm_connector *connector;



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

		if (crtc->funcs->reset)

			crtc->funcs->reset(crtc);



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)

		if (encoder->funcs->reset)

			encoder->funcs->reset(encoder);



	list_for_each_entry(connector, &dev->mode_config.connector_list, head)

		if (connector->funcs->reset)

			connector->funcs->reset(connector);

}

EXPORT_SYMBOL(drm_mode_config_reset);

drivers/gpu/drm/drm_crtc_helper.c

+11 −10
Original line number Diff line number Diff line
@@ -343,13 +343,12 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 
	struct drm_encoder *encoder;

	bool ret = true;



	adjusted_mode = drm_mode_duplicate(dev, mode);



	crtc->enabled = drm_helper_crtc_in_use(crtc);



	if (!crtc->enabled)

		return true;



	adjusted_mode = drm_mode_duplicate(dev, mode);



	saved_hwmode = crtc->hwmode;

	saved_mode = crtc->mode;

	saved_x = crtc->x;
@@ -437,10 +436,9 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 
	 */

	drm_calc_timestamping_constants(crtc);



	/* XXX free adjustedmode */

	drm_mode_destroy(dev, adjusted_mode);

	/* FIXME: add subpixel order */

done:

	drm_mode_destroy(dev, adjusted_mode);

	if (!ret) {

		crtc->hwmode = saved_hwmode;

		crtc->mode = saved_mode;
@@ -497,14 +495,17 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 


	crtc_funcs = set->crtc->helper_private;



	if (!set->mode)

		set->fb = NULL;



	if (set->fb) {

		DRM_DEBUG_KMS("[CRTC:%d] [FB:%d] #connectors=%d (x y) (%i %i)\n",

				set->crtc->base.id, set->fb->base.id,

				(int)set->num_connectors, set->x, set->y);

	} else {

		DRM_DEBUG_KMS("[CRTC:%d] [NOFB] #connectors=%d (x y) (%i %i)\n",

				set->crtc->base.id, (int)set->num_connectors,

				set->x, set->y);

		DRM_DEBUG_KMS("[CRTC:%d] [NOFB]\n", set->crtc->base.id);

		set->mode = NULL;

		set->num_connectors = 0;

	}



	dev = set->crtc->dev;
@@ -649,8 +650,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 
		mode_changed = true;



	if (mode_changed) {

		set->crtc->enabled = (set->mode != NULL);

		if (set->mode != NULL) {

		set->crtc->enabled = drm_helper_crtc_in_use(set->crtc);

		if (set->crtc->enabled) {

			DRM_DEBUG_KMS("attempting to set mode from"

					" userspace\n");

			drm_mode_debug_printmodeline(set->mode);

drivers/gpu/drm/drm_irq.c

+4 −3
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ void drm_handle_vblank_events(struct drm_device *dev, int crtc) 
 * Drivers should call this routine in their vblank interrupt handlers to

 * update the vblank counter and send any signals that may be pending.

 */

void drm_handle_vblank(struct drm_device *dev, int crtc)

bool drm_handle_vblank(struct drm_device *dev, int crtc)

{

	u32 vblcount;

	s64 diff_ns;
@@ -1258,7 +1258,7 @@ void drm_handle_vblank(struct drm_device *dev, int crtc) 
	unsigned long irqflags;



	if (!dev->num_crtcs)

		return;

		return false;



	/* Need timestamp lock to prevent concurrent execution with

	 * vblank enable/disable, as this would cause inconsistent
@@ -1269,7 +1269,7 @@ void drm_handle_vblank(struct drm_device *dev, int crtc) 
	/* Vblank irq handling disabled. Nothing to do. */

	if (!dev->vblank_enabled[crtc]) {

		spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);

		return;

		return false;

	}



	/* Fetch corresponding timestamp for this vblank interval from
@@ -1311,5 +1311,6 @@ void drm_handle_vblank(struct drm_device *dev, int crtc) 
	drm_handle_vblank_events(dev, crtc);



	spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);

	return true;

}

EXPORT_SYMBOL(drm_handle_vblank);

drivers/gpu/drm/i915/i915_drv.c

+10 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ static int i915_drm_thaw(struct drm_device *dev) 
		error = i915_gem_init_ringbuffer(dev);

		mutex_unlock(&dev->struct_mutex);



		drm_mode_config_reset(dev);

		drm_irq_install(dev);



		/* Resume the modeset for every activated CRTC */
@@ -542,6 +543,7 @@ int i915_reset(struct drm_device *dev, u8 flags) 


		mutex_unlock(&dev->struct_mutex);

		drm_irq_uninstall(dev);

		drm_mode_config_reset(dev);

		drm_irq_install(dev);

		mutex_lock(&dev->struct_mutex);

	}
@@ -566,6 +568,14 @@ int i915_reset(struct drm_device *dev, u8 flags) 
static int __devinit

i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	/* Only bind to function 0 of the device. Early generations

	 * used function 1 as a placeholder for multi-head. This causes

	 * us confusion instead, especially on the systems where both

	 * functions have the same PCI-ID!

	 */

	if (PCI_FUNC(pdev->devfn))

		return -ENODEV;



	return drm_get_pci_dev(pdev, ent, &driver);

}

drivers/gpu/drm/i915/i915_irq.c

+4 −4
Original line number Diff line number Diff line
@@ -1196,18 +1196,18 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) 
				intel_finish_page_flip_plane(dev, 1);

		}



		if (pipea_stats & vblank_status) {

		if (pipea_stats & vblank_status &&

		    drm_handle_vblank(dev, 0)) {

			vblank++;

			drm_handle_vblank(dev, 0);

			if (!dev_priv->flip_pending_is_done) {

				i915_pageflip_stall_check(dev, 0);

				intel_finish_page_flip(dev, 0);

			}

		}



		if (pipeb_stats & vblank_status) {

		if (pipeb_stats & vblank_status &&

		    drm_handle_vblank(dev, 1)) {

			vblank++;

			drm_handle_vblank(dev, 1);

			if (!dev_priv->flip_pending_is_done) {

				i915_pageflip_stall_check(dev, 1);

				intel_finish_page_flip(dev, 1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE