[Openchrome-devel] xf86-video-openchrome: 2 commits - src/via_display.c src/via_ums.h

[Kevin Brace]

 src/via_display.c |   10 +++++-----
 src/via_ums.h     |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 40142bac588590f5c6b2e5da0f77929793289292
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Apr 15 20:55:03 2016 -0700

    Changing ViaSecondCRTCSetStartingAddress to viaIGA2SetFBStartingAddress
    
    This function is located inside via_display.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 8e5e083..48b531d 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -531,7 +531,7 @@ viaIGA1SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 }
 
 void
-ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y)
+viaIGA2SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y)
 {
     drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
     drmmode_ptr drmmode = drmmode_crtc->drmmode;
@@ -1400,7 +1400,7 @@ iga2_crtc_set_origin(xf86CrtcPtr crtc, int x, int y)
     ScrnInfoPtr pScrn = crtc->scrn;
     VIAPtr pVia = VIAPTR(pScrn);
 
-    ViaSecondCRTCSetStartingAddress(crtc, x, y);
+    viaIGA2SetFBStartingAddress(crtc, x, y);
     VIAVidAdjustFrame(pScrn, x, y);
 }
 
diff --git a/src/via_ums.h b/src/via_ums.h
index f49dbc9..78eaa41 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -208,7 +208,7 @@ void ViaCRTCInit(ScrnInfoPtr pScrn);
 void viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y);
 void viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void viaIGA1SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
-void ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
+void viaIGA2SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y);
 void ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn);
 void ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int width);
 void viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
commit 5e00866f8423fd2bfe3fb06fc115a633d542d3ed
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Apr 15 20:49:49 2016 -0700

    Changing ViaFirstCRTCSetStartingAddress to viaIGA1SetFBStartingAddress
    
    This function is located inside via_display.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_display.c b/src/via_display.c
index 12f16d6..8e5e083 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -471,7 +471,7 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
 }
 
 void
-ViaFirstCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y)
+viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y)
 {
     drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
     drmmode_ptr drmmode = drmmode_crtc->drmmode;
@@ -480,7 +480,7 @@ ViaFirstCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y)
     vgaHWPtr hwp = VGAHWPTR(pScrn);
     CARD32 Base;
 
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaFirstCRTCSetStartingAddress\n"));
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaIGA1SetFBStartingAddress\n"));
 
     Base = (y * pScrn->displayWidth + x) * (pScrn->bitsPerPixel / 8);
     Base = (Base + drmmode->front_bo->offset) >> 1;
@@ -1003,7 +1003,7 @@ iga1_crtc_set_origin(xf86CrtcPtr crtc, int x, int y)
     ScrnInfoPtr pScrn = crtc->scrn;
     VIAPtr pVia = VIAPTR(pScrn);
 
-    ViaFirstCRTCSetStartingAddress(crtc, x, y);
+    viaIGA1SetFBStartingAddress(crtc, x, y);
     VIAVidAdjustFrame(pScrn, x, y);
 }
 
diff --git a/src/via_ums.h b/src/via_ums.h
index e09962a..f49dbc9 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -205,7 +205,7 @@ void ViaSetUseExternalClock(vgaHWPtr hwp);
 /* via_display.c */
 Bool UMSCrtcInit(ScrnInfoPtr pScrn);
 void ViaCRTCInit(ScrnInfoPtr pScrn);
-void ViaFirstCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
+void viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y);
 void viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void viaIGA1SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
 void ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);