Merge tag 'drm-intel-fixes-2013-06-04' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Daniel writes:

Three regression fixes and one no-lvds quirk update. The regression Egbert
Eich tracked down goes back to 2.6.37 ... ugh. The other two are pretty
minor: One bogus modeset state checker WARN and a patch to prevent X
dying in a SIGBUS after a gpu hang with failed (or not implement as on
gen2/3) gpu reset.

* tag 'drm-intel-fixes-2013-06-04' of git://people.freedesktop.org/~danvet/drm-intel: (368 commits)
  drm/i915/sdvo: Use &intel_sdvo->ddc instead of intel_sdvo->i2c for DDC.
  drm/i915: no lvds quirk for hp t5740
  drm/i915: Quirk the pipe A quirk in the modeset state checker
  drm/i915: Fix spurious -EIO/SIGBUS on wedged gpus
  Linux 3.10-rc4
  parisc: parport0: fix this legacy no-device port driver!
  parport_pc: disable PARPORT_PC_SUPERIO on parisc architecture
  parisc/PCI: lba: fix: convert to pci_create_root_bus() for correct root bus resources (v2)
  parisc/PCI: Set type for LBA bus_num resource
  MAINTAINERS: update parisc architecture file list
  parisc: kernel: using strlcpy() instead of strcpy()
  parisc: rename "CONFIG_PA7100" to "CONFIG_PA7000"
  parisc: fix kernel BUG at arch/parisc/include/asm/mmzone.h:50
  parisc: memory overflow, 'name' length is too short for using
  powerpc/cputable: Fix typo on P7+ cputable entry
  powerpc/perf: Add missing SIER support
  powerpc/perf: Revert to original NO_SIPR logic
  powerpc/pci: Remove the unused variables in pci_process_bridge_OF_ranges
  powerpc/pci: Remove the stale comments of pci_process_bridge_OF_ranges
  powerpc/pseries: Always enable CONFIG_HOTPLUG_CPU on PSERIES SMP
  ...

1 files changed, 45 insertions, 3 deletions

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 2050891d9c65..d3f7d2db870f 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -69,6 +69,7 @@ struct gpio_bank {
         bool is_mpuio;
         bool dbck_flag;
         bool loses_context;
+        bool context_valid;
         int stride;
         u32 width;
         int context_loss_count;
@@ -1128,6 +1129,10 @@ static int omap_gpio_probe(struct platform_device *pdev)
                         bank->loses_context = true;
         } else {
                 bank->loses_context = pdata->loses_context;
+
+                if (bank->loses_context)
+                        bank->get_context_loss_count =
+                                pdata->get_context_loss_count;
         }
 
 
@@ -1178,9 +1183,6 @@ static int omap_gpio_probe(struct platform_device *pdev)
         omap_gpio_chip_init(bank);
         omap_gpio_show_rev(bank);
 
-        if (bank->loses_context)
-                bank->get_context_loss_count = pdata->get_context_loss_count;
-
         pm_runtime_put(bank->dev);
 
         list_add_tail(&bank->node, &omap_gpio_list);
@@ -1259,6 +1261,8 @@ update_gpio_context_count:
         return 0;
 }
 
+static void omap_gpio_init_context(struct gpio_bank *p);
+
 static int omap_gpio_runtime_resume(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -1268,6 +1272,20 @@ static int omap_gpio_runtime_resume(struct device *dev)
         int c;
 
         spin_lock_irqsave(&bank->lock, flags);
+
+        /*
+         * On the first resume during the probe, the context has not
+         * been initialised and so initialise it now. Also initialise
+         * the context loss count.
+         */
+        if (bank->loses_context && !bank->context_valid) {
+                omap_gpio_init_context(bank);
+
+                if (bank->get_context_loss_count)
+                        bank->context_loss_count =
+                                bank->get_context_loss_count(bank->dev);
+        }
+
         _gpio_dbck_enable(bank);
 
         /*
@@ -1384,6 +1402,29 @@ void omap2_gpio_resume_after_idle(void)
 }
 
 #if defined(CONFIG_PM_RUNTIME)
+static void omap_gpio_init_context(struct gpio_bank *p)
+{
+        struct omap_gpio_reg_offs *regs = p->regs;
+        void __iomem *base = p->base;
+
+        p->context.ctrl         = __raw_readl(base + regs->ctrl);
+        p->context.oe           = __raw_readl(base + regs->direction);
+        p->context.wake_en      = __raw_readl(base + regs->wkup_en);
+        p->context.leveldetect0 = __raw_readl(base + regs->leveldetect0);
+        p->context.leveldetect1 = __raw_readl(base + regs->leveldetect1);
+        p->context.risingdetect = __raw_readl(base + regs->risingdetect);
+        p->context.fallingdetect = __raw_readl(base + regs->fallingdetect);
+        p->context.irqenable1   = __raw_readl(base + regs->irqenable);
+        p->context.irqenable2   = __raw_readl(base + regs->irqenable2);
+
+        if (regs->set_dataout && p->regs->clr_dataout)
+                p->context.dataout = __raw_readl(base + regs->set_dataout);
+        else
+                p->context.dataout = __raw_readl(base + regs->dataout);
+
+        p->context_valid = true;
+}
+
 static void omap_gpio_restore_context(struct gpio_bank *bank)
 {
         __raw_writel(bank->context.wake_en,
@@ -1421,6 +1462,7 @@ static void omap_gpio_restore_context(struct gpio_bank *bank)
 #else
 #define omap_gpio_runtime_suspend NULL
 #define omap_gpio_runtime_resume NULL
+static void omap_gpio_init_context(struct gpio_bank *p) {}
 #endif
 
 static const struct dev_pm_ops gpio_pm_ops = {