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

[Kevin Brace]

 drivers/gpu/drm/openchrome/openchrome_drv.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4cea110fec4fb805ae23adf2da1d6f270bbba27f
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jun 5 15:52:18 2019 -0500

    drm/openchrome: Version bumped to 3.1.11
    
    Fix a commit message issue with the previous version.
    
    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 26572aa048b5..da683ae2a7e8 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -51,7 +51,7 @@
 
 #define DRIVER_MAJOR		3
 #define DRIVER_MINOR		1
-#define DRIVER_PATCHLEVEL	10
+#define DRIVER_PATCHLEVEL	11
 #define DRIVER_NAME		"openchrome"
 #define DRIVER_DESC		"OpenChrome DRM for VIA Technologies Chrome IGP"
 #define DRIVER_DATE		"20190605"
commit e8ad8e1450284a11e8bce72d0059c357bed5c9d9
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jun 5 15:50:37 2019 -0500

    drm/openchrome: Do not set certain display FIFO parameters for CLE266 IGA2
    
    The parameters in question are not used by CLE266 chipset.
    
    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 b30f9577a6361d3be291c79fddac30db112e1a32
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Jun 5 15:46:54 2019 -0500

    drm/openchrome: Revert commit 57eab2df28581c07788a5d1156a787165441cd03
    
    Revert commit 57eab2df28581c07788a5d1156a787165441cd03
    (drm/openchrome: Return an error code after initializing display FIFO)
    due to a wrong commit message getting inserted.
    
    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 7c9ceb94785b..1182056449f4 100644
--- a/drivers/gpu/drm/openchrome/openchrome_crtc.c
+++ b/drivers/gpu/drm/openchrome/openchrome_crtc.c
@@ -1084,6 +1084,8 @@ 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) {