Merge drm-fixes into drm-next.

Nouveau wanted this to avoid some worse conflicts when I merge that.

5 files changed, 25 insertions, 16 deletions

diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
index 0081725c6b5b..6b2a06d09f2b 100644
--- a/drivers/video/fbdev/da8xx-fb.c
+++ b/drivers/video/fbdev/da8xx-fb.c
@@ -152,7 +152,7 @@ static void lcdc_write(unsigned int val, unsigned int addr)
 
 struct da8xx_fb_par {
         struct device           *dev;
-        resource_size_t p_palette_base;
+        dma_addr_t              p_palette_base;
         unsigned char *v_palette_base;
         dma_addr_t              vram_phys;
         unsigned long           vram_size;
@@ -1428,7 +1428,7 @@ static int fb_probe(struct platform_device *device)
 
         par->vram_virt = dma_alloc_coherent(NULL,
                                             par->vram_size,
-                                            (resource_size_t *) &par->vram_phys,
+                                            &par->vram_phys,
                                             GFP_KERNEL | GFP_DMA);
         if (!par->vram_virt) {
                 dev_err(&device->dev,
@@ -1448,7 +1448,7 @@ static int fb_probe(struct platform_device *device)
 
         /* allocate palette buffer */
         par->v_palette_base = dma_zalloc_coherent(NULL, PALETTE_SIZE,
-                                                  (resource_size_t *)&par->p_palette_base,
+                                                  &par->p_palette_base,
                                                   GFP_KERNEL | GFP_DMA);
         if (!par->v_palette_base) {
                 dev_err(&device->dev,
diff --git a/drivers/video/fbdev/exynos/s6e8ax0.c b/drivers/video/fbdev/exynos/s6e8ax0.c
index 95873f26e39c..de2f3e793786 100644
--- a/drivers/video/fbdev/exynos/s6e8ax0.c
+++ b/drivers/video/fbdev/exynos/s6e8ax0.c
@@ -829,8 +829,7 @@ static int s6e8ax0_probe(struct mipi_dsim_lcd_device *dsim_dev)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int s6e8ax0_suspend(struct mipi_dsim_lcd_device *dsim_dev)
+static int __maybe_unused s6e8ax0_suspend(struct mipi_dsim_lcd_device *dsim_dev)
 {
         struct s6e8ax0 *lcd = dev_get_drvdata(&dsim_dev->dev);
 
@@ -843,7 +842,7 @@ static int s6e8ax0_suspend(struct mipi_dsim_lcd_device *dsim_dev)
         return 0;
 }
 
-static int s6e8ax0_resume(struct mipi_dsim_lcd_device *dsim_dev)
+static int __maybe_unused s6e8ax0_resume(struct mipi_dsim_lcd_device *dsim_dev)
 {
         struct s6e8ax0 *lcd = dev_get_drvdata(&dsim_dev->dev);
 
@@ -855,10 +854,6 @@ static int s6e8ax0_resume(struct mipi_dsim_lcd_device *dsim_dev)
 
         return 0;
 }
-#else
-#define s6e8ax0_suspend         NULL
-#define s6e8ax0_resume          NULL
-#endif
 
 static struct mipi_dsim_lcd_driver s6e8ax0_dsim_ddi_driver = {
         .name = "s6e8ax0",
@@ -867,8 +862,8 @@ static struct mipi_dsim_lcd_driver s6e8ax0_dsim_ddi_driver = {
         .power_on = s6e8ax0_power_on,
         .set_sequence = s6e8ax0_set_sequence,
         .probe = s6e8ax0_probe,
-        .suspend = s6e8ax0_suspend,
-        .resume = s6e8ax0_resume,
+        .suspend = IS_ENABLED(CONFIG_PM) ? s6e8ax0_suspend : NULL,
+        .resume = IS_ENABLED(CONFIG_PM) ? s6e8ax0_resume : NULL,
 };
 
 static int s6e8ax0_init(void)
diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index cee88603efc9..bb2f1e866020 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -902,6 +902,21 @@ static int imxfb_probe(struct platform_device *pdev)
                 goto failed_getclock;
         }
 
+        /*
+         * The LCDC controller does not have an enable bit. The
+         * controller starts directly when the clocks are enabled.
+         * If the clocks are enabled when the controller is not yet
+         * programmed with proper register values (enabled at the
+         * bootloader, for example) then it just goes into some undefined
+         * state.
+         * To avoid this issue, let's enable and disable LCDC IPG clock
+         * so that we force some kind of 'reset' to the LCDC block.
+         */
+        ret = clk_prepare_enable(fbi->clk_ipg);
+        if (ret)
+                goto failed_getclock;
+        clk_disable_unprepare(fbi->clk_ipg);
+
         fbi->clk_ahb = devm_clk_get(&pdev->dev, "ahb");
         if (IS_ERR(fbi->clk_ahb)) {
                 ret = PTR_ERR(fbi->clk_ahb);
diff --git a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
index de54a4748065..b6f83d5df9fd 100644
--- a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
+++ b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
@@ -503,8 +503,7 @@ static int mmphw_probe(struct platform_device *pdev)
         ctrl->reg_base = devm_ioremap_nocache(ctrl->dev,
                         res->start, resource_size(res));
         if (ctrl->reg_base == NULL) {
-                dev_err(ctrl->dev, "%s: res %x - %x map failed\n", __func__,
-                        res->start, res->end);
+                dev_err(ctrl->dev, "%s: res %pR map failed\n", __func__, res);
                 ret = -ENOMEM;
                 goto failed;
         }
diff --git a/drivers/video/fbdev/ocfb.c b/drivers/video/fbdev/ocfb.c
index c9293aea8ec3..a970edc2a6f8 100644
--- a/drivers/video/fbdev/ocfb.c
+++ b/drivers/video/fbdev/ocfb.c
@@ -123,11 +123,11 @@ static int ocfb_setupfb(struct ocfb_dev *fbdev)
 
         /* Horizontal timings */
         ocfb_writereg(fbdev, OCFB_HTIM, (var->hsync_len - 1) << 24 |
-                      (var->right_margin - 1) << 16 | (var->xres - 1));
+                      (var->left_margin - 1) << 16 | (var->xres - 1));
 
         /* Vertical timings */
         ocfb_writereg(fbdev, OCFB_VTIM, (var->vsync_len - 1) << 24 |
-                      (var->lower_margin - 1) << 16 | (var->yres - 1));
+                      (var->upper_margin - 1) << 16 | (var->yres - 1));
 
         /* Total length of frame */
         hlen = var->left_margin + var->right_margin + var->hsync_len +