From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 00:31:55 +0000 (+1000)
Subject: Merge remote-tracking branch 'drm/drm-next'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f11de90edd7f0aba9c6c4b84c3f4021085db55fd;p=deliverable%2Flinux.git

Merge remote-tracking branch 'drm/drm-next'
---

f11de90edd7f0aba9c6c4b84c3f4021085db55fd
diff --cc Documentation/gpu/index.rst
index 5ff3d2b236af,ba92f45abb76..be0dafcf5556
--- a/Documentation/gpu/index.rst
+++ b/Documentation/gpu/index.rst
@@@ -12,10 -12,4 +12,11 @@@ Linux GPU Driver Developer's Guid
     drm-uapi
     i915
     vga-switcheroo
+    vgaarbiter
 +
 +.. only::  subproject
 +
 +   Indices
 +   =======
 +
 +   * :ref:`genindex`
diff --cc drivers/gpu/drm/drm_crtc.c
index ddebe54cd5ca,631691bae01d..d84a0ead8100
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@@ -5402,13 -1915,19 +1915,22 @@@ int drm_mode_page_flip_ioctl(struct drm
  	struct drm_crtc *crtc;
  	struct drm_framebuffer *fb = NULL;
  	struct drm_pending_vblank_event *e = NULL;
+ 	u32 target_vblank = page_flip->sequence;
  	int ret = -EINVAL;
  
 +	if (!drm_core_check_feature(dev, DRIVER_MODESET))
 +		return -EINVAL;
 +
- 	if (page_flip->flags & ~DRM_MODE_PAGE_FLIP_FLAGS ||
- 	    page_flip->reserved != 0)
+ 	if (page_flip->flags & ~DRM_MODE_PAGE_FLIP_FLAGS)
+ 		return -EINVAL;
+ 
+ 	if (page_flip->sequence != 0 && !(page_flip->flags & DRM_MODE_PAGE_FLIP_TARGET))
+ 		return -EINVAL;
+ 
+ 	/* Only one of the DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags
+ 	 * can be specified
+ 	 */
+ 	if ((page_flip->flags & DRM_MODE_PAGE_FLIP_TARGET) == DRM_MODE_PAGE_FLIP_TARGET)
  		return -EINVAL;
  
  	if ((page_flip->flags & DRM_MODE_PAGE_FLIP_ASYNC) && !dev->mode_config.async_page_flip)
diff --cc drivers/gpu/drm/i915/intel_csr.c
index c3b33a10c15c,fb27d187876c..1ea0e1f43397
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@@ -32,16 -32,9 +32,9 @@@
   * onwards to drive newly added DMC (Display microcontroller) in display
   * engine to save and restore the state of display engine when it enter into
   * low-power state and comes back to normal.
-  *
-  * Firmware loading status will be one of the below states: FW_UNINITIALIZED,
-  * FW_LOADED, FW_FAILED.
-  *
-  * Once the firmware is written into the registers status will be moved from
-  * FW_UNINITIALIZED to FW_LOADED and for any erroneous condition status will
-  * be moved to FW_FAILED.
   */
  
 -#define I915_CSR_KBL "i915/kbl_dmc_ver1.bin"
 +#define I915_CSR_KBL "i915/kbl_dmc_ver1_01.bin"
  MODULE_FIRMWARE(I915_CSR_KBL);
  #define KBL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 1)
  
diff --cc drivers/gpu/drm/i915/intel_display.c
index 175595fc3e45,d224f64836c5..d65f0136b73e
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -3204,24 -3587,26 +3587,28 @@@ void intel_finish_reset(struct drm_i915
  	 */
  	intel_complete_page_flips(dev_priv);
  
- 	/* no reset support for gen2 */
- 	if (IS_GEN2(dev_priv))
- 		return;
+ 	dev_priv->modeset_restore_state = NULL;
  
 +	dev_priv->modeset_restore_state = NULL;
 +
  	/* reset doesn't touch the display */
- 	if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv)) {
- 		/*
- 		 * Flips in the rings have been nuked by the reset,
- 		 * so update the base address of all primary
- 		 * planes to the the last fb to make sure we're
- 		 * showing the correct fb after a reset.
- 		 *
- 		 * FIXME: Atomic will make this obsolete since we won't schedule
- 		 * CS-based flips (which might get lost in gpu resets) any more.
- 		 */
- 		intel_update_primary_planes(dev);
+ 	if (!gpu_reset_clobbers_display(dev_priv)) {
+ 		if (!state) {
+ 			/*
+ 			 * Flips in the rings have been nuked by the reset,
+ 			 * so update the base address of all primary
+ 			 * planes to the the last fb to make sure we're
+ 			 * showing the correct fb after a reset.
+ 			 *
+ 			 * FIXME: Atomic will make this obsolete since we won't schedule
+ 			 * CS-based flips (which might get lost in gpu resets) any more.
+ 			 */
+ 			intel_update_primary_planes(dev);
+ 		} else {
+ 			ret = __intel_display_resume(dev, state);
+ 			if (ret)
+ 				DRM_ERROR("Restoring old state failed with %i\n", ret);
+ 		}
  	} else {
  		/*
  		 * The display has been reset as well,