"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "hw/xfree86/drivers/modesetting/driver.c" between
xorg-server-1.20.8.tar.bz2 and xorg-server-1.20.9.tar.bz2

About: The X.Org X Server component of the X Window System architecture.

driver.c  (xorg-server-1.20.8.tar.bz2):driver.c  (xorg-server-1.20.9.tar.bz2)
skipping to change at line 44 skipping to change at line 44
#endif #endif
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#include "compiler.h" #include "compiler.h"
#include "xf86Pci.h" #include "xf86Pci.h"
#include "mipointer.h" #include "mipointer.h"
#include "mipointrst.h"
#include "micmap.h" #include "micmap.h"
#include <X11/extensions/randr.h> #include <X11/extensions/randr.h>
#include "fb.h" #include "fb.h"
#include "edid.h" #include "edid.h"
#include "xf86i2c.h" #include "xf86i2c.h"
#include "xf86Crtc.h" #include "xf86Crtc.h"
#include "miscstruct.h" #include "miscstruct.h"
#include "dixstruct.h" #include "dixstruct.h"
#include "shadow.h" #include "shadow.h"
#include "xf86xv.h" #include "xf86xv.h"
skipping to change at line 1659 skipping to change at line 1660
ms->createScreenResources = pScreen->CreateScreenResources; ms->createScreenResources = pScreen->CreateScreenResources;
pScreen->CreateScreenResources = CreateScreenResources; pScreen->CreateScreenResources = CreateScreenResources;
xf86SetBlackWhitePixels(pScreen); xf86SetBlackWhitePixels(pScreen);
xf86SetBackingStore(pScreen); xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen); xf86SetSilkenMouse(pScreen);
miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
/* If pageflip is enabled hook the screen's cursor-sprite (swcursor) funcs.
* So that we can disabe page-flipping on fallback to a swcursor. */
if (ms->drmmode.pageflip) {
miPointerScreenPtr PointPriv =
dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
if (!dixRegisterScreenPrivateKey(&ms->drmmode.spritePrivateKeyRec,
pScreen, PRIVATE_DEVICE,
sizeof(msSpritePrivRec)))
return FALSE;
ms->SpriteFuncs = PointPriv->spriteFuncs;
PointPriv->spriteFuncs = &drmmode_sprite_funcs;
}
/* Need to extend HWcursor support to handle mask interleave */ /* Need to extend HWcursor support to handle mask interleave */
if (!ms->drmmode.sw_cursor) if (!ms->drmmode.sw_cursor)
xf86_cursors_init(pScreen, ms->cursor_width, ms->cursor_height, xf86_cursors_init(pScreen, ms->cursor_width, ms->cursor_height,
HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 | HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 |
HARDWARE_CURSOR_UPDATE_UNHIDDEN | HARDWARE_CURSOR_UPDATE_UNHIDDEN |
HARDWARE_CURSOR_ARGB); HARDWARE_CURSOR_ARGB);
/* Must force it before EnterVT, so we are in control of VT and /* Must force it before EnterVT, so we are in control of VT and
* later memory should be bound when allocating, e.g rotate_mem */ * later memory should be bound when allocating, e.g rotate_mem */
pScrn->vtSema = TRUE; pScrn->vtSema = TRUE;
skipping to change at line 1855 skipping to change at line 1871
free(ms->drmmode.shadow_fb); free(ms->drmmode.shadow_fb);
ms->drmmode.shadow_fb = NULL; ms->drmmode.shadow_fb = NULL;
free(ms->drmmode.shadow_fb2); free(ms->drmmode.shadow_fb2);
ms->drmmode.shadow_fb2 = NULL; ms->drmmode.shadow_fb2 = NULL;
} }
drmmode_uevent_fini(pScrn, &ms->drmmode); drmmode_uevent_fini(pScrn, &ms->drmmode);
drmmode_free_bos(pScrn, &ms->drmmode); drmmode_free_bos(pScrn, &ms->drmmode);
if (ms->drmmode.pageflip) {
miPointerScreenPtr PointPriv =
dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
if (PointPriv->spriteFuncs == &drmmode_sprite_funcs)
PointPriv->spriteFuncs = ms->SpriteFuncs;
}
if (pScrn->vtSema) { if (pScrn->vtSema) {
LeaveVT(pScrn); LeaveVT(pScrn);
} }
pScreen->CreateScreenResources = ms->createScreenResources; pScreen->CreateScreenResources = ms->createScreenResources;
pScreen->BlockHandler = ms->BlockHandler; pScreen->BlockHandler = ms->BlockHandler;
pScrn->vtSema = FALSE; pScrn->vtSema = FALSE;
pScreen->CloseScreen = ms->CloseScreen; pScreen->CloseScreen = ms->CloseScreen;
return (*pScreen->CloseScreen) (pScreen); return (*pScreen->CloseScreen) (pScreen);
 End of changes. 3 change blocks. 
0 lines changed or deleted 24 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)