Merge tag 'upstream-4.13-rc1' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / drivers / gpu / drm / msm / mdp / mdp5 / mdp5_kms.c

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index 71d08a805806f9e3cb2fab10bc927a92c5e20b25..5d13fa5381ee37705a0c282bf023b4782fc19268 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -678,13 +678,6 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
                aspace = NULL;;
        }
 
-       kms->id = msm_register_address_space(dev, aspace);
-       if (kms->id < 0) {
-               ret = kms->id;
-               dev_err(&pdev->dev, "failed to register mdp5 iommu: %d\n", ret);
-               goto fail;
-       }
-
        ret = modeset_init(mdp5_kms);
        if (ret) {
                dev_err(&pdev->dev, "modeset_init failed: %d\n", ret);