configure.ac | 2 +- src/via_display.c | 5 +++-- src/via_driver.c | 14 +++++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-)
New commits: commit 29cbc1eb3065ead82ba1141864f313b7eb941631 Author: Kevin Brace <kevinbr...@gmx.com> Date: Wed Apr 1 10:08:56 2020 -0700 Version bumped to 0.6.222 Stopped allocating second HI (Hardware Icon) based cursor storage. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/configure.ac b/configure.ac index 5795b9b..ea0cc47 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-openchrome], - [0.6.221], + [0.6.222], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome], [xf86-video-openchrome]) commit 091cb896182d4326262dec30c614abe535926851 Author: Kevin Brace <kevinbr...@gmx.com> Date: Wed Apr 1 09:55:52 2020 -0700 Use only one storage location for HI (Hardware Icon) based cursor This eliminates duplicated second storage location for HI based cursor. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_driver.c b/src/via_driver.c index 34a6e47..55e40e6 100644 --- a/src/via_driver.c +++ b/src/via_driver.c @@ -1420,6 +1420,7 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL) unsigned int bppSize, alignedPitch; unsigned long alignment; xf86CrtcConfigPtr xf86_config; + struct buffer_object *bo; int cursorWidth, cursorHeight, flags; int cursorSize; int i; @@ -1540,6 +1541,15 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL) cursorSize = (cursorWidth * cursorHeight) * (32 / 8); alignment = 1024; + /* + * Set cursor location in frame buffer. + */ + bo = drm_bo_alloc(pScrn, cursorSize, alignment, + TTM_PL_FLAG_VRAM); + if (!bo) { + return FALSE; + } + for (i = 0; i < xf86_config->num_crtc; i++) { xf86CrtcPtr crtc = xf86_config->crtc[i]; drmmode_crtc_private_ptr iga = crtc->driver_private; @@ -1547,9 +1557,7 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL) /* * Set cursor location in frame buffer. */ - iga->cursor_bo = drm_bo_alloc(pScrn, - cursorSize, alignment, - TTM_PL_FLAG_VRAM); + iga->cursor_bo = bo; } if (!xf86_cursors_init(pScreen, commit 23f1e4a364db5c92a7c548f515e385368b3c6e4a Author: Kevin Brace <kevinbr...@gmx.com> Date: Wed Apr 1 08:15:49 2020 -0700 Eliminate variable type compilation warning in 64-bit environment Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_display.c b/src/via_display.c index 40e4274..53dbd33 100644 --- a/src/via_display.c +++ b/src/via_display.c @@ -1189,7 +1189,7 @@ viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y) vgaHWPtr hwp = VGAHWPTR(pScrn); drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; drmmode_ptr drmmode = drmmode_crtc->drmmode; - CARD32 Base; + unsigned long Base; #ifdef HAVE_DEBUG CARD8 cr0c, cr0d, cr34, cr48; #endif @@ -2341,7 +2341,8 @@ viaIGA2SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y) vgaHWPtr hwp = VGAHWPTR(pScrn); drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; drmmode_ptr drmmode = drmmode_crtc->drmmode; - CARD32 Base, tmp; + unsigned long Base; + unsigned long tmp; #ifdef HAVE_DEBUG CARD8 cr62, cr63, cr64, cra3; #endif _______________________________________________ openchrome-devel mailing list openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel