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

iris: make resources take a ref on the screen object 

Because St creates resources from a screen and attach them onto
another we need to ensure the resources associated to a screen &
bufmgr stay around until we don't need them anymore.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: <mesa-stable@lists.freedesktop.org>
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1373
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4086>
This commit is contained in:
Lionel Landwerlin 2020-03-06 15:58:37 +02:00
parent 7557f16059
commit 0a497eb130
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/iris/iris_resource.c
View File

@ -340,6 +340,8 @@ iris_resource_destroy(struct pipe_screen *screen,
iris_resource_disable_aux(res);
iris_bo_unreference(res->bo);
iris_pscreen_unref(res->base.screen);
free(res);
}
@ -352,7 +354,7 @@ iris_alloc_resource(struct pipe_screen *pscreen,
return NULL;
res->base = *templ;
res->base.screen = pscreen;
res->base.screen = iris_pscreen_ref(pscreen);
pipe_reference_init(&res->base.reference, 1);
res->aux.possible_usages = 1 << ISL_AUX_USAGE_NONE;

17
src/gallium/drivers/iris/iris_screen.c
View File

@ -521,17 +521,22 @@ iris_get_timestamp(struct pipe_screen *pscreen)
return result;
}
static void
iris_destroy_screen(struct pipe_screen *pscreen)
void
iris_screen_destroy(struct iris_screen *screen)
{
struct iris_screen *screen = (struct iris_screen *) pscreen;
iris_bo_unreference(screen->workaround_bo);
u_transfer_helper_destroy(pscreen->transfer_helper);
u_transfer_helper_destroy(screen->base.transfer_helper);
iris_bufmgr_unref(screen->bufmgr);
disk_cache_destroy(screen->disk_cache);
ralloc_free(screen);
}
static void
iris_screen_unref(struct pipe_screen *pscreen)
{
iris_pscreen_unref(pscreen);
}
static void
iris_query_memory_info(struct pipe_screen *pscreen,
struct pipe_memory_info *info)
@ -639,6 +644,8 @@ iris_screen_create(int fd, const struct pipe_screen_config *config)
screen->pci_id = screen->devinfo.chipset_id;
screen->no_hw = screen->devinfo.no_hw;
p_atomic_set(&screen->refcount, 1);
if (screen->devinfo.gen < 8 || screen->devinfo.is_cherryview)
return NULL;
@ -705,7 +712,7 @@ iris_screen_create(int fd, const struct pipe_screen_config *config)
iris_init_screen_fence_functions(pscreen);
iris_init_screen_resource_functions(pscreen);
pscreen->destroy = iris_destroy_screen;
pscreen->destroy = iris_screen_unref;
pscreen->get_name = iris_get_name;
pscreen->get_vendor = iris_get_vendor;
pscreen->get_device_vendor = iris_get_device_vendor;

22
src/gallium/drivers/iris/iris_screen.h
View File

@ -46,6 +46,8 @@ struct gen_l3_config;
struct iris_screen {
struct pipe_screen base;
uint32_t refcount;
/** Global slab allocator for iris_transfer_map objects */
struct slab_parent_pool transfer_pool;
@ -96,6 +98,26 @@ struct iris_screen {
struct pipe_screen *
iris_screen_create(int fd, const struct pipe_screen_config *config);
void iris_screen_destroy(struct iris_screen *screen);
UNUSED static inline struct pipe_screen *
iris_pscreen_ref(struct pipe_screen *pscreen)
{
struct iris_screen *screen = (struct iris_screen *) pscreen;
p_atomic_inc(&screen->refcount);
return pscreen;
}
UNUSED static inline void
iris_pscreen_unref(struct pipe_screen *pscreen)
{
struct iris_screen *screen = (struct iris_screen *) pscreen;
if (p_atomic_dec_zero(&screen->refcount))
iris_screen_destroy(screen);
}
bool
iris_is_format_supported(struct pipe_screen *pscreen,
enum pipe_format format,