[Openchrome-devel] drm-openchrome: 4 commits - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/via/via_analog.c |    8 +++++---
 drivers/gpu/drm/via/via_crtc.c   |    2 +-
 drivers/gpu/drm/via/via_drv.h    |    4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit b07cb35116a8eb7bab7f9ca8f22d3341a9ce3650
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 11 15:52:43 2017 -0700

    Version bumped to 3.0.30
    
    This version includes a fix for KM400 chipset’s display not working
    properly.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 426f2cd386c..0f258bfe7a1 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -34,7 +34,7 @@
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		0
-#define DRIVER_PATCHLEVEL	29
+#define DRIVER_PATCHLEVEL	30
 
 #include <linux/module.h>
 
commit 4bd88b387dc1b125e3ada64e4925a00cbfc78322
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 11 15:48:40 2017 -0700

    Fix for KM400 chipset’s display getting totally distorted
    
    Due to an embarrassing programming error, IGA1 color depth was not
    being set up correctly. This bug was discovered when testing the code
    on KM400 chipset. This bug does not appear to affect newer devices.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 3a496f7b900..e4de40649f7 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -98,7 +98,7 @@ viaIGA1SetColorDepth(struct via_device *dev_priv,
          *               01: 16bpp
          *               10: 30bpp
          *               11: 32bpp */
-        svga_wseq_mask(VGABASE, 0x15, value, 0x0E);
+        svga_wseq_mask(VGABASE, 0x15, value, BIT(4) | BIT(3) | BIT(2));
         DRM_INFO("IGA1 Color Depth: %d bit\n", depth);
     } else {
         DRM_ERROR("Unsupported IGA1 Color Depth: %d bit\n", depth);
commit a576ea3e699d41a49489c0b8864b1bd76fe6a179
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 11 15:36:03 2017 -0700

    Version bumped to 3.0.29
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index e29dda07229..426f2cd386c 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -30,11 +30,11 @@
 #define DRIVER_AUTHOR       "The OpenChrome Project"
 #define DRIVER_NAME         "via"
 #define DRIVER_DESC         "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE         "20170407"
+#define DRIVER_DATE         "20170411"
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		0
-#define DRIVER_PATCHLEVEL	28
+#define DRIVER_PATCHLEVEL	29
 
 #include <linux/module.h>
 
commit 342400909d905a58128f2fbecc0409e5e158580d
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Apr 10 19:33:20 2017 -0700

    Changed viaAnalogSetDisplaySource input parameter
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/via/via_analog.c b/drivers/gpu/drm/via/via_analog.c
index 57261702016..e9b39eee266 100644
--- a/drivers/gpu/drm/via/via_analog.c
+++ b/drivers/gpu/drm/via/via_analog.c
@@ -72,11 +72,13 @@ viaAnalogSyncPolarity(struct via_device *dev_priv, unsigned int flags)
  * Sets analog (VGA) display source.
  */
 static void
-viaAnalogDisplaySource(struct via_device *dev_priv, u8 displaySource)
+viaAnalogDisplaySource(struct via_device *dev_priv, int index)
 {
+	u8 displaySource = index;
+
 	DRM_DEBUG_KMS("Entered viaAnalogDisplaySource.\n");
 
-	viaAnalogSetDisplaySource(VGABASE, displaySource);
+	viaAnalogSetDisplaySource(VGABASE, displaySource & 0x01);
 	DRM_INFO("Analog (VGA) Display Source: IGA%d\n",
 			(displaySource & 0x01) + 1);
 
@@ -144,7 +146,7 @@ via_analog_mode_set(struct drm_encoder *encoder,
 	DRM_DEBUG_KMS("Entered via_analog_mode_set.\n");
 
 	viaAnalogSyncPolarity(dev_priv, adjusted_mode->flags);
-	viaAnalogDisplaySource(dev_priv, iga->index ? 0x01 : 0x00);
+	viaAnalogDisplaySource(dev_priv, iga->index);
 
 	DRM_DEBUG_KMS("Exiting via_analog_mode_set.\n");
 }