Merge tag 'drm-misc-next-2019-01-07-1' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-block.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 f71d8cf2261bbc82a29adac62c7c66742415cf2f..97179bec8902fc500f78639b15eaee8cccbc1cee 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -264,7 +264,7 @@ static int mdp5_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor)
                        minor->debugfs_root, minor);
 
        if (ret) {
-               dev_err(dev->dev, "could not install mdp5_debugfs_list\n");
+               DRM_DEV_ERROR(dev->dev, "could not install mdp5_debugfs_list\n");
                return ret;
        }
 
@@ -337,7 +337,7 @@ static struct drm_encoder *construct_encoder(struct mdp5_kms *mdp5_kms,
 
        encoder = mdp5_encoder_init(dev, intf, ctl);
        if (IS_ERR(encoder)) {
-               dev_err(dev->dev, "failed to construct encoder\n");
+               DRM_DEV_ERROR(dev->dev, "failed to construct encoder\n");
                return encoder;
        }
 
@@ -418,7 +418,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms,
                int dsi_id = get_dsi_id_from_intf(hw_cfg, intf->num);
 
                if ((dsi_id >= ARRAY_SIZE(priv->dsi)) || (dsi_id < 0)) {
-                       dev_err(dev->dev, "failed to find dsi from intf %d\n",
+                       DRM_DEV_ERROR(dev->dev, "failed to find dsi from intf %d\n",
                                intf->num);
                        ret = -EINVAL;
                        break;
@@ -443,7 +443,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms,
                break;
        }
        default:
-               dev_err(dev->dev, "unknown intf: %d\n", intf->type);
+               DRM_DEV_ERROR(dev->dev, "unknown intf: %d\n", intf->type);
                ret = -EINVAL;
                break;
        }
@@ -500,7 +500,7 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
                plane = mdp5_plane_init(dev, type);
                if (IS_ERR(plane)) {
                        ret = PTR_ERR(plane);
-                       dev_err(dev->dev, "failed to construct plane %d (%d)\n", i, ret);
+                       DRM_DEV_ERROR(dev->dev, "failed to construct plane %d (%d)\n", i, ret);
                        goto fail;
                }
                priv->planes[priv->num_planes++] = plane;
@@ -517,7 +517,7 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
                crtc  = mdp5_crtc_init(dev, primary[i], cursor[i], i);
                if (IS_ERR(crtc)) {
                        ret = PTR_ERR(crtc);
-                       dev_err(dev->dev, "failed to construct crtc %d (%d)\n", i, ret);
+                       DRM_DEV_ERROR(dev->dev, "failed to construct crtc %d (%d)\n", i, ret);
                        goto fail;
                }
                priv->crtcs[priv->num_crtcs++] = crtc;
@@ -552,7 +552,7 @@ static void read_mdp_hw_revision(struct mdp5_kms *mdp5_kms,
        *major = FIELD(version, MDP5_HW_VERSION_MAJOR);
        *minor = FIELD(version, MDP5_HW_VERSION_MINOR);
 
-       dev_info(dev, "MDP5 version v%d.%d", *major, *minor);
+       DRM_DEV_INFO(dev, "MDP5 version v%d.%d", *major, *minor);
 }
 
 static int get_clk(struct platform_device *pdev, struct clk **clkp,
@@ -561,7 +561,7 @@ static int get_clk(struct platform_device *pdev, struct clk **clkp,
        struct device *dev = &pdev->dev;
        struct clk *clk = msm_clk_get(pdev, name);
        if (IS_ERR(clk) && mandatory) {
-               dev_err(dev, "failed to get %s (%ld)\n", name, PTR_ERR(clk));
+               DRM_DEV_ERROR(dev, "failed to get %s (%ld)\n", name, PTR_ERR(clk));
                return PTR_ERR(clk);
        }
        if (IS_ERR(clk))
@@ -688,7 +688,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
        irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
        if (irq < 0) {
                ret = irq;
-               dev_err(&pdev->dev, "failed to get irq: %d\n", ret);
+               DRM_DEV_ERROR(&pdev->dev, "failed to get irq: %d\n", ret);
                goto fail;
        }
 
@@ -724,12 +724,12 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
                ret = aspace->mmu->funcs->attach(aspace->mmu, iommu_ports,
                                ARRAY_SIZE(iommu_ports));
                if (ret) {
-                       dev_err(&pdev->dev, "failed to attach iommu: %d\n",
+                       DRM_DEV_ERROR(&pdev->dev, "failed to attach iommu: %d\n",
                                ret);
                        goto fail;
                }
        } else {
-               dev_info(&pdev->dev,
+               DRM_DEV_INFO(&pdev->dev,
                         "no iommu, fallback to phys contig buffers for scanout\n");
                aspace = NULL;
        }
@@ -738,7 +738,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
 
        ret = modeset_init(mdp5_kms);
        if (ret) {
-               dev_err(&pdev->dev, "modeset_init failed: %d\n", ret);
+               DRM_DEV_ERROR(&pdev->dev, "modeset_init failed: %d\n", ret);
                goto fail;
        }
 
@@ -795,7 +795,7 @@ static int construct_pipes(struct mdp5_kms *mdp5_kms, int cnt,
                hwpipe = mdp5_pipe_init(pipes[i], offsets[i], caps);
                if (IS_ERR(hwpipe)) {
                        ret = PTR_ERR(hwpipe);
-                       dev_err(dev->dev, "failed to construct pipe for %s (%d)\n",
+                       DRM_DEV_ERROR(dev->dev, "failed to construct pipe for %s (%d)\n",
                                        pipe2name(pipes[i]), ret);
                        return ret;
                }
@@ -867,7 +867,7 @@ static int hwmixer_init(struct mdp5_kms *mdp5_kms)
                mixer = mdp5_mixer_init(&hw_cfg->lm.instances[i]);
                if (IS_ERR(mixer)) {
                        ret = PTR_ERR(mixer);
-                       dev_err(dev->dev, "failed to construct LM%d (%d)\n",
+                       DRM_DEV_ERROR(dev->dev, "failed to construct LM%d (%d)\n",
                                i, ret);
                        return ret;
                }
@@ -897,7 +897,7 @@ static int interface_init(struct mdp5_kms *mdp5_kms)
 
                intf = kzalloc(sizeof(*intf), GFP_KERNEL);
                if (!intf) {
-                       dev_err(dev->dev, "failed to construct INTF%d\n", i);
+                       DRM_DEV_ERROR(dev->dev, "failed to construct INTF%d\n", i);
                        return -ENOMEM;
                }