Mesa (master): gallium/winsys/kms: Fix double refcount when importing from prime FD (v2)

Emil Velikov evelikov at kemper.freedesktop.org
Wed Aug 24 13:39:39 UTC 2016


Module: Mesa
Branch: master
Commit: 0aa6a818ef60e01f304987fe07ac1370d68d38b1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0aa6a818ef60e01f304987fe07ac1370d68d38b1

Author: Tomasz Figa <tfiga at chromium.org>
Date:   Tue Aug  2 19:46:25 2016 +0900

gallium/winsys/kms: Fix double refcount when importing from prime FD (v2)

Currently the code creates a display target struct with refcount field
initialized to 1 and then the caller again increments it, leading to
a leaked reference. Let's remove the unnecessary increment.

v2: Split from one big patch into four fixing one thing at a time.

Signed-off-by: Tomasz Figa <tfiga at chromium.org>
CC: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Hans de Goede <hdegoede at redhat.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
index 21ac0d7..0585fcc 100644
--- a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
@@ -276,7 +276,6 @@ kms_sw_displaytarget_from_handle(struct sw_winsys *ws,
    case DRM_API_HANDLE_TYPE_FD:
       kms_sw_dt = kms_sw_displaytarget_add_from_prime(kms_sw, whandle->handle);
       if (kms_sw_dt) {
-         kms_sw_dt->ref_count++;
          kms_sw_dt->width = templ->width0;
          kms_sw_dt->height = templ->height0;
          kms_sw_dt->stride = whandle->stride;




More information about the mesa-commit mailing list