summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-01-09 12:51:55 +1000
committerDave Airlie <airlied@redhat.com>2013-07-12 11:22:09 +1000
commit803d0ac49900903915f1dcd2496f085e5c1afa22 (patch)
treef1e6468723cae26d1e60e7c068495e7e68f22883
parent3608d9f3dd6ae1d23e23294e9a56cb8158e65d19 (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> (cherry picked from commit f0d0d75bfe62553dde353f89e46ff13dd863fbe8)
-rw-r--r--dix/dispatch.c2
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;
}