[Mesa-dev] [PATCH] st/mesa: fix reference counting bug in st_vdpau

[Leo Liu]

I have tested the leak is fixed by this patch.
And have a look again, the leak actually happens in the case of 
st_vdpau_output_surface_dma_buf.

Sorry for the noise.

The patch is
Tested-and-Reviewed by: Leo Liu <leo.liu at amd.com>

Regards,
Leo


On 07/13/2016 10:08 AM, Leo Liu wrote:
>
>
> On 07/13/2016 08:56 AM, Christian König wrote:
>> From: Christian König <christian.koenig at amd.com>
>>
>> Otherwise we leak the resources created for the DMA-buf descriptors.
>>
>> Signed-off-by: Christian König <christian.koenig at amd.com>
>> Cc: 12.0 <mesa-stable at lists.freedesktop.org>
>> ---
>>   src/mesa/state_tracker/st_vdpau.c | 10 ++++++++--
>>   1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/mesa/state_tracker/st_vdpau.c 
>> b/src/mesa/state_tracker/st_vdpau.c
>> index dffa52f..4f599dd 100644
>> --- a/src/mesa/state_tracker/st_vdpau.c
>> +++ b/src/mesa/state_tracker/st_vdpau.c
>> @@ -65,6 +65,7 @@ st_vdpau_video_surface_gallium(struct gl_context 
>> *ctx, const void *vdpSurface,
>>        struct pipe_video_buffer *buffer;
>>      struct pipe_sampler_view **samplers;
>> +   struct pipe_resource *res = NULL;
>>        getProcAddr = (void *)ctx->vdpGetProcAddress;
>>      if (getProcAddr(device, VDP_FUNC_ID_VIDEO_SURFACE_GALLIUM, 
>> (void**)&f))
>> @@ -82,7 +83,8 @@ st_vdpau_video_surface_gallium(struct gl_context 
>> *ctx, const void *vdpSurface,
>>      if (!sv)
>>         return NULL;
>>   -   return sv->texture;
>> +   pipe_resource_reference(&res, sv->texture);
>> +   return res;
>>   }
>>     static struct pipe_resource *
>> @@ -90,13 +92,15 @@ st_vdpau_output_surface_gallium(struct gl_context 
>> *ctx, const void *vdpSurface)
>>   {
>>      int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
>>      uint32_t device = (uintptr_t)ctx->vdpDevice;
>> +   struct pipe_resource *res = NULL;
>>      VdpOutputSurfaceGallium *f;
>>        getProcAddr = (void *)ctx->vdpGetProcAddress;
>>      if (getProcAddr(device, VDP_FUNC_ID_OUTPUT_SURFACE_GALLIUM, 
>> (void**)&f))
>>         return NULL;
>>   -   return f((uintptr_t)vdpSurface);
>> +   pipe_resource_reference(&res, f((uintptr_t)vdpSurface));
>> +   return res;
>>   }
>>     static struct pipe_resource *
>> @@ -208,6 +212,7 @@ st_vdpau_map_surface(struct gl_context *ctx, 
>> GLenum target, GLenum access,
>>      /* do we have different screen objects ? */
>>      if (res->screen != st->pipe->screen) {
>>         _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
>> +      pipe_resource_reference(&res, NULL);
>>         return;
>>      }
>>   @@ -241,6 +246,7 @@ st_vdpau_map_surface(struct gl_context *ctx, 
>> GLenum target, GLenum access,
>>      stObj->surface_format = res->format;
>>        _mesa_dirty_texobj(ctx, texObj);
>> +   pipe_resource_reference(&res, NULL);
>
> Will this be with problem when same surface map again?
> Also will the leak happen for the case of 
> st_vdpau_output_surface_dma_buf?
>
> Thanks,
> Leo
>
>>   }
>>     static void
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev