瀏覽代碼

nv30: avoid setting user_priv without setting cur_ctx

The whole user_priv thing is a mess, but as long as it's there, it
basically has to map 1:1 to the cur_ctx. Unfortunately we were setting
user_priv to some context, then that context could get deleted without
any draws/validations in it, leading user_priv to become NULL, with
cur_ctx still pointing at some old context. Then we wouldn't run the
switch logic, which in turn led to a NULL bufctx being dereferenced.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102349
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
tags/19.0-branchpoint
Ilia Mirkin 6 年之前
父節點
當前提交
ef3eac9545
共有 1 個文件被更改,包括 1 次插入3 次删除
  1. 1
    3
      src/gallium/drivers/nouveau/nv30/nv30_context.c

+ 1
- 3
src/gallium/drivers/nouveau/nv30/nv30_context.c 查看文件

@@ -221,9 +221,7 @@ nv30_context_create(struct pipe_screen *pscreen, void *priv, unsigned ctxflags)
/*XXX: *cough* per-context pushbufs */
push = screen->base.pushbuf;
nv30->base.pushbuf = push;
nv30->base.pushbuf->user_priv = &nv30->bufctx; /* hack at validate time */
nv30->base.pushbuf->rsvd_kick = 16; /* hack in screen before first space */
nv30->base.pushbuf->kick_notify = nv30_context_kick_notify;
push->kick_notify = nv30_context_kick_notify;

nv30->base.invalidate_resource_storage = nv30_invalidate_resource_storage;


Loading…
取消
儲存