diff options
| author | Archit Taneja <architt@codeaurora.org> | 2016-11-03 15:06:18 +0300 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2016-11-04 18:51:37 +0300 |
| commit | 16976085a114ae293c6fa7a463d74600ffcfeb4b (patch) | |
| tree | f8a12ca0f5f37825faa7306feaa28a47260546f2 /drivers/gpu/drm/msm/msm_drv.c | |
| parent | 67cba0fbb484bbc1af42f2804662a80008ba61e9 (diff) | |
| download | linux-16976085a114ae293c6fa7a463d74600ffcfeb4b.tar.xz | |
drm/msm: Fix error handling crashes seen when VRAM allocation fails
If VRAM allocation fails, the error handling path crashes in
msm_drm_uninit(). The following changes are made to fix this:
msm_gem_shrinker_cleanup() is fixed to unregister the shrinker only
if it was init-ed in the first place.
Before calling kms->funcs->destroy(), we check if kms->funcs is also
non-NULL. This is needed for MDP5, since during msm_drm_int(), priv->kms
becomes non-NULL early, but msm_kms_init() is called on it only later
in mdp5_kms_init().
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Andy Gross <andy.gross@linaro.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index fb5c0b0a7594..46568fc80848 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -228,7 +228,7 @@ static int msm_drm_uninit(struct device *dev) flush_workqueue(priv->atomic_wq); destroy_workqueue(priv->atomic_wq); - if (kms) + if (kms && kms->funcs) kms->funcs->destroy(kms); if (gpu) { |