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

[Kevin Brace]

 drivers/gpu/drm/openchrome/openchrome_display.c |    7 +------
 drivers/gpu/drm/openchrome/openchrome_drv.h     |    6 ++++--
 drivers/gpu/drm/openchrome/openchrome_fb.c      |   23 +++++++++++++++++++++--
 3 files changed, 26 insertions(+), 10 deletions(-)

New commits:
commit f449944a7d4c6e42e3ae6c64301334ac2d6ad7cc
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Oct 1 12:42:03 2019 -0400

    drm/openchrome: Version bumped to 3.1.15
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 0c897843d69f..99139051dfa2 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -51,10 +51,10 @@
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		1
-#define DRIVER_PATCHLEVEL	14
+#define DRIVER_PATCHLEVEL	15
 #define DRIVER_NAME		"openchrome"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE		"20190827"
+#define DRIVER_DATE		"20190929"
 #define DRIVER_AUTHOR		"OpenChrome Project"
 
 
commit 46b81fa4566d2961523bce82d11261908fca7fca
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Oct 1 12:40:28 2019 -0400

    drm/openchrome: Set preferred color depth to 24 bits
    
    Set mode_config struct's preferred_depth parameter to 24.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_fb.c b/drivers/gpu/drm/openchrome/openchrome_fb.c
index 0811cd9d55bf..53efa28efc8f 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fb.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fb.c
@@ -284,6 +284,8 @@ void openchrome_mode_config_init(
 
 	dev->mode_config.funcs = &via_mode_funcs;
 
+	dev->mode_config.preferred_depth = 24;
+
 	DRM_DEBUG_KMS("Exiting %s.\n", __func__);
 }
 
commit e47cd7d7996e9d3b8948ad36c6a9896c4ad7eb42
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Oct 1 12:39:56 2019 -0400

    drm/openchrome: Add openchrome_mode_config_init()
    
    Perform mode_config struct initialization here.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_display.c b/drivers/gpu/drm/openchrome/openchrome_display.c
index 948452bb2649..29ce8cadb86a 100644
--- a/drivers/gpu/drm/openchrome/openchrome_display.c
+++ b/drivers/gpu/drm/openchrome/openchrome_display.c
@@ -481,12 +481,7 @@ via_modeset_init(struct drm_device *dev)
 	struct openchrome_drm_private *dev_private = dev->dev_private;
 	int ret = 0;
 
-	drm_mode_config_init(dev);
-
-	dev->mode_config.min_width = 0;
-	dev->mode_config.min_height = 0;
-	dev->mode_config.max_width = 2044;
-	dev->mode_config.max_height = 4096;
+	openchrome_mode_config_init(dev_private);
 
 	/* Initialize the number of display connectors. */
 	dev_private->number_fp = 0;
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 82e66ba92efd..0c897843d69f 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -280,6 +280,8 @@ extern int openchrome_vram_init(
 			struct openchrome_drm_private *dev_private);
 extern void openchrome_vram_fini(
 			struct openchrome_drm_private *dev_private);
+void openchrome_mode_config_init(
+			struct openchrome_drm_private *dev_private);
 
 void openchrome_ttm_domain_to_placement(struct openchrome_bo *bo,
 					uint32_t ttm_domain);
diff --git a/drivers/gpu/drm/openchrome/openchrome_fb.c b/drivers/gpu/drm/openchrome/openchrome_fb.c
index 6723060a2320..0811cd9d55bf 100644
--- a/drivers/gpu/drm/openchrome/openchrome_fb.c
+++ b/drivers/gpu/drm/openchrome/openchrome_fb.c
@@ -268,6 +268,25 @@ static struct drm_fb_helper_funcs via_drm_fb_helper_funcs = {
 	.fb_probe = via_fb_probe,
 };
 
+void openchrome_mode_config_init(
+			struct openchrome_drm_private *dev_private)
+{
+	struct drm_device *dev = dev_private->dev;
+
+	DRM_DEBUG_KMS("Entered %s.\n", __func__);
+
+	drm_mode_config_init(dev);
+
+	dev->mode_config.min_width = 0;
+	dev->mode_config.min_height = 0;
+	dev->mode_config.max_width = 2044;
+	dev->mode_config.max_height = 4096;
+
+	dev->mode_config.funcs = &via_mode_funcs;
+
+	DRM_DEBUG_KMS("Exiting %s.\n", __func__);
+}
+
 int via_fbdev_init(struct drm_device *dev)
 {
 	struct openchrome_drm_private *dev_private = dev->dev_private;
@@ -277,8 +296,6 @@ int via_fbdev_init(struct drm_device *dev)
 
 	DRM_DEBUG_KMS("Entered %s.\n", __func__);
 
-	dev->mode_config.funcs = &via_mode_funcs;
-
 	via_fbdev = kzalloc(sizeof(struct via_framebuffer_device),
 				GFP_KERNEL);
 	if (!via_fbdev) {
commit 2f14f166277a2d97148c7f142471d35be9bea3cb
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Oct 1 12:38:51 2019 -0400

    drm/openchrome: Adjust mode_config struct's minimum width and height
    
    They should both be 0.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_display.c b/drivers/gpu/drm/openchrome/openchrome_display.c
index 135dffa73931..948452bb2649 100644
--- a/drivers/gpu/drm/openchrome/openchrome_display.c
+++ b/drivers/gpu/drm/openchrome/openchrome_display.c
@@ -483,8 +483,8 @@ via_modeset_init(struct drm_device *dev)
 
 	drm_mode_config_init(dev);
 
-	dev->mode_config.min_width = 320;
-	dev->mode_config.min_height = 200;
+	dev->mode_config.min_width = 0;
+	dev->mode_config.min_height = 0;
 	dev->mode_config.max_width = 2044;
 	dev->mode_config.max_height = 4096;