[Openchrome-devel] drm-openchrome: Branch 'drm-next-4.17' - 5 commits - drivers/gpu/drm
Kevin Brace
kevinbrace at kemper.freedesktop.org
Sun Feb 11 22:17:55 UTC 2018
drivers/gpu/drm/openchrome/via_crtc.c | 46 +++++++++++++++++-----------------
drivers/gpu/drm/openchrome/via_drv.h | 4 +-
2 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 423ac2c5bc95c64311973ba4994a16a4e42df472
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sun Feb 11 14:16:30 2018 -0800
drm/openchrome: Version bumped to 3.0.75
Fix for IGA1 display getting severely disrupted on K8M800 and PM800.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_drv.h b/drivers/gpu/drm/openchrome/via_drv.h
index 0f1c865461a9..00a5bf9fca0b 100644
--- a/drivers/gpu/drm/openchrome/via_drv.h
+++ b/drivers/gpu/drm/openchrome/via_drv.h
@@ -34,7 +34,7 @@
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 0
-#define DRIVER_PATCHLEVEL 74
+#define DRIVER_PATCHLEVEL 75
#include <linux/module.h>
commit 0db947c9bdcb166434d6f228d3f3f91090d0856d
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sun Feb 11 14:13:16 2018 -0800
drm/openchrome: Fix for PM800 chipset IGA1 getting potentially disrupted
Due to a programming error involving setting IGA1 (display 1) display
FIFO parameters, the display will likely get severely disrupted.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_crtc.c b/drivers/gpu/drm/openchrome/via_crtc.c
index 73d8bad746fb..5a9dee74e8e5 100644
--- a/drivers/gpu/drm/openchrome/via_crtc.c
+++ b/drivers/gpu/drm/openchrome/via_crtc.c
@@ -804,7 +804,7 @@ static void via_iga1_display_fifo_regs(struct drm_device *dev,
break;
case PCI_DEVICE_ID_VIA_PM800:
/* SR17[7:0] */
- fifo_max_depth = 384;
+ fifo_max_depth = 192;
/* SR16[7], SR16[5:0] */
fifo_threshold = 128;
commit decbbd83434423abdc5a8099e74927c52618928c
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sun Feb 11 14:07:33 2018 -0800
drm/openchrome: Fix for K8M800 chipset IGA1 getting disrupted
Due to a programming error involving setting IGA1 (display 1) display
FIFO parameters, the display was getting severely disrupted.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_crtc.c b/drivers/gpu/drm/openchrome/via_crtc.c
index 8bbf8fbb6370..73d8bad746fb 100644
--- a/drivers/gpu/drm/openchrome/via_crtc.c
+++ b/drivers/gpu/drm/openchrome/via_crtc.c
@@ -784,7 +784,7 @@ static void via_iga1_display_fifo_regs(struct drm_device *dev,
break;
case PCI_DEVICE_ID_VIA_K8M800:
/* SR17[7:0] */
- fifo_max_depth = 768;
+ fifo_max_depth = 384;
/* SR16[7], SR16[5:0] */
fifo_threshold = 328;
commit 6df0e0d7de3f1384789334d327629f7cd636498c
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sun Feb 11 13:56:01 2018 -0800
drm/openchrome: Version bumped to 3.0.74
Fix for hardware mouse cursor involving CX700 / VX700, P4M890 /
VN890, VX800 / VX820, and VX900 chipsets.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_drv.h b/drivers/gpu/drm/openchrome/via_drv.h
index cd16fd409d19..0f1c865461a9 100644
--- a/drivers/gpu/drm/openchrome/via_drv.h
+++ b/drivers/gpu/drm/openchrome/via_drv.h
@@ -30,11 +30,11 @@
#define DRIVER_AUTHOR "OpenChrome Project"
#define DRIVER_NAME "openchrome"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE "20180209"
+#define DRIVER_DATE "20180211"
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 0
-#define DRIVER_PATCHLEVEL 73
+#define DRIVER_PATCHLEVEL 74
#include <linux/module.h>
commit a640d8e96467654c750f852ec40f6b3d0a51bd37
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sun Feb 11 13:53:32 2018 -0800
drm/openchrome: Fix for mouse cursor not being displayed
Due to a programming error involving PCI IDs for Chrome IGP, hardware
mouse cursor was not being displayed properly on CX700 / VX700, P4M890 /
VN890, VX800 / VX820, and VX900 chipsets.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_crtc.c b/drivers/gpu/drm/openchrome/via_crtc.c
index 5c9a01eca07d..8bbf8fbb6370 100644
--- a/drivers/gpu/drm/openchrome/via_crtc.c
+++ b/drivers/gpu/drm/openchrome/via_crtc.c
@@ -160,12 +160,12 @@ static void via_hide_cursor(struct drm_crtc *crtc)
switch (dev->pdev->device) {
case PCI_DEVICE_ID_VIA_PM800:
- case PCI_DEVICE_ID_VIA_CX700:
- case PCI_DEVICE_ID_VIA_P4M890:
+ case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
- case PCI_DEVICE_ID_VIA_VX800:
+ case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX855:
- case PCI_DEVICE_ID_VIA_VX900:
+ case PCI_DEVICE_ID_VIA_VX900_VGA:
if (iga->index) {
temp = VIA_READ(HI_CONTROL);
VIA_WRITE(HI_CONTROL, temp & 0xFFFFFFFA);
@@ -194,12 +194,12 @@ static void via_show_cursor(struct drm_crtc *crtc)
switch (dev->pdev->device) {
case PCI_DEVICE_ID_VIA_PM800:
- case PCI_DEVICE_ID_VIA_CX700:
- case PCI_DEVICE_ID_VIA_P4M890:
+ case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
- case PCI_DEVICE_ID_VIA_VX800:
+ case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX855:
- case PCI_DEVICE_ID_VIA_VX900:
+ case PCI_DEVICE_ID_VIA_VX900_VGA:
/* Program Hardware Icon (HI) FIFO, foreground, and
* background colors. */
if (iga->index) {
@@ -225,12 +225,12 @@ static void via_show_cursor(struct drm_crtc *crtc)
switch (dev->pdev->device) {
case PCI_DEVICE_ID_VIA_PM800:
- case PCI_DEVICE_ID_VIA_CX700:
- case PCI_DEVICE_ID_VIA_P4M890:
+ case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
- case PCI_DEVICE_ID_VIA_VX800:
+ case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX855:
- case PCI_DEVICE_ID_VIA_VX900:
+ case PCI_DEVICE_ID_VIA_VX900_VGA:
/* Turn on Hardware icon Cursor */
if (iga->index) {
VIA_WRITE(HI_CONTROL, 0xB6000005);
@@ -266,12 +266,12 @@ static void via_cursor_address(struct drm_crtc *crtc)
switch (dev->pdev->device) {
case PCI_DEVICE_ID_VIA_PM800:
- case PCI_DEVICE_ID_VIA_CX700:
- case PCI_DEVICE_ID_VIA_P4M890:
+ case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
- case PCI_DEVICE_ID_VIA_VX800:
+ case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX855:
- case PCI_DEVICE_ID_VIA_VX900:
+ case PCI_DEVICE_ID_VIA_VX900_VGA:
/* Program the HI offset. */
if (iga->index) {
VIA_WRITE(HI_FBOFFSET, iga->cursor_kmap.bo->offset);
@@ -371,12 +371,12 @@ static int via_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
switch (dev->pdev->device) {
case PCI_DEVICE_ID_VIA_PM800:
- case PCI_DEVICE_ID_VIA_CX700:
- case PCI_DEVICE_ID_VIA_P4M890:
+ case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
- case PCI_DEVICE_ID_VIA_VX800:
+ case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX855:
- case PCI_DEVICE_ID_VIA_VX900:
+ case PCI_DEVICE_ID_VIA_VX900_VGA:
if (iga->index) {
VIA_WRITE(HI_POSSTART, ((xpos << 16) | (ypos & 0x07ff)));
VIA_WRITE(HI_CENTEROFFSET, ((xoff << 16) | (yoff & 0x07ff)));
@@ -943,7 +943,7 @@ static void via_iga1_display_fifo_regs(struct drm_device *dev,
(dev->pdev->device == PCI_DEVICE_ID_VIA_K8M800) ||
(dev->pdev->device == PCI_DEVICE_ID_VIA_PM800) ||
(dev->pdev->device == PCI_DEVICE_ID_VIA_CN700) ||
- (dev->pdev->device == PCI_DEVICE_ID_VIA_CX700)) {
+ (dev->pdev->device == PCI_DEVICE_ID_VIA_VT3157)) {
/* Force PREQ to be always higher than TREQ. */
svga_wseq_mask(VGABASE, 0x18, BIT(6), BIT(6));
} else {
More information about the Openchrome-devel
mailing list