diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-03-31 16:34:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-03-31 16:34:55 +1000 |
| commit | 59e7a8cc2dcf335116d500d684bfb34d1d97a6fe (patch) | |
| tree | 5359c4fe5df3a646f2b4873bce2c666a14eea783 /drivers/gpu/drm/msm/msm_drv.c | |
| parent | 5fc0df93fccd4dc8412bfc488ba4ba8268aa12dc (diff) | |
| parent | a5fb8b918920c6f7706a8b5b8ea535a7f077a7f6 (diff) | |
| download | lwn-59e7a8cc2dcf335116d500d684bfb34d1d97a6fe.tar.gz lwn-59e7a8cc2dcf335116d500d684bfb34d1d97a6fe.zip | |
Merge tag 'drm-msm-next-2020-03-22' of https://gitlab.freedesktop.org/drm/msm into drm-next
A bit smaller this time around.. there are still a couple uabi
additions for vulkan waiting in the wings, but I punted on them this
cycle due to running low on time. (They should be easy enough to
rebase, and if it is a problem for anyone I can push a next+uabi
branch so that tu work can proceed.)
The bigger change is refactoring dpu resource manager and moving dpu
to use atomic global state. Other than that, it is mostly cleanups
and fixes.
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ <CAF6AEGuf1R4Xz-t9Z7_cwx9jD=b4wUvvwfqA5cHR8fCSXSd5XQ@mail.gmail.com
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 2a82c23a6e4d..29295dee2a2e 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -444,8 +444,10 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) if (!dev->dma_parms) { dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms), GFP_KERNEL); - if (!dev->dma_parms) - return -ENOMEM; + if (!dev->dma_parms) { + ret = -ENOMEM; + goto err_msm_uninit; + } } dma_set_max_seg_size(dev, DMA_BIT_MASK(32)); |