[openchrome-devel] xf86-video-openchrome: 2 commits - src/via_driver.h src/via_memmgr.c

[Kevin Brace]

 src/via_driver.h |    2 +-
 src/via_memmgr.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 82ed5ba8e175a046271e106d16ca55775df32e9d
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Dec 20 16:44:36 2019 -0600

    Convert VIARec struct's FBBase to uint8_t pointer type
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.h b/src/via_driver.h
index e606cd8..f9262b6 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -211,7 +211,7 @@ typedef struct _VIA {
     unsigned char*      MpegMapBase;
     unsigned char*      BltBase;
     unsigned char*      MapBaseDense;
-    unsigned char*      FBBase;
+    uint8_t*            FBBase;
     CARD8               MemClk;
 
     /* Here are all the Options */
diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index 9cb0221..d3d1669 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -212,7 +212,7 @@ drm_bo_map(ScrnInfoPtr pScrn, struct buffer_object *obj)
             break;
 #endif
         case TTM_PL_FLAG_VRAM:
-            obj->ptr = (pVia->FBBase + obj->offset);
+            obj->ptr = pVia->FBBase + obj->offset;
             break;
         default:
             obj->ptr = NULL;
commit 09c8711f231c57c51cfd3952f0f885fa027c6a2c
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Dec 20 16:42:07 2019 -0600

    Suppress pointer arithmetic compilation warning inside via_memmgr.c
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index 508d2b8..9cb0221 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -208,7 +208,7 @@ drm_bo_map(ScrnInfoPtr pScrn, struct buffer_object *obj)
         switch (obj->domain) {
 #ifdef HAVE_DRI
         case TTM_PL_FLAG_TT:
-            obj->ptr = (pVia->agpMappedAddr + obj->offset);
+            obj->ptr = (uint8_t*)pVia->agpMappedAddr + obj->offset;
             break;
 #endif
         case TTM_PL_FLAG_VRAM: