st/xorg: Fix compilation for Xservers >= 1.10
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
This commit is contained in:
parent
543136d5bd
commit
9e96b695b0
|
@ -45,6 +45,7 @@
|
|||
#include "miscstruct.h"
|
||||
#include "dixstruct.h"
|
||||
#include "xf86xv.h"
|
||||
#include "xorgVersion.h"
|
||||
#ifndef XSERVER_LIBPCIACCESS
|
||||
#error "libpciaccess needed"
|
||||
#endif
|
||||
|
@ -1182,6 +1183,8 @@ drv_bind_front_buffer_kms(ScrnInfoPtr pScrn)
|
|||
stride,
|
||||
ptr);
|
||||
|
||||
#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
|
||||
|
||||
/* This a hack to work around EnableDisableFBAccess setting the pointer
|
||||
* the real fix would be to replace pScrn->EnableDisableFBAccess hook
|
||||
* and set the rootPixmap->devPrivate.ptr to something valid before that.
|
||||
|
@ -1191,6 +1194,8 @@ drv_bind_front_buffer_kms(ScrnInfoPtr pScrn)
|
|||
*/
|
||||
pScrn->pixmapPrivate.ptr = ptr;
|
||||
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
|
||||
err_destroy:
|
||||
|
|
Loading…
Reference in New Issue