diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-07-26 14:09:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-07-26 14:09:58 +1000 |
| commit | f480de3f4a2b1ec184f7b5178943adf31080fc2c (patch) | |
| tree | 52f2ad7c578d8ccd7914abcc4263ab85ceaa5522 /drivers/gpu/drm/msm/msm_drv.c | |
| parent | 5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff) | |
| parent | bbb6fc43f131f77fcb7ae8081f6d7c51396a2120 (diff) | |
| download | talos-op-linux-f480de3f4a2b1ec184f7b5178943adf31080fc2c.tar.gz talos-op-linux-f480de3f4a2b1ec184f7b5178943adf31080fc2c.zip | |
Merge tag 'drm-misc-fixes-2019-07-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
- pick up the cmdline fix which missed the merge window (Dmitry)
- a handful of msm fixes so i don't have to spin up msm-fixes (Various)
- fix -Wunused-but-set-variable warning in drm_framebuffer (Qian)
Cc: Dmitry Osipenko <digetx@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Qian Cai <cai@lca.pw>
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190725160909.GA106249@art_vandelay
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 ab64ab470de7..c226156f2dea 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -619,7 +619,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file) msm_submitqueue_init(dev, ctx); - ctx->aspace = priv->gpu->aspace; + ctx->aspace = priv->gpu ? priv->gpu->aspace : NULL; file->driver_priv = ctx; return 0; |
