diff options
Diffstat (limited to 'drivers/gpu/drm/msm/msm_perf.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_perf.c | 9 | 
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c index 3a27153eef08..3d3da79fec2a 100644 --- a/drivers/gpu/drm/msm/msm_perf.c +++ b/drivers/gpu/drm/msm/msm_perf.c @@ -155,9 +155,12 @@ static int perf_open(struct inode *inode, struct file *file)  	struct msm_gpu *gpu = priv->gpu;  	int ret = 0; -	mutex_lock(&dev->struct_mutex); +	if (!gpu) +		return -ENODEV; -	if (perf->open || !gpu) { +	mutex_lock(&gpu->lock); + +	if (perf->open) {  		ret = -EBUSY;  		goto out;  	} @@ -171,7 +174,7 @@ static int perf_open(struct inode *inode, struct file *file)  	perf->next_jiffies = jiffies + SAMPLE_TIME;  out: -	mutex_unlock(&dev->struct_mutex); +	mutex_unlock(&gpu->lock);  	return ret;  }  |