[openchrome-devel] xf86-video-openchrome: 2 commits - configure.ac src/via_driver.c src/via_kms.c

[Kevin Brace]

 configure.ac     |    2 +-
 src/via_driver.c |    9 ++++-----
 src/via_kms.c    |    3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 7f7183c5c81c4ca9555a7c98c6190b3768624d7a
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Jan 13 17:19:52 2020 -0600

    Version bumped to 0.6.205
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 7190941..bdb6848 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.204],
+        [0.6.205],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit bd5fb6e7f4a1f958c446e1820651f49d71320aa6
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Mon Jan 13 16:55:28 2020 -0600

    Stop using pitch member of buffer_object struct
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index a6690b8..1949665 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -660,7 +660,8 @@ via_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
     Bool ret;
     ScreenPtr screen;
     uint32_t old_fb_id;
-    int i, pitch, old_width, old_height, old_displayWidth;
+    int i;
+    int old_width, old_height, old_displayWidth;
     int cpp = (scrn->bitsPerPixel + 7) / 8;
     PixmapPtr ppix;
     void *new_pixels;
@@ -695,16 +696,14 @@ via_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
         goto fail;
     }
 
-    pitch = drmmode->front_bo->pitch;
-
     scrn->virtualX = width;
     scrn->virtualY = height;
-    scrn->displayWidth = pitch / cpp;
+    scrn->displayWidth = width;
 
 #ifdef HAVE_DRI
     if (pVia->KMS) {
         ret = drmModeAddFB(drmmode->fd, width, height, scrn->depth,
-                            scrn->bitsPerPixel, drmmode->front_bo->pitch,
+                            scrn->bitsPerPixel, width * cpp,
                             drmmode->front_bo->handle,
                             &drmmode->fb_id);
         if (ret) {
diff --git a/src/via_kms.c b/src/via_kms.c
index 66dba2f..f414656 100644
--- a/src/via_kms.c
+++ b/src/via_kms.c
@@ -192,7 +192,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
     if (drmmode->fb_id == 0) {
         ret = drmModeAddFB(drmmode->fd, pScrn->virtualX, pScrn->virtualY,
                             pScrn->depth, pScrn->bitsPerPixel,
-                            drmmode->front_bo->pitch,
+                            pScrn->virtualX *
+                            ((pScrn->bitsPerPixel + 7) >> 3),
                             drmmode->front_bo->handle,
                             &drmmode->fb_id);
         if (ret < 0) {