[PATCH] radeon/radeon_platform_probe: fix Zaphod mode breakage

Ilija Hadzic ihadzic at research.bell-labs.com
Mon Sep 24 14:41:32 PDT 2012


Using radeon_platform_probe function breaks the Zaphod mode because
it attempts to call xf86AddEntityToScreen multiple times, but nobody
calls xf86SetEntityShared prior to that. Consequently, calls for all
but first device instance fail.

Prior to introduction of platform bus, the logic was that the Probe
function would make the entity sharable, which would cause Xserver
to later make it shared prior to adding it to screen. With the
platform bus loading, add to screen happens in the probe
function so we have to make it shared there.

Signed-off-by: Ilija Hadzic <ihadzic at research.bell-labs.com>
---
 src/radeon_probe.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index b1471af..fef5d81 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -278,6 +278,7 @@ radeon_platform_probe(DriverPtr pDriver,
 	scr_flags = XF86_ALLOCATE_GPU_SCREEN;
 
     pScrn = xf86AllocateScreen(pDriver, scr_flags);
+    xf86SetEntityShared(entity_num);
     xf86AddEntityToScreen(pScrn, entity_num);
 
     if (!radeon_kernel_mode_enabled(pScrn, dev->pdev))
-- 
1.7.12



More information about the xorg-driver-ati mailing list