[PATCH 1/4] dix/gpu: remove asserts for output/offload from same slave

Dave Airlie airlied at gmail.com
Mon Jan 7 17:31:53 PST 2013


From: Dave Airlie <airlied at redhat.com>

We should have no problem allowing output/offload from the same slave,
I asserted here, but in order to implement reverse optimus this makes
perfect sense. (reverse optimus is intel outputting to nvidia).

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 dix/dispatch.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 8d61735..90b6c7c 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3942,7 +3942,6 @@ void
 AttachOutputGPU(ScreenPtr pScreen, ScreenPtr new)
 {
     assert(new->isGPU);
-    assert(!new->current_master);
     xorg_list_add(&new->output_head, &pScreen->output_slave_list);
     new->current_master = pScreen;
 }
@@ -3959,7 +3958,6 @@ void
 AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr new)
 {
     assert(new->isGPU);
-    assert(!new->current_master);
     xorg_list_add(&new->offload_head, &pScreen->offload_slave_list);
     new->current_master = pScreen;
 }
-- 
1.8.1



More information about the xorg-devel mailing list