From b47e7b803a0ee1b22d82df5f854660a9fc458a8f Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Wed, 13 Feb 2013 10:50:30 +0200 Subject: xf86-video-vmware: upgrade to 13.0.0 Removed backported patch. (From OE-Core rev: f264bf699a42dfe2616386d03524642890308e80) Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- ...ware-port-vmware-driver-to-new-compat-API.patch | 655 --------------------- .../xorg-driver/xf86-video-vmware_12.0.2.bb | 18 - .../xorg-driver/xf86-video-vmware_13.0.0.bb | 17 + 3 files changed, 17 insertions(+), 673 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmware-port-vmware-driver-to-new-compat-API.patch delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmware-port-vmware-driver-to-new-compat-API.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmware-port-vmware-driver-to-new-compat-API.patch deleted file mode 100644 index 610a133b05..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/vmware-port-vmware-driver-to-new-compat-API.patch +++ /dev/null @@ -1,655 +0,0 @@ -Upstream-Status: Backport - -From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 6 Jun 2012 09:58:01 +0100 -Subject: [PATCH] vmware: port vmware driver to new compat API - -This is a port of the vmware driver to the new compat API. - -Tested-by: Jakob Bornecrantz -Reviewed-by: Jakob Bornecrantz -Signed-off-by: Dave Airlie -Signed-off-by: Jakob Bornecrantz ---- - saa/saa.c | 4 +- - saa/saa.h | 4 +- - src/Makefile.am | 1 + - src/compat-api.h | 99 +++++++++++++++++++++++++++++++++++++++++++++ - src/vmware.c | 40 +++++++++--------- - src/vmware.h | 2 +- - src/vmware_common.h | 2 + - vmwgfx/vmwgfx_dri2.c | 4 +- - vmwgfx/vmwgfx_driver.c | 73 +++++++++++++++++---------------- - vmwgfx/vmwgfx_driver.h | 7 ++-- - vmwgfx/vmwgfx_saa.c | 4 +- - vmwgfx/vmwgfx_tex_video.c | 6 +-- - 12 files changed, 174 insertions(+), 72 deletions(-) - create mode 100644 src/compat-api.h - -diff --git a/saa/saa.c b/saa/saa.c -index 173c090..f2d68e9 100644 ---- a/saa/saa.c -+++ b/saa/saa.c -@@ -594,7 +594,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable) - * screen private, before calling down to the next CloseScreen. - */ - Bool --saa_close_screen(int i, ScreenPtr pScreen) -+saa_close_screen(CLOSE_SCREEN_ARGS_DECL) - { - struct saa_screen_priv *sscreen = saa_screen(pScreen); - struct saa_driver *driver = sscreen->driver; -@@ -624,7 +624,7 @@ saa_close_screen(int i, ScreenPtr pScreen) - - free(sscreen); - -- return (*pScreen->CloseScreen) (i, pScreen); -+ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); - } - - struct saa_driver * -diff --git a/saa/saa.h b/saa/saa.h -index c7aa3b6..4e5ced5 100644 ---- a/saa/saa.h -+++ b/saa/saa.h -@@ -44,6 +44,8 @@ - #include - #include - -+#include "../src/compat-api.h" -+ - #define SAA_VERSION_MAJOR 0 - #define SAA_VERSION_MINOR 1 - -@@ -173,7 +175,7 @@ extern _X_EXPORT RegionPtr - saa_bitmap_to_region(PixmapPtr pPix); - - extern _X_EXPORT Bool --saa_close_screen(int i, ScreenPtr pScreen); -+saa_close_screen(CLOSE_SCREEN_ARGS_DECL); - - extern _X_EXPORT Bool - saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC); -diff --git a/src/Makefile.am b/src/Makefile.am -index 04c9e0d..b0dd147 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -37,6 +37,7 @@ endif - vmware_drv_la_SOURCES = \ - bits2pixels.c \ - bits2pixels.h \ -+ compat-api.h \ - guest_os.h \ - includeCheck.h \ - svga_escape.h \ -diff --git a/src/compat-api.h b/src/compat-api.h -new file mode 100644 -index 0000000..6bc946f ---- /dev/null -+++ b/src/compat-api.h -@@ -0,0 +1,99 @@ -+/* -+ * Copyright 2012 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ * -+ * Author: Dave Airlie -+ */ -+ -+/* this file provides API compat between server post 1.13 and pre it, -+ it should be reused inside as many drivers as possible */ -+#ifndef COMPAT_API_H -+#define COMPAT_API_H -+ -+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR -+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] -+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p -+#endif -+ -+#ifndef XF86_HAS_SCRN_CONV -+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] -+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] -+#endif -+ -+#ifndef XF86_SCRN_INTERFACE -+ -+#define SCRN_ARG_TYPE int -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] -+ -+#define SCREEN_ARG_TYPE int -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] -+ -+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags -+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 -+ -+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags -+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 -+ -+#define FREE_SCREEN_ARGS_DECL int arg, int flags -+ -+#define VT_FUNC_ARGS_DECL int arg, int flags -+#define VT_FUNC_ARGS pScrn->scrnIndex, 0 -+ -+#define XF86_SCRN_ARG(x) ((x)->scrnIndex) -+#else -+#define SCRN_ARG_TYPE ScrnInfoPtr -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) -+ -+#define SCREEN_ARG_TYPE ScreenPtr -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) -+ -+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y -+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y -+ -+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode -+#define SWITCH_MODE_ARGS(arg, m) arg, m -+ -+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg -+ -+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg -+#define VT_FUNC_ARGS pScrn -+ -+#define XF86_SCRN_ARG(x) (x) -+ -+#endif -+ -+#endif -diff --git a/src/vmware.c b/src/vmware.c -index e3892f1..41201f1 100644 ---- a/src/vmware.c -+++ b/src/vmware.c -@@ -901,8 +901,8 @@ VMWAREModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool rebuildPixmap) - pScrn->pScreen->rootDepth), - (pointer)(pVMWARE->FbBase + pScrn->fbOffset)); - -- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, FALSE); -- (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, TRUE); -+ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), FALSE); -+ (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), TRUE); - } - - vgaHWProtect(pScrn, FALSE); -@@ -1018,7 +1018,7 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE) - } - - static void --VMWAREAdjustFrame(int scrnIndex, int x, int y, int flags) -+VMWAREAdjustFrame(ADJUST_FRAME_ARGS_DECL) - { - /* FIXME */ - } -@@ -1089,9 +1089,9 @@ VMWAREStopFIFO(ScrnInfoPtr pScrn) - } - - static Bool --VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen) -+VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - ScreenPtr save = &pVMWARE->ScrnFuncs; - -@@ -1119,7 +1119,7 @@ VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen) - pScrn->DriverFunc = NULL; - #endif - -- return (*pScreen->CloseScreen)(scrnIndex, pScreen); -+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); - } - - static Bool -@@ -1296,16 +1296,14 @@ vmwareIsRegionEqual(const RegionPtr reg1, - } - - static Bool --VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+VMWAREScreenInit(SCREEN_INIT_ARGS_DECL) - { -- ScrnInfoPtr pScrn; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - vgaHWPtr hwp; - VMWAREPtr pVMWARE; - OptionInfoPtr options; - Bool useXinerama = TRUE; - -- /* Get the ScrnInfoRec */ -- pScrn = xf86Screens[pScreen->myNum]; - pVMWARE = VMWAREPTR(pScrn); - - -@@ -1381,7 +1379,7 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - VMWAREModeInit(pScrn, pScrn->currentMode, FALSE); - - /* Set the viewport if supported */ -- VMWAREAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); -+ VMWAREAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); - - /* - * Setup the screen's visuals, and initialise the framebuffer -@@ -1582,10 +1580,9 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - - static Bool --VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags) -- -+VMWARESwitchMode(SWITCH_MODE_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - ScreenPtr pScreen = pScrn->pScreen; - - pScreen->mmWidth = (pScreen->width * VMWARE_INCHTOMM + -@@ -1597,9 +1594,9 @@ VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags) - } - - static Bool --VMWAREEnterVT(int scrnIndex, int flags) -+VMWAREEnterVT(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - - /* -@@ -1616,9 +1613,9 @@ VMWAREEnterVT(int scrnIndex, int flags) - } - - static void --VMWARELeaveVT(int scrnIndex, int flags) -+VMWARELeaveVT(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - VMWAREPtr pVMWARE = VMWAREPTR(pScrn); - - /* -@@ -1631,17 +1628,18 @@ VMWARELeaveVT(int scrnIndex, int flags) - } - - static void --VMWAREFreeScreen(int scrnIndex, int flags) -+VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL) - { -+ SCRN_INFO_PTR(arg); - /* - * If the vgahw module is used vgaHWFreeHWRec() would be called - * here. - */ -- VMWAREFreeRec(xf86Screens[scrnIndex]); -+ VMWAREFreeRec(pScrn); - } - - static ModeStatus --VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) -+VMWAREValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) - { - return MODE_OK; - } -diff --git a/src/vmware.h b/src/vmware.h -index 458390a..4818e16 100644 ---- a/src/vmware.h -+++ b/src/vmware.h -@@ -177,7 +177,7 @@ typedef struct { - #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate)) - - static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) { -- return xf86Screens[s->myNum]; -+ return xf86ScreenToScrn(s); - } - - #define MIN(a,b) ((a)<(b)?(a):(b)) -diff --git a/src/vmware_common.h b/src/vmware_common.h -index 9cd7194..5629c10 100644 ---- a/src/vmware_common.h -+++ b/src/vmware_common.h -@@ -32,6 +32,8 @@ - #include - #include - -+#include "compat-api.h" -+ - xXineramaScreenInfo * - VMWAREParseTopologyString(ScrnInfoPtr pScrn, - const char *topology, -diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c -index 1b82ac4..7de0772 100644 ---- a/vmwgfx/vmwgfx_dri2.c -+++ b/vmwgfx/vmwgfx_dri2.c -@@ -83,7 +83,7 @@ static Bool - dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int format) - { - ScreenPtr pScreen = pDraw->pScreen; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - BufferPrivatePtr private = buffer->driverPrivate; - PixmapPtr pPixmap; -@@ -371,7 +371,7 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion, - Bool - xorg_dri2_init(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - DRI2InfoRec dri2info; - int major, minor; -diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c -index ed1eb8c..9959ffb 100644 ---- a/vmwgfx/vmwgfx_driver.c -+++ b/vmwgfx/vmwgfx_driver.c -@@ -107,14 +107,13 @@ typedef uint8_t uint8; - */ - - static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags); --static Bool drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, -- char **argv); --static Bool drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags); --static void drv_adjust_frame(int scrnIndex, int x, int y, int flags); --static Bool drv_enter_vt(int scrnIndex, int flags); --static void drv_leave_vt(int scrnIndex, int flags); --static void drv_free_screen(int scrnIndex, int flags); --static ModeStatus drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, -+static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL); -+static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL); -+static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL); -+static Bool drv_enter_vt(VT_FUNC_ARGS_DECL); -+static void drv_leave_vt(VT_FUNC_ARGS_DECL); -+static void drv_free_screen(FREE_SCREEN_ARGS_DECL); -+static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, - int flags); - - extern void xorg_tracker_set_functions(ScrnInfoPtr scrn); -@@ -133,7 +132,7 @@ vmwgfx_hookup(ScrnInfoPtr pScrn) - * Internal function definitions - */ - --static Bool drv_close_screen(int scrnIndex, ScreenPtr pScreen); -+static Bool drv_close_screen(CLOSE_SCREEN_ARGS_DECL); - - /* - * Internal functions -@@ -633,7 +632,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd, - - void xorg_flush(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); - PixmapPtr pixmap = NULL; -@@ -708,14 +707,13 @@ void xorg_flush(ScreenPtr pScreen) - free(pixmaps); - } - --static void drv_block_handler(int i, pointer blockData, pointer pTimeout, -- pointer pReadmask) -+static void drv_block_handler(BLOCKHANDLER_ARGS_DECL) - { -- ScreenPtr pScreen = screenInfo.screens[i]; -- modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]); -+ SCREEN_PTR(arg); -+ modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen)); - - vmwgfx_swap(ms, pScreen, BlockHandler); -- pScreen->BlockHandler(i, blockData, pTimeout, pReadmask); -+ pScreen->BlockHandler(BLOCKHANDLER_ARGS); - vmwgfx_swap(ms, pScreen, BlockHandler); - - vmwgfx_flush_dri2(pScreen); -@@ -725,7 +723,7 @@ static void drv_block_handler(int i, pointer blockData, pointer pTimeout, - static Bool - drv_create_screen_resources(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - Bool ret; - -@@ -735,9 +733,9 @@ drv_create_screen_resources(ScreenPtr pScreen) - if (!ret) - return ret; - -- drv_adjust_frame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); -+ drv_adjust_frame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0)); - -- return drv_enter_vt(pScreen->myNum, 1); -+ return drv_enter_vt(VT_FUNC_ARGS); - } - - static Bool -@@ -773,7 +771,7 @@ drv_set_master(ScrnInfoPtr pScrn) - static Bool - vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor) - { -- ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; - modesettingPtr ms = modesettingPTR(pScrn); -@@ -804,7 +802,7 @@ vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor) - static Bool - vmwgfx_use_hw_cursor(ScreenPtr screen, CursorPtr cursor) - { -- ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; - modesettingPtr ms = modesettingPTR(pScrn); -@@ -902,9 +900,9 @@ static void drv_load_palette(ScrnInfoPtr pScrn, int numColors, - - - static Bool --drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+drv_screen_init(SCREEN_INIT_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - VisualPtr visual; - -@@ -1088,9 +1086,9 @@ drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - - static void --drv_adjust_frame(int scrnIndex, int x, int y, int flags) -+drv_adjust_frame(ADJUST_FRAME_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); - xf86OutputPtr output = config->output[config->compat_output]; - xf86CrtcPtr crtc = output->crtc; -@@ -1104,15 +1102,16 @@ drv_adjust_frame(int scrnIndex, int x, int y, int flags) - } - - static void --drv_free_screen(int scrnIndex, int flags) -+drv_free_screen(FREE_SCREEN_ARGS_DECL) - { -- drv_free_rec(xf86Screens[scrnIndex]); -+ SCRN_INFO_PTR(arg); -+ drv_free_rec(pScrn); - } - - static void --drv_leave_vt(int scrnIndex, int flags) -+drv_leave_vt(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - modesettingPtr ms = modesettingPTR(pScrn); - - vmwgfx_cursor_bypass(ms->fd, 0, 0); -@@ -1130,9 +1129,9 @@ drv_leave_vt(int scrnIndex, int flags) - * This gets called when gaining control of the VT, and from ScreenInit(). - */ - static Bool --drv_enter_vt(int scrnIndex, int flags) -+drv_enter_vt(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - - if (!drv_set_master(pScrn)) - return FALSE; -@@ -1144,17 +1143,17 @@ drv_enter_vt(int scrnIndex, int flags) - } - - static Bool --drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags) -+drv_switch_mode(SWITCH_MODE_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - - return xf86SetSingleMode(pScrn, mode, RR_Rotate_0); - } - - static Bool --drv_close_screen(int scrnIndex, ScreenPtr pScreen) -+drv_close_screen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - - if (ms->cursor) { -@@ -1166,7 +1165,7 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen) - xorg_dri2_close(pScreen); - - if (pScrn->vtSema) -- pScrn->LeaveVT(scrnIndex, 0); -+ pScrn->LeaveVT(VT_FUNC_ARGS); - - pScrn->vtSema = FALSE; - -@@ -1180,11 +1179,11 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen) - if (ms->xat) - xa_tracker_destroy(ms->xat); - -- return (*pScreen->CloseScreen) (scrnIndex, pScreen); -+ return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS); - } - - static ModeStatus --drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) -+drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) - { - return MODE_OK; - } -diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h -index 4fcfed6..f78a85f 100644 ---- a/vmwgfx/vmwgfx_driver.h -+++ b/vmwgfx/vmwgfx_driver.h -@@ -46,6 +46,7 @@ - #include - #include - -+#include "../src/compat-api.h" - #ifdef DRI2 - #include - #if (!defined(DRI2INFOREC_VERSION) || (DRI2INFOREC_VERSION < 3)) -@@ -118,9 +119,9 @@ typedef struct _modesettingRec - ScreenBlockHandlerProcPtr saved_BlockHandler; - CreateScreenResourcesProcPtr saved_CreateScreenResources; - CloseScreenProcPtr saved_CloseScreen; -- Bool (*saved_EnterVT)(int, int); -- void (*saved_LeaveVT)(int, int); -- void (*saved_AdjustFrame)(int, int, int, int); -+ Bool (*saved_EnterVT)(VT_FUNC_ARGS_DECL); -+ void (*saved_LeaveVT)(VT_FUNC_ARGS_DECL); -+ void (*saved_AdjustFrame)(ADJUST_FRAME_ARGS_DECL); - Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr); - Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr); - -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index 469598a..63df3a1 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -460,7 +460,7 @@ vmwgfx_flush_dri2(ScreenPtr pScreen) - struct vmwgfx_saa *vsaa = - to_vmwgfx_saa(saa_get_driver(pScreen)); - struct _WsbmListHead *list, *next; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - - if (!pScrn->vtSema) - return; -@@ -1199,7 +1199,7 @@ vmwgfx_operation_complete(struct saa_driver *driver, - struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver); - struct saa_pixmap *spix = saa_get_saa_pixmap(pixmap); - struct vmwgfx_saa_pixmap *vpix = to_vmwgfx_saa_pixmap(spix); -- ScrnInfoPtr pScrn = xf86Screens[vsaa->pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(vsaa->pScreen); - - /* - * Make dri2 drawables up to date, or add them to the flush list -diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c -index af53379..449266b 100644 ---- a/vmwgfx/vmwgfx_tex_video.c -+++ b/vmwgfx/vmwgfx_tex_video.c -@@ -638,7 +638,7 @@ put_image(ScrnInfoPtr pScrn, - DrawablePtr pDraw) - { - struct xorg_xv_port_priv *pPriv = (struct xorg_xv_port_priv *) data; -- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; -+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn); - PixmapPtr pPixmap; - INT32 x1, x2, y1, y2; - BoxRec dstBox; -@@ -732,7 +732,7 @@ vmwgfx_free_textured_adaptor(XF86VideoAdaptorPtr adaptor, Bool free_ports) - static XF86VideoAdaptorPtr - xorg_setup_textured_adapter(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - XF86VideoAdaptorPtr adapt; - XF86AttributePtr attrs; -@@ -799,7 +799,7 @@ xorg_setup_textured_adapter(ScreenPtr pScreen) - void - xorg_xv_init(ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - modesettingPtr ms = modesettingPTR(pScrn); - XF86VideoAdaptorPtr *adaptors, *new_adaptors = NULL; - XF86VideoAdaptorPtr textured_adapter = NULL, overlay_adaptor = NULL; --- -1.7.9.5 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb deleted file mode 100644 index 707d3b8a87..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-driver-video.inc - -SUMMARY = "X.Org X server -- VMware SVGA display driver" - -DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards." - -LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" - -DEPENDS += "virtual/libx11 libxvmc drm glproto \ - virtual/libgl xineramaproto libpciaccess" - -PR = "${INC_PR}.1" - -SRC_URI += "file://vmware-port-vmware-driver-to-new-compat-API.patch" -SRC_URI[md5sum] = "0743ec7c479603fba60d118858fd5783" -SRC_URI[sha256sum] = "c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147" - -COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb new file mode 100644 index 0000000000..4399bb1ec7 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.0.bb @@ -0,0 +1,17 @@ +require xorg-driver-video.inc + +SUMMARY = "X.Org X server -- VMware SVGA display driver" + +DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards." + +LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" + +DEPENDS += "virtual/libx11 libxvmc drm glproto \ + virtual/libgl xineramaproto libpciaccess" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "b72be57517cbc7a56362f2ee0f092269" +SRC_URI[sha256sum] = "44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6" + +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' -- cgit v1.2.3-54-g00ecf