[PATCH vmware] Build fix for ABI version 12
Jeremy Huddleston
jeremyhu at apple.com
Fri Oct 7 13:31:13 PDT 2011
On Oct 7, 2011, at 1:22 PM, Thomas Hellstrom wrote:
> On 10/07/2011 10:19 PM, Jeremy Huddleston wrote:
>> This results in the vmware driver assuming there is only one PCI domain,
>> which I think is true for everywhere this is expected to run anyway.
>>
>> Signed-off-by: Jeremy Huddleston<jeremyhu at apple.com>
>> ---
>> This gets vmware building with my recent bus changes, but I haven't tested it.
>>
>> I'm not sure what BUILD_FOR_420 is. Is that to disable that code when building for XFree86-4.2 and prior?
>>
>> src/vmware.c | 2 ++
>> 1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/src/vmware.c b/src/vmware.c
>> index 1be0990..55bde22 100644
>> --- a/src/vmware.c
>> +++ b/src/vmware.c
>> @@ -612,9 +612,11 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
>> uint32 width = 0, height = 0;
>> Bool defaultMode;
>>
>> +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION)< 12
>> #ifndef BUILD_FOR_420
>> domainIOBase = pScrn->domainIOBase;
>> #endif
>> +#endif
>>
>> if (flags& PROBE_DETECT) {
>> return FALSE;
>>
>
> To be honest, I'm not sure myself. I'll look into it.
> Thanks for the patch. It might take a while before I push it. Need to get latest Xserver building first to check.
>
> /Thomas
The changes relevant for this are not yet on master. They're in my RFC and will be in a pull request soon. You can grab them here for testing:
git://people.freedesktop.org/~jeremyhu/xserver master
More information about the xorg-devel
mailing list