diff options
| author | Rob Clark <robdclark@gmail.com> | 2018-02-14 11:14:23 -0500 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2018-03-19 06:33:36 -0400 |
| commit | d71b6bd80d96f15f4ae393d3bec0636c960e289a (patch) | |
| tree | 90a6b55811c7f5d21833f94dd4ff900d23890809 /drivers/gpu/drm/msm | |
| parent | 94c3e78d873f02379b2a7a7e4cfb020fd81f1bb7 (diff) | |
| download | linux-d71b6bd80d96f15f4ae393d3bec0636c960e289a.tar.bz2 | |
drm/msm/dsi: fix direct caller of msm_gem_free_object()
This should be using drm_gem_object_put(). Also since this is done only
in driver unload path, we don't need to synchronize setting tx_gem_obj
to NULL, so juse use the _unlocked() variant.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm')
| -rw-r--r-- | drivers/gpu/drm/msm/dsi/dsi_host.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index 62ac614eccf9..7a03a9489708 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -1063,10 +1063,8 @@ static void dsi_tx_buf_free(struct msm_dsi_host *msm_host) if (msm_host->tx_gem_obj) { msm_gem_put_iova(msm_host->tx_gem_obj, 0); - mutex_lock(&dev->struct_mutex); - msm_gem_free_object(msm_host->tx_gem_obj); + drm_gem_object_put_unlocked(msm_host->tx_gem_obj); msm_host->tx_gem_obj = NULL; - mutex_unlock(&dev->struct_mutex); } if (msm_host->tx_buf) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 0e5073af3913..95196479f651 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -798,6 +798,7 @@ void msm_gem_describe_objects(struct list_head *list, struct seq_file *m) } #endif +/* don't call directly! Use drm_gem_object_put() and friends */ void msm_gem_free_object(struct drm_gem_object *obj) { struct drm_device *dev = obj->dev; |