diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-05 18:20:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-05 18:20:20 -0700 |
| commit | f96a299e772d27f4845b5da4bfdf0bb46570d9df (patch) | |
| tree | 1ca4b0375fe9d2aac4d760010df7f237de9362df /drivers/gpu/drm/msm/msm_drv.c | |
| parent | e28c151ad1032937ed766355577c5e1d760bdf4c (diff) | |
| parent | 5c91d8529cc0dd1e8e5ead0aeaa374e7735992f8 (diff) | |
Merge "drm/msm: Add timestamp counter"
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 2280f8cb7183..924ce64206f4 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1760,7 +1760,8 @@ static int msm_ioctl_submitqueue_new(struct drm_device *dev, void *data, if (args->flags & ~MSM_SUBMITQUEUE_FLAGS) return -EINVAL; - if (!file->is_master && args->prio >= gpu->nr_rings - 1) { + if ((gpu->nr_rings > 1) && + (!file->is_master && args->prio == 0)) { DRM_ERROR("Only DRM master can set highest priority ringbuffer\n"); return -EPERM; } |