Merge branch 'x86/ras' into ras/core, to pick up changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

6 files changed, 25 insertions, 8 deletions

diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c
index 0e5fde1d3ffb..9f9a7bef1ff6 100644
--- a/drivers/video/fbdev/broadsheetfb.c
+++ b/drivers/video/fbdev/broadsheetfb.c
@@ -752,7 +752,7 @@ static ssize_t broadsheet_loadstore_waveform(struct device *dev,
         if ((fw_entry->size < 8*1024) || (fw_entry->size > 64*1024)) {
                 dev_err(dev, "Invalid waveform\n");
                 err = -EINVAL;
-                goto err_failed;
+                goto err_fw;
         }
 
         mutex_lock(&(par->io_lock));
@@ -762,13 +762,15 @@ static ssize_t broadsheet_loadstore_waveform(struct device *dev,
         mutex_unlock(&(par->io_lock));
         if (err < 0) {
                 dev_err(dev, "Failed to store broadsheet waveform\n");
-                goto err_failed;
+                goto err_fw;
         }
 
         dev_info(dev, "Stored broadsheet waveform, size %zd\n", fw_entry->size);
 
-        return len;
+        err = len;
 
+err_fw:
+        release_firmware(fw_entry);
 err_failed:
         return err;
 }
diff --git a/drivers/video/fbdev/fsl-diu-fb.c b/drivers/video/fbdev/fsl-diu-fb.c
index 7fa2e6f9e322..b335c1ae8625 100644
--- a/drivers/video/fbdev/fsl-diu-fb.c
+++ b/drivers/video/fbdev/fsl-diu-fb.c
@@ -1628,9 +1628,16 @@ static int fsl_diu_suspend(struct platform_device *ofdev, pm_message_t state)
 static int fsl_diu_resume(struct platform_device *ofdev)
 {
         struct fsl_diu_data *data;
+        unsigned int i;
 
         data = dev_get_drvdata(&ofdev->dev);
-        enable_lcdc(data->fsl_diu_info);
+
+        fsl_diu_enable_interrupts(data);
+        update_lcdc(data->fsl_diu_info);
+        for (i = 0; i < NUM_AOIS; i++) {
+                if (data->mfb[i].count)
+                        fsl_diu_enable_panel(&data->fsl_diu_info[i]);
+        }
 
         return 0;
 }
diff --git a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
index 9b8bebdf8f86..f9ec5c0484fa 100644
--- a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
@@ -831,6 +831,7 @@ static struct of_device_id of_platform_mb862xx_tbl[] = {
         { .compatible = "fujitsu,coral", },
         { /* end */ }
 };
+MODULE_DEVICE_TABLE(of, of_platform_mb862xx_tbl);
 
 static struct platform_driver of_platform_mb862xxfb_driver = {
         .driver = {
diff --git a/drivers/video/fbdev/omap2/displays-new/connector-dvi.c b/drivers/video/fbdev/omap2/displays-new/connector-dvi.c
index a8ce920fa797..d811e6dcaef7 100644
--- a/drivers/video/fbdev/omap2/displays-new/connector-dvi.c
+++ b/drivers/video/fbdev/omap2/displays-new/connector-dvi.c
@@ -294,7 +294,7 @@ static int dvic_probe_of(struct platform_device *pdev)
 
         adapter_node = of_parse_phandle(node, "ddc-i2c-bus", 0);
         if (adapter_node) {
-                adapter = of_find_i2c_adapter_by_node(adapter_node);
+                adapter = of_get_i2c_adapter_by_node(adapter_node);
                 if (adapter == NULL) {
                         dev_err(&pdev->dev, "failed to parse ddc-i2c-bus\n");
                         omap_dss_put_device(ddata->in);
diff --git a/drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c b/drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c
index 90cbc4c3406c..c581231c74a5 100644
--- a/drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c
+++ b/drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c
@@ -898,6 +898,7 @@ static const struct of_device_id acx565akm_of_match[] = {
         { .compatible = "omapdss,sony,acx565akm", },
         {},
 };
+MODULE_DEVICE_TABLE(of, acx565akm_of_match);
 
 static struct spi_driver acx565akm_driver = {
         .driver = {
diff --git a/drivers/video/fbdev/tridentfb.c b/drivers/video/fbdev/tridentfb.c
index 7ed9a227f5ea..01b43e9ce941 100644
--- a/drivers/video/fbdev/tridentfb.c
+++ b/drivers/video/fbdev/tridentfb.c
@@ -226,7 +226,7 @@ static void blade_image_blit(struct tridentfb_par *par, const char *data,
         writemmr(par, DST1, point(x, y));
         writemmr(par, DST2, point(x + w - 1, y + h - 1));
 
-        memcpy(par->io_virt + 0x10000, data, 4 * size);
+        iowrite32_rep(par->io_virt + 0x10000, data, size);
 }
 
 static void blade_copy_rect(struct tridentfb_par *par,
@@ -673,8 +673,14 @@ static int get_nativex(struct tridentfb_par *par)
 static inline void set_lwidth(struct tridentfb_par *par, int width)
 {
         write3X4(par, VGA_CRTC_OFFSET, width & 0xFF);
-        write3X4(par, AddColReg,
-                 (read3X4(par, AddColReg) & 0xCF) | ((width & 0x300) >> 4));
+        /* chips older than TGUI9660 have only 1 width bit in AddColReg */
+        /* touching the other one breaks I2C/DDC */
+        if (par->chip_id == TGUI9440 || par->chip_id == CYBER9320)
+                write3X4(par, AddColReg,
+                     (read3X4(par, AddColReg) & 0xEF) | ((width & 0x100) >> 4));
+        else
+                write3X4(par, AddColReg,
+                     (read3X4(par, AddColReg) & 0xCF) | ((width & 0x300) >> 4));
 }
 
 /* For resolutions smaller than FP resolution stretch */