diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-04-22 09:24:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-04-22 09:25:47 +1000 |
| commit | 70da382e1c5b9b2049c10abfd4489a40c1b60df0 (patch) | |
| tree | e307e758f516758f26fe2baeecfc57c05658db0c | |
| parent | e827d149fd095e51928d048a5224144780b34a94 (diff) | |
| parent | 0371870b96907bf560ecf7dc3fadc238fadf7845 (diff) | |
Merge tag 'drm-msm-fixes-2022-04-20' of https://gitlab.freedesktop.org/drm/msm into drm-fixesdrm-fixes-2022-04-22
Revert to fix iommu regression.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGtvPo4xD2peAztDMPP2n4utb7d9WQboMFwsba9E8U2rCw@mail.gmail.com
| -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 9c36b505daab..affa95eb05fc 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -274,7 +274,7 @@ bool msm_use_mmu(struct drm_device *dev) struct msm_drm_private *priv = dev->dev_private; /* a2xx comes with its own MMU */ - return priv->is_a2xx || device_iommu_mapped(dev->dev); + return priv->is_a2xx || iommu_present(&platform_bus_type); } static int msm_init_vram(struct drm_device *dev) |