etnaviv: fix a null pointer dereference

[mesa.git] / src / etnaviv / drm / etnaviv_bo.c

diff --git a/src/etnaviv/drm/etnaviv_bo.c b/src/etnaviv/drm/etnaviv_bo.c
index 6d6339aff49e24bb36bb7e2b4776304121cc85a5..2b1fbbbc3c7f86fc66cc63b219cd878fb2c1a282 100644 (file)
--- a/src/etnaviv/drm/etnaviv_bo.c
+++ b/src/etnaviv/drm/etnaviv_bo.c
@@ -31,7 +31,7 @@
 #include "etnaviv_drmif.h"
 
 pthread_mutex_t etna_drm_table_lock = PTHREAD_MUTEX_INITIALIZER;
 #include "etnaviv_drmif.h"
 
 pthread_mutex_t etna_drm_table_lock = PTHREAD_MUTEX_INITIALIZER;

-void bo_del(struct etna_bo *bo);
+void _etna_bo_del(struct etna_bo *bo);

 
 /* set buffer name, and add to table, call w/ etna_drm_table_lock held: */
 static void set_name(struct etna_bo *bo, uint32_t name)
 
 /* set buffer name, and add to table, call w/ etna_drm_table_lock held: */
 static void set_name(struct etna_bo *bo, uint32_t name)


@@ -42,7 +42,7 @@ static void set_name(struct etna_bo *bo, uint32_t name)
 }
 
 /* Called under etna_drm_table_lock */
 }
 
 /* Called under etna_drm_table_lock */

-void bo_del(struct etna_bo *bo)
+void _etna_bo_del(struct etna_bo *bo)

 {
        if (bo->map)
                os_munmap(bo->map, bo->size);
 {
        if (bo->map)
                os_munmap(bo->map, bo->size);


@@ -238,11 +238,11 @@ out_unlock:
 /* destroy a buffer object */
 void etna_bo_del(struct etna_bo *bo)
 {
 /* destroy a buffer object */
 void etna_bo_del(struct etna_bo *bo)
 {

-       struct etna_device *dev = bo->dev;
-

        if (!bo)
                return;
 
        if (!bo)
                return;
 

+       struct etna_device *dev = bo->dev;
+

        if (!p_atomic_dec_zero(&bo->refcnt))
                return;
 
        if (!p_atomic_dec_zero(&bo->refcnt))
                return;
 


@@ -251,7 +251,7 @@ void etna_bo_del(struct etna_bo *bo)
        if (bo->reuse && (etna_bo_cache_free(&dev->bo_cache, bo) == 0))
                goto out;
 
        if (bo->reuse && (etna_bo_cache_free(&dev->bo_cache, bo) == 0))
                goto out;
 

-       bo_del(bo);
+       _etna_bo_del(bo);

        etna_device_del_locked(dev);
 out:
        pthread_mutex_unlock(&etna_drm_table_lock);
        etna_device_del_locked(dev);
 out:
        pthread_mutex_unlock(&etna_drm_table_lock);