xf86-video-intel: 2 commits - src/i915_pciids.h src/sna/sna_display.c

[Chris Wilson]

 src/i915_pciids.h     |   13 ++++++++++---
 src/sna/sna_display.c |    6 ++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 3a057beca9f290854dd22cd4d2c0fed01c82dd78
Author: Damien Lespiau <damien.lespiau at intel.com>
Date:   Tue Jan 12 15:01:04 2016 +0000

    Sync PCI ids with latest kernel, adding SKL GT4
    
    Syncs with:
    
      commit 15620206ae87ba9643ffa6f5ddb5471be7192006
      Author: Mika Kuoppala <mika.kuoppala at linux.intel.com>
      Date:   Fri Nov 6 14:11:16 2015 +0200
    
          drm/i915/skl: Add SKL GT4 PCI IDs
    
    Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>

diff --git a/src/i915_pciids.h b/src/i915_pciids.h
index f1a113e..f970209 100644
--- a/src/i915_pciids.h
+++ b/src/i915_pciids.h
@@ -279,12 +279,19 @@
 #define INTEL_SKL_GT3_IDS(info) \
 	INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
 	INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
-	INTEL_VGA_DEVICE(0x192A, info) /* SRV GT3 */ \
+	INTEL_VGA_DEVICE(0x192A, info)  /* SRV GT3 */
 
-#define INTEL_SKL_IDS(info) \
+#define INTEL_SKL_GT4_IDS(info) \
+	INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \
+	INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4 */ \
+	INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4 */ \
+	INTEL_VGA_DEVICE(0x193A, info)  /* SRV GT4 */
+
+#define INTEL_SKL_IDS(info)	 \
 	INTEL_SKL_GT1_IDS(info), \
 	INTEL_SKL_GT2_IDS(info), \
-	INTEL_SKL_GT3_IDS(info)
+	INTEL_SKL_GT3_IDS(info), \
+	INTEL_SKL_GT4_IDS(info)
 
 #define INTEL_BXT_IDS(info) \
 	INTEL_VGA_DEVICE(0x0A84, info), \
commit c3dccf76b614d8bcf7fc8b0906754e187a7b7ac4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jan 20 10:52:19 2016 +0000

    sna: Reset CRTC if setting rotation fails
    
    If the kernel doesn't like chaning the native rotation mode with the
    output currently enabled, try disabling it before cryinc foul.
    
    Suggestd-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 8082e9f..1a1bebb 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1351,6 +1351,12 @@ sna_crtc_apply(xf86CrtcPtr crtc)
 	sna_crtc_disable_cursor(sna, sna_crtc);
 
 	if (!rotation_set(sna, &sna_crtc->primary, sna_crtc->rotation)) {
+		memset(&arg, 0, sizeof(arg));
+		arg.crtc_id = __sna_crtc_id(sna_crtc);
+		(void)drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, &arg);
+	}
+
+	if (!rotation_set(sna, &sna_crtc->primary, sna_crtc->rotation)) {
 		ERR(("%s: set-primary-rotation failed (rotation-id=%d, rotation=%d) on CRTC:%d [pipe=%d], errno=%d\n",
 		     __FUNCTION__, sna_crtc->primary.rotation.prop, sna_crtc->rotation, __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc), errno));
 		sna_crtc->primary.rotation.supported &= ~sna_crtc->rotation;