diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-09-19 09:34:32 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-09-19 09:34:32 +0100 |
| commit | b45dbdbd446108745b39b305303b457f5e876989 (patch) | |
| tree | 88fdbf95068f0457e30fae47b773025afd703fd7 | |
| parent | 15c5ff12459a034b552c787047d1af6d61047cd6 (diff) | |
sna: Update sanity check for next stage of Xorg ABI
Now X will set the scrn->screen backpointer before Init, update our
assertion to track.
Reported-by: Nick Sarnie <commendsarnex@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97855
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_driver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 841ccd11..57562b2c 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -1105,7 +1105,8 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL) DBG(("%s\n", __FUNCTION__)); assert(sna->scrn == scrn); - assert(to_screen_from_sna(sna) == NULL); /* set afterwards */ + assert(to_screen_from_sna(sna) == NULL || /* set afterwards */ + to_screen_from_sna(sna) == screen); assert(sna->freed_pixmap == NULL); |