KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno: ctx should hold ref to dev 

The ctx should hold ref to dev to avoid problems if screen is destroyed
before ctx.  Doesn't really fix the egl/glx issues, but at least it
prevents things from getting much worse.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
This commit is contained in:
Rob Clark 2014-01-11 10:34:36 -05:00
parent 303df12db8
commit 4971628bae
7 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/freedreno/a2xx/fd2_context.c
View File

@ -98,6 +98,8 @@ fd2_context_create(struct pipe_screen *pscreen, void *priv)
pctx = &fd2_ctx->base.base;
fd2_ctx->base.dev = fd_device_ref(screen->dev);
pctx->destroy = fd2_context_destroy;
pctx->create_blend_state = fd2_blend_state_create;
pctx->create_rasterizer_state = fd2_rasterizer_state_create;

1
src/gallium/drivers/freedreno/a3xx/fd3_context.c
View File

@ -105,6 +105,7 @@ fd3_context_create(struct pipe_screen *pscreen, void *priv)
pctx = &fd3_ctx->base.base;
fd3_ctx->base.dev = fd_device_ref(screen->dev);
fd3_ctx->base.screen = fd_screen(pscreen);
pctx->destroy = fd3_context_destroy;

2
src/gallium/drivers/freedreno/a3xx/fd3_gmem.c
View File

@ -609,7 +609,7 @@ update_vsc_pipe(struct fd_context *ctx)
struct fd_vsc_pipe *pipe = &ctx->pipe[i];
if (!pipe->bo) {
pipe->bo = fd_bo_new(ctx->screen->dev, 0x40000,
pipe->bo = fd_bo_new(ctx->dev, 0x40000,
DRM_FREEDRENO_GEM_TYPE_KMEM);
}

2
src/gallium/drivers/freedreno/a3xx/fd3_program.c
View File

@ -57,7 +57,7 @@ assemble_shader(struct pipe_context *pctx, struct fd3_shader_stateobj *so)
bin = ir3_shader_assemble(so->ir, &so->info);
sz = so->info.sizedwords * 4;
so->bo = fd_bo_new(ctx->screen->dev, sz,
so->bo = fd_bo_new(ctx->dev, sz,
DRM_FREEDRENO_GEM_CACHE_WCOMBINE |
DRM_FREEDRENO_GEM_TYPE_KMEM);

2
src/gallium/drivers/freedreno/freedreno_context.c
View File

@ -168,6 +168,8 @@ fd_context_destroy(struct pipe_context *pctx)
fd_bo_del(pipe->bo);
}
fd_device_del(ctx->dev);
FREE(ctx);
}

1
src/gallium/drivers/freedreno/freedreno_context.h
View File

@ -85,6 +85,7 @@ struct fd_vertex_stateobj {
struct fd_context {
struct pipe_context base;
struct fd_device *dev;
struct fd_screen *screen;
struct blitter_context *blitter;
struct primconvert_context *primconvert;

2
src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c
View File

@ -11,7 +11,7 @@
struct pipe_screen *
fd_drm_screen_create(int fd)
{
struct fd_device *dev = fd_device_new(fd);
struct fd_device *dev = fd_device_new_dup(fd);
if (!dev)
return NULL;
return fd_screen_create(dev);