summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlija Hadzic <ihadzic@research.bell-labs.com>2012-09-24 17:41:32 -0400
committerAlex Deucher <alexdeucher@gmail.com>2012-11-01 11:44:45 -0400
commit39eac3104c2f08b4d78aab3f88fd104301eb4711 (patch)
treead2262346f30d81571719dfaa8a871190c750a7a
parent2e96aa641bc8a5c263a5b643961383cdf530d044 (diff)
radeon/radeon_platform_probe: fix Zaphod mode breakage
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@research.bell-labs.com>
-rw-r--r--src/radeon_probe.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index b1471af0..fef5d817 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))