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

[Kevin Brace]

 drivers/gpu/drm/openchrome/openchrome_crtc.c |   18 ++++++++----------
 drivers/gpu/drm/openchrome/openchrome_drv.h  |    4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 9d7e0418894bb0f671eeb72138994528ad1e2ba5
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jun 5 15:36:20 2019 -0500

    drm/openchrome: Version bumped to 3.1.10
    
    Eliminated a few more compilation warnings that showed up.  At this
    point, there are no compilation warnings.
    
    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 f4b8f70f0f28..26572aa048b5 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	9
+#define DRIVER_PATCHLEVEL	10
 #define DRIVER_NAME		"openchrome"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE		"20190604"
+#define DRIVER_DATE		"20190605"
 #define DRIVER_AUTHOR		"OpenChrome Project"
 
 
commit 57eab2df28581c07788a5d1156a787165441cd03
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jun 5 15:30:40 2019 -0500

    drm/openchrome: Return an error code after initializing display FIFO
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_crtc.c b/drivers/gpu/drm/openchrome/openchrome_crtc.c
index 1182056449f4..7c9ceb94785b 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -1084,8 +1084,6 @@ static int via_iga2_display_fifo_regs(
 			}
 		}
 
-		fifo_high_threshold = 16;
-		display_queue_expire_num = 16;
 		break;
 	case PCI_DEVICE_ID_VIA_KM400:
 		if (mode->hdisplay >= 1600) {
commit 1af1ed8ba852d705d762638b86e34706b248c65a
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jun 5 15:28:43 2019 -0500

    drm/openchrome: Initialize variables before display FIFO parameters are set
    
    This should eliminate compilation warnings.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/openchrome_crtc.c b/drivers/gpu/drm/openchrome/openchrome_crtc.c
index 9ddf00062878..1182056449f4 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -627,10 +627,10 @@ static int via_iga1_display_fifo_regs(
 			struct drm_framebuffer *fb)
 {
 	u32 reg_value;
-	unsigned int fifo_max_depth;
-	unsigned int fifo_threshold;
-	unsigned int fifo_high_threshold;
-	unsigned int display_queue_expire_num;
+	unsigned int fifo_max_depth = 0;
+	unsigned int fifo_threshold = 0;
+	unsigned int fifo_high_threshold = 0;
+	unsigned int display_queue_expire_num = 0;
 	bool enable_extended_display_fifo = false;
 	int ret = 0;
 
@@ -1029,10 +1029,10 @@ static int via_iga2_display_fifo_regs(
 			struct drm_framebuffer *fb)
 {
 	u32 reg_value;
-	unsigned int fifo_max_depth;
-	unsigned int fifo_threshold;
-	unsigned int fifo_high_threshold;
-	unsigned int display_queue_expire_num;
+	unsigned int fifo_max_depth = 0;
+	unsigned int fifo_threshold = 0;
+	unsigned int fifo_high_threshold = 0;
+	unsigned int display_queue_expire_num = 0;
 	bool enable_extended_display_fifo = false;
 	int ret = 0;