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

[Kevin Brace]

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

New commits:
commit 5e11d4f0853576c31cd8c2b8b6dfbfdce3db04f8
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Sat Sep 9 20:55:40 2023 -0700

    drm/via: Version bumped to 3.6.11
    
    Using the previous DRM_FORMAT_XRGB8888 setting causes strange
    frame buffer errors and the loss of hardware cursor.
    
    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 74aa149fea16..b7a273d614da 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	10
+#define DRIVER_PATCHLEVEL	11
 #define DRIVER_NAME		"via"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome"
-#define DRIVER_DATE		"20230728"
+#define DRIVER_DATE		"20230909"
 #define DRIVER_AUTHOR		"OpenChrome Project"
 
 
commit 86d6bfd9102e6733cdeaf5acbaf29033475c5c4c
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Sat Sep 9 20:54:32 2023 -0700

    Revert "drm/via: Use DRM_FORMAT_XRGB8888 format for cursor plane"
    
    This reverts commit e8f1b49a3c20099671b555817e0148cd0b54d82d.

diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 1132c45ac1c6..9e38b9c37d55 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -408,7 +408,7 @@ const struct drm_plane_funcs via_cursor_drm_plane_funcs = {
 };
 
 const uint32_t via_cursor_formats[] = {
-	DRM_FORMAT_XRGB8888,
+	DRM_FORMAT_ARGB8888,
 };
 
 const unsigned int via_cursor_formats_size =
commit b0a2d3b910f992c1024c7caf25ba8eb31fd4aa1d
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Sat Sep 9 20:54:31 2023 -0700

    drm: Remove struct drm_driver.gem_prime_mmap
    
    Based on commit 0adec22 (drm: Remove struct drm_driver.gem_prime_mmap).
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index facdba3656e8..0a97949d6d37 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -188,8 +188,6 @@ static struct drm_driver via_driver = {
 	.postclose = via_driver_postclose,
 	.lastclose = via_driver_lastclose,
 
-	.gem_prime_mmap = drm_gem_prime_mmap,
-
 	.dumb_create = via_driver_dumb_create,
 	.dumb_map_offset = via_driver_dumb_map_offset,