diff options
| author | Rob Clark <robdclark@gmail.com> | 2014-07-10 04:08:15 +0200 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2014-08-04 17:55:29 +0200 |
| commit | 944fc36c31ed685cf8d3d125eb681ae7198f06fc (patch) | |
| tree | d5f05d582f1c18e9325ed2fd1b591f036d1edea4 /drivers/gpu/drm/msm/mdp/mdp4 | |
| parent | drm/msm: no mmu is only error if not using vram carveout (diff) | |
| download | linux-944fc36c31ed685cf8d3d125eb681ae7198f06fc.tar.xz linux-944fc36c31ed685cf8d3d125eb681ae7198f06fc.zip | |
drm/msm: use upstream iommu
Downstream kernel IOMMU had a non-standard way of dealing with multiple
devices and multiple ports/contexts. We don't need that on upstream
kernel, so rip out the crazy.
Note that we have to move the pinning of the ringbuffer to after the
IOMMU is attached. No idea how that managed to work properly on the
downstream kernel.
For now, I am leaving the IOMMU port name stuff in place, to simplify
things for folks trying to backport latest drm/msm to device kernels.
Once we no longer have to care about pre-DT kernels, we can drop this
and instead backport upstream IOMMU driver.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/mdp/mdp4')
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c index a9579ce2ffb9..733646c0d3f8 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c @@ -361,7 +361,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) mdelay(16); if (config->iommu) { - mmu = msm_iommu_new(dev, config->iommu); + mmu = msm_iommu_new(&pdev->dev, config->iommu); if (IS_ERR(mmu)) { ret = PTR_ERR(mmu); goto fail; |