| Summary: | Non-DRI build broken recently (6.7.99.1). | ||||||
|---|---|---|---|---|---|---|---|
| Product: | xorg | Reporter: | Mike A. Harris <mharris> | ||||
| Component: | Driver/Radeon | Assignee: | Mike Harris <mharris> | ||||
| Status: | RESOLVED DUPLICATE | QA Contact: | |||||
| Severity: | blocker | ||||||
| Priority: | highest | CC: | ajax, mharris | ||||
| Version: | git | ||||||
| Hardware: | All | ||||||
| OS: | Linux (All) | ||||||
| Whiteboard: | |||||||
| i915 platform: | i915 features: | ||||||
| Bug Depends on: | |||||||
| Bug Blocks: | 351 | ||||||
| Attachments: |
|
||||||
Here's the problem:
if (info->accel->NeedToSync) {
info->accel->Sync(pScrn);
if (info->CPStarted)
RADEONInit3DEngineForRender(pScrn);
}
The code above, from R100SetupTextureMMIO() gets called, but the check for
info-CPStarted blows up because CPStarted structure member isn't defined for
the non-DRI case. Then RADEONInit3DEngineForRender(pScrn) is called but only
if CPStarted is set. This is obviously incorrect, since the code in
RADEONInit3DEngineForRender(pScrn) has conditional compilation for both the
DRI and non-DRI cases, and for the DRI case, it already checks internally
if CPStarted has been set or not:
void RADEONInit3DEngineForRender(ScrnInfoPtr pScrn)
{
#ifdef XF86DRI
RADEONInfoPtr info = RADEONPTR (pScrn);
if (info->CPStarted)
RadeonInit3DEngineCP(pScrn);
else
#endif
RadeonInit3DEngineMMIO(pScrn);
}
As such, the if blocks in both R100SetupTextureMMIO() and
R200SetupTextureMMIO() right now which check if CPStarted is set or not, will
result in RADEONInit3DEngineForRender() never being called unless DRI is
enabled, which is obviously wrong.
The correct fix for this problem, is to remove the conditional checks for
CPStarted prior to calling RADEONInit3DEngineForRender(), which will result
in RADEONInit3DEngineForRender() making that decision internally. This should
fix both the compile time problem, and also the runtime problem that would
have occured in the non-DRI case, had the existing code actually compiled
(had CPStarted been a structure member outside of the XF86DRI conditional).
I'll attach a patch to fix this shortly.
Changing Hardware to "All" as this problem isn't PPC specific, just discovered during a PPC non-DRI build. Created attachment 600 [details] [review] xorg-x11-6.8.0-build-fix-for-non-dri-builds.patch Patch to fix the problems outlined above. |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.
On a PPC build with DRI disabled by using "#define BuildXF86DRI NO", the build fails in the Radeon driver with the following: gcc -O2 -pipe -m32 -fsigned-char -fno-strict-aliasing -pipe -fsigned-char -fno-merge-constants -I. -I../../../../../../programs/Xserver/hw/xfree86/common -I../../../../../../programs/Xserver/hw/xfree86/os-support -I../../../../../../programs/Xserver/hw/xfree86 -I../../../../../../programs/Xserver/hw/xfree86/vbe -I../../../../../. ./programs/Xserver/hw/xfree86/int10 -I../../../../../../programs/Xserver/hw/xfree86/ddc -I../../../../../../programs/Xserver/hw/xfree86/i2c -I../../../ ../../../programs/Xserver/hw/xfree86/rac -I../../../../../../programs/Xserver/hw/xfree86/ramdac -I../../../../../../programs/Xserver/hw/xfree86/shadowfb -I../../. ./../../../programs/Xserver/hw/xfree86/xaa -I../../../../../../programs/Xserver/hw/xfree86/xf4bpp -I../../../../../../programs/Xserver/hw/xfree86/xf1bpp -I../../../../../../programs/Xserver/hw/xfree86/vgahw -I../../../../../../programs/Xserver/hw/xfree86/fbdevhw -I../../../../../../programs/Xserver/mfb -I../../. ./../../../programs/Xserver/fb -I../../../../../../programs/Xserver/mi -I../../../../../../programs/Xserver/miext/shadow -I../../../../../../programs/X server/render -I../../../../../../programs/Xserver/Xext -I../../../../../../programs/Xserver/include -I../../../../../../include/fonts -I../../../../../../includ e/extensions -I../../../../../../exports/include/X11 -I../../../../../.. -I../../../../../../exports/include -Dlinux -D__powerpc__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY -DTOGCUP -DXF86BIGFONT -DDPMSExtension -DPIXPRIV -DPANORAMIX -DRENDER -DRANDR -DXFIXES -DDAMAGE -DC OMPOSITE -DXEVIE -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXFreeXDGA -DXvExtension -DXFree86LOADER -DXF ree86Server -DXF86VIDMODE -DXvMCExtension -DSMART_SCHEDULE -DXResExtension -DX_BYTE_ORDER=X_BIG_ENDIAN -DXORG_VERSION_CURRENT="(((6) * 10000000) + ((7) * 100000) + ((99) * 1000) + 1)" -DNDEBUG -DFUNCPROTO=15 -DNARROWPROTO -DIN_MODULE -DXFree86Module -DAVOID_CPIO -DAVOID_NON_PCI -c radeon_accel.c In file included from radeon_accel.c:382: radeon_render.c: In function `R100SetupTextureMMIO': radeon_render.c:438: error: structure has no member named `CPStarted' radeon_render.c: In function `R200SetupTextureMMIO': radeon_render.c:746: error: structure has no member named `CPStarted' make[7]: *** [radeon_accel.o] Error 1 make[7]: Leaving directory `/usr/src/build/435544-ppc/BUILD/xorg-x11-6.7.99.1/xc/programs/Xserver/hw/xfree86/drivers/ati' make[6]: *** [all] Error 2 make[6]: Leaving directory `/usr/src/build/435544-ppc/BUILD/xorg-x11-6.7.99.1/xc/programs/Xserver/hw/xfree86/drivers' make[5]: *** [all] Error 2 make[5]: Leaving directory `/usr/src/build/435544-ppc/BUILD/xorg-x11-6.7.99.1/xc/programs/Xserver/hw/xfree86' make[4]: *** [hw/xfree86] Error 2 make[4]: Leaving directory `/usr/src/build/435544-ppc/BUILD/xorg-x11-6.7.99.1/xc/programs/Xserver' make[3]: *** [all] Error 2 make[3]: Leaving directory `/usr/src/build/435544-ppc/BUILD/xorg-x11-6.7.99.1/xc/programs' make[2]: *** [all] Error 2 make[2]: Leaving directory `/usr/src/build/435544-ppc/BUILD/xorg-x11-6.7.99.1/xc' make[1]: *** [World] Error 2 make[1]: Leaving directory `/usr/src/build/435544-ppc/BUILD/xorg-x11-6.7.99.1/xc' make: *** [World] Error 2 make: Leaving directory `/usr/src/build/435544-ppc/BUILD/xorg-x11-6.7.99.1/xc' error: Bad exit status from /usr/src/build/435544-ppc/install-tmp/rpm-tmp.71867 I haven't investigated the driver source yet, but my initial assumption is that there may have been recent changes commited to the Radeon driver perhaps that aren't properly wrapped in a check to see if DRI is being built in. I'm going to have a look at that right now.