[openchrome-devel] drm-openchrome: Branch 'drm-next-6.4' - 4 commits - drivers/gpu/drm

[Kevin Brace]

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

New commits:
commit 6a66b47f0b6a14b549ea9a760cb5093539eb8f85
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Apr 7 18:35:03 2023 -0700

    drm/via: Version bumped to 3.6.6
    
    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 83f2d05c7fe8..9e9184afa8ec 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -44,7 +44,7 @@
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		6
-#define DRIVER_PATCHLEVEL	5
+#define DRIVER_PATCHLEVEL	6
 #define DRIVER_NAME		"via"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome"
 #define DRIVER_DATE		"20230407"
commit cf3b8ddefc21f8398645184b8e11c02b3451cf68
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Apr 7 18:31:48 2023 -0700

    drm/via: Replace DRM_FORMAT_RGB332 with DRM_FORMAT_C8 for 8-bit color
    
    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 00271bbb4910..16377e6d840f 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -2234,7 +2234,7 @@ exit:
 static const uint32_t via_primary_formats[] = {
 	DRM_FORMAT_XRGB8888,
 	DRM_FORMAT_RGB565,
-	DRM_FORMAT_RGB332,
+	DRM_FORMAT_C8,
 };
 
 int via_crtc_init(struct via_drm_priv *dev_priv, uint32_t index)
commit 3281a7713ba288b49346e8a83b35ce1f3e0c6cec
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Apr 7 18:31:46 2023 -0700

    drm/via: Delete several primary plane format types
    
    Remove DRM_FORMAT_ARGB8888 and DRM_FORMAT_RGB888 from the list.
    
    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 e5d1fa742a6a..00271bbb4910 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -2233,8 +2233,6 @@ exit:
 
 static const uint32_t via_primary_formats[] = {
 	DRM_FORMAT_XRGB8888,
-	DRM_FORMAT_ARGB8888,
-	DRM_FORMAT_RGB888,
 	DRM_FORMAT_RGB565,
 	DRM_FORMAT_RGB332,
 };
commit e8f1b49a3c20099671b555817e0148cd0b54d82d
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Apr 7 18:31:45 2023 -0700

    drm/via: Use DRM_FORMAT_XRGB8888 format for cursor plane
    
    This is for HI (Hardware Icon) based cursor plane code.
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 5d25d3a4fc77..a7815c120a5d 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -394,7 +394,7 @@ const struct drm_plane_funcs via_cursor_drm_plane_funcs = {
 };
 
 const uint32_t via_cursor_formats[] = {
-	DRM_FORMAT_ARGB8888,
+	DRM_FORMAT_XRGB8888,
 };
 
 const unsigned int via_cursor_formats_size =