summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2012-11-02 03:57:42 +0000
committerBen Skeggs <bskeggs@redhat.com>2012-11-05 19:19:48 +1000
commit27a1a0616304e9b9f0ae842899b7d614f1026578 (patch)
treed315c992a14619eb981214256855d4a3988a8732
parente34cfbd5bd23f7f15372af52d8a39a5715ce7310 (diff)
nouveau: NVPlatformProbe, handle shareable entities
During NVPciProbe, xf86ConfigPciEntity() implicitly calls checks and sets the entity as shared Here we are only allocating the screen, thus need to explicitly call the functions ZaphodHead and Xinerama should finally work Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56347 Reported-By: Vladimir Chebotarev <exc@rbcmail.ru> Reported-By: Damian Nowak <nowaker@geozone.pl> Tested-By: Damian Nowak <nowaker@geozone.pl> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--src/nv_driver.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c
index f184cd4..ea4a018 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -353,6 +353,11 @@ NVPlatformProbe(DriverPtr driver,
scr_flags = XF86_ALLOCATE_GPU_SCREEN;
scrn = xf86AllocateScreen(driver, scr_flags);
+ if (!scrn)
+ return FALSE;
+
+ if (xf86IsEntitySharable(entity_num))
+ xf86SetEntityShared(entity_num);
xf86AddEntityToScreen(scrn, entity_num);
NVInitScrn(scrn, entity_num);