diff options
| author | Jordan Crouse <jcrouse@codeaurora.org> | 2017-02-13 10:14:19 -0700 |
|---|---|---|
| committer | Jordan Crouse <jcrouse@codeaurora.org> | 2017-02-22 09:52:12 -0700 |
| commit | 88de027b795e9dfe640b896295801cf8c094c3bd (patch) | |
| tree | eaf6861f6f61c1942d966dfda071198ac05880af /drivers/gpu | |
| parent | 7d080736a4b4601a16a2d81a4537d0202fc05157 (diff) | |
drm/msm: Make sure the GPU is valid before we use it
Verify that the GPU is valid before calling any ioctl functions
that might need the priv->gpu member. Standardize the return
code (-ENXIO).
Change-Id: Ic0dedbad015a531b792e0b94cb61e0570b691de8
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem_submit.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 6d3cf1accdb9..e223f376c908 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -942,7 +942,7 @@ int msm_wait_fence(struct drm_device *dev, uint32_t fence, int ret; if (!priv->gpu) - return 0; + return -ENXIO; if (fence > priv->gpu->submitted_fence) { DRM_ERROR("waiting on invalid fence: %u (of %u)\n", diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c index 0aea6377b449..f7b5e30b41eb 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -353,6 +353,8 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, return -EINVAL; gpu = priv->gpu; + if (!gpu) + return -ENXIO; if (args->nr_cmds > MAX_CMDS) return -EINVAL; |