drivers/gpu/drm/openchrome/via_crtc.c |   42 +++++++++++++++++-----------------
 drivers/gpu/drm/openchrome/via_drv.h  |    2 -
 2 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit e9e5bc8571baa9b3815d2c1888d5bb68b1f3f31a
Author: Kevin Brace <kevinbr...@gmx.com>
Date:   Tue Feb 13 07:47:16 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 <kevinbr...@gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_drv.h 
b/drivers/gpu/drm/openchrome/via_drv.h
index 5fc0f3c292eb..7ca8e1509402 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      73
+#define DRIVER_PATCHLEVEL      74
 
 #include <linux/module.h>
 
commit fa89d6704143116465e213316acdde408cc814b0
Author: Kevin Brace <kevinbr...@gmx.com>
Date:   Tue Feb 13 07:44:28 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 <kevinbr...@gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_crtc.c 
b/drivers/gpu/drm/openchrome/via_crtc.c
index 84dcb8cc973d..cb50a5b8cc06 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);
@@ -374,12 +374,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)));
@@ -946,7 +946,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 {
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel

Reply via email to