From f0d0d75bfe62553dde353f89e46ff13dd863fbe8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 9 Jan 2013 12:51:55 +1000 Subject: dix/gpu: remove asserts for output/offload from same slave 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). Reviewed-by: Keith Packard Signed-off-by: Dave Airlie --- dix/dispatch.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dix/dispatch.c b/dix/dispatch.c index 8d6173525..90b6c7c00 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; } -- cgit v1.2.3