diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-02-14 12:57:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-02-14 12:57:57 +1000 |
| commit | 7ebdc26a315ac0f13369eaf922bcee3ede576438 (patch) | |
| tree | 13612d5892545a1d0636687a59a91c4b666c4b41 /drivers/gpu/drm/msm/msm_drv.c | |
| parent | 984f0103fcd153363f77eb6dc68ab6caf8a5a779 (diff) | |
| parent | e1cf35b94c5fd122a8780587559fc6da9fc2dd12 (diff) | |
| download | lwn-7ebdc26a315ac0f13369eaf922bcee3ede576438.tar.gz lwn-7ebdc26a315ac0f13369eaf922bcee3ede576438.zip | |
Merge tag 'drm-misc-next-fixes-2020-02-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-next fixes for v5.6:
- Fix build error in drm/edid.
- Plug close-after-free race in vgem_gem_create.
- Handle CONFIG_DMA_API_DEBUG_SG better in drm/msm.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/551b6183-a581-9d12-10a9-24cd929de425@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index c26219c7a49f..e4b750b0c2d3 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -441,6 +441,14 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) if (ret) goto err_msm_uninit; + if (!dev->dma_parms) { + dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms), + GFP_KERNEL); + if (!dev->dma_parms) + return -ENOMEM; + } + dma_set_max_seg_size(dev, DMA_BIT_MASK(32)); + msm_gem_shrinker_init(ddev); switch (get_mdp_ver(pdev)) { |