[openchrome-devel] drm-openchrome: Branch 'drm-next-6.6' - 2 commits - drivers/gpu/drm

[Kevin Brace]

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

New commits:
commit 8fbf2fd180941837a0c15389aa875e264ed7c56c
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Jul 28 18:10:39 2023 -0500

    drm/via: Version bumped to 3.6.10
    
    Fix a regression of IGA2 screen color depth.
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index fed60e2cb2a6..74aa149fea16 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -44,10 +44,10 @@
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		6
-#define DRIVER_PATCHLEVEL	9
+#define DRIVER_PATCHLEVEL	10
 #define DRIVER_NAME		"via"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome"
-#define DRIVER_DATE		"20230726"
+#define DRIVER_DATE		"20230728"
 #define DRIVER_AUTHOR		"OpenChrome Project"
 
 
commit 4f2a54ba6a112536cecab21eb20e50071c6c8fb1
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Jul 28 16:12:00 2023 -0500

    drm/via: Fix a regression of IGA2 screen color depth
    
    Commit 063554e (drm/via: Modify via_iga*_set_color_depth() input
    parameters) change to via_iga2_set_color_depth() missed using its
    new cpp parameter inside the function when setting IGA2's BPP
    (Bits Per Pixel).  As a result, if the color depth was anything
    other than 8-bit (or 8-bit BPP), like 16-bit (16-bit BPP) or
    24-bit (32-bit BPP), the screen controlled by IGA2 would have been
    corrupted.  This commit fixes this regression.
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index b570fd7bdb4b..74537c31e0f0 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -157,7 +157,7 @@ static void via_iga2_set_color_depth(struct drm_device *dev,
 	data = 0x00;
 
 	/* Set the color depth for IGA2. */
-	switch (depth) {
+	switch (cpp) {
 	case 1:
 		break;
 	case 2: