diff options
author | Dave Airlie <airlied@redhat.com> | 2013-01-09 12:51:55 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-04-30 10:10:14 +1000 |
commit | f0d0d75bfe62553dde353f89e46ff13dd863fbe8 (patch) | |
tree | 08ab306f968148343f6a61498db5b177bbae21fc /dix | |
parent | 9d26e8eaf5a2d7c3e65670ac20254c60f665c463 (diff) |
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 <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'dix')
-rw-r--r-- | dix/dispatch.c | 2 |
1 files changed, 0 insertions, 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; } |