Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / msm / disp / mdp5 / mdp5_kms.c

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
index 41b461128bbc0cc103d7074ea882ceaf720a5f79..c902c6503675f9e9cebd3e2d536e0352f146b685 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -625,7 +625,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
 
        if (config->platform.iommu) {
                iommu_dev = &pdev->dev;
-               if (!iommu_dev->iommu_fwspec)
+               if (!dev_iommu_fwspec_get(iommu_dev))
                        iommu_dev = iommu_dev->parent;
 
                aspace = msm_gem_address_space_create(iommu_dev,