Merge tag 'drm-intel-next-2013-07-26-fixed' of git://people.freedesktop.org/~danvet/drm-intel into drm-next

Neat that QA (and Ben) keeps on humming along while I'm on vacation, so
you already get the next feature pull request:
- proper eLLC support for HSW from Ben
- more interrupt refactoring
- add w/a tags where we implement them already (Damien)
- hangcheck fixes (Chris) + hangcheck stats (Mika)
- flesh out the new vm structs for ppgtt and ggtt (Ben)
- PSR for Haswell, still disabled by default (Rodrigo et al.)
- pc8+ refclock sequence code from Paulo
- more interrupt refactoring from Paulo, unifying ilk/snb with the ivb/hsw
  interrupt code
- full solution for the Haswell concurrent reg access issues (Chris)
- fix racy object accounting, used by some new leak tests
- fix sync polarity settings on ch7xxx dvo encoder
- random bits&pieces, little fixes and better debug output all over

[airlied: fix conflict with drm_mm cleanups]

* tag 'drm-intel-next-2013-07-26-fixed' of git://people.freedesktop.org/~danvet/drm-intel: (289 commits)
  drm/i915: Do not dereference NULL crtc or fb until after checking
  drm/i915: fix pnv display core clock readout out
  drm/i915: Replace open-coded offset_in_page()
  drm/i915: Retry DP aux_ch communications with a different clock after failure
  drm/i915: Add messages useful for HPD storm detection debugging (v2)
  drm/i915: dvo_ch7xxx: fix vsync polarity setting
  drm/i915: fix the racy object accounting
  drm/i915: Convert the register access tracepoint to be conditional
  drm/i915: Squash gen lookup through multiple indirections inside GT access
  drm/i915: Use the common register access functions for NOTRACE variants
  drm/i915: Use a private interface for register access within GT
  drm/i915: Colocate all GT access routines in the same file
  drm/i915: fix reference counting in i915_gem_create
  drm/i915: Use Graphics Base of Stolen Memory on all gen3+
  drm/i915: disable stolen mem for OVERLAY_NEEDS_PHYSICAL
  drm/i915: add functions to disable and restore LCPLL
  drm/i915: disable CLKOUT_DP when it's not needed
  drm/i915: extend lpt_enable_clkout_dp
  drm/i915: fix up error cleanup in i915_gem_object_bind_to_gtt
  drm/i915: Add some debug breadcrumbs to connector detection
  ...

1 files changed, 11 insertions, 266 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index cca12db6dbb7..13457e3e9cad 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -118,6 +118,10 @@ module_param_named(i915_enable_ppgtt, i915_enable_ppgtt, int, 0600);
 MODULE_PARM_DESC(i915_enable_ppgtt,
                 "Enable PPGTT (default: true)");
 
+int i915_enable_psr __read_mostly = 0;
+module_param_named(enable_psr, i915_enable_psr, int, 0600);
+MODULE_PARM_DESC(enable_psr, "Enable PSR (default: false)");
+
 unsigned int i915_preliminary_hw_support __read_mostly = 0;
 module_param_named(preliminary_hw_support, i915_preliminary_hw_support, int, 0600);
 MODULE_PARM_DESC(preliminary_hw_support,
@@ -137,6 +141,11 @@ module_param_named(fastboot, i915_fastboot, bool, 0600);
 MODULE_PARM_DESC(fastboot, "Try to skip unnecessary mode sets at boot time "
                  "(default: false)");
 
+bool i915_prefault_disable __read_mostly;
+module_param_named(prefault_disable, i915_prefault_disable, bool, 0600);
+MODULE_PARM_DESC(prefault_disable,
+                "Disable page prefaulting for pread/pwrite/reloc (default:false). For developers only.");
+
 static struct drm_driver driver;
 extern int intel_agp_enabled;
 
@@ -714,7 +723,7 @@ static int i915_drm_thaw(struct drm_device *dev)
 {
         int error = 0;
 
-        intel_gt_reset(dev);
+        intel_uncore_sanitize(dev);
 
         if (drm_core_check_feature(dev, DRIVER_MODESET)) {
                 mutex_lock(&dev->struct_mutex);
@@ -740,7 +749,7 @@ int i915_resume(struct drm_device *dev)
 
         pci_set_master(dev->pdev);
 
-        intel_gt_reset(dev);
+        intel_uncore_sanitize(dev);
 
         /*
          * Platforms with opregion should have sane BIOS, older ones (gen3 and
@@ -761,140 +770,6 @@ int i915_resume(struct drm_device *dev)
         return 0;
 }
 
-static int i8xx_do_reset(struct drm_device *dev)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
-
-        if (IS_I85X(dev))
-                return -ENODEV;
-
-        I915_WRITE(D_STATE, I915_READ(D_STATE) | DSTATE_GFX_RESET_I830);
-        POSTING_READ(D_STATE);
-
-        if (IS_I830(dev) || IS_845G(dev)) {
-                I915_WRITE(DEBUG_RESET_I830,
-                           DEBUG_RESET_DISPLAY |
-                           DEBUG_RESET_RENDER |
-                           DEBUG_RESET_FULL);
-                POSTING_READ(DEBUG_RESET_I830);
-                msleep(1);
-
-                I915_WRITE(DEBUG_RESET_I830, 0);
-                POSTING_READ(DEBUG_RESET_I830);
-        }
-
-        msleep(1);
-
-        I915_WRITE(D_STATE, I915_READ(D_STATE) & ~DSTATE_GFX_RESET_I830);
-        POSTING_READ(D_STATE);
-
-        return 0;
-}
-
-static int i965_reset_complete(struct drm_device *dev)
-{
-        u8 gdrst;
-        pci_read_config_byte(dev->pdev, I965_GDRST, &gdrst);
-        return (gdrst & GRDOM_RESET_ENABLE) == 0;
-}
-
-static int i965_do_reset(struct drm_device *dev)
-{
-        int ret;
-
-        /*
-         * Set the domains we want to reset (GRDOM/bits 2 and 3) as
-         * well as the reset bit (GR/bit 0).  Setting the GR bit
-         * triggers the reset; when done, the hardware will clear it.
-         */
-        pci_write_config_byte(dev->pdev, I965_GDRST,
-                              GRDOM_RENDER | GRDOM_RESET_ENABLE);
-        ret =  wait_for(i965_reset_complete(dev), 500);
-        if (ret)
-                return ret;
-
-        /* We can't reset render&media without also resetting display ... */
-        pci_write_config_byte(dev->pdev, I965_GDRST,
-                              GRDOM_MEDIA | GRDOM_RESET_ENABLE);
-
-        ret =  wait_for(i965_reset_complete(dev), 500);
-        if (ret)
-                return ret;
-
-        pci_write_config_byte(dev->pdev, I965_GDRST, 0);
-
-        return 0;
-}
-
-static int ironlake_do_reset(struct drm_device *dev)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        u32 gdrst;
-        int ret;
-
-        gdrst = I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR);
-        gdrst &= ~GRDOM_MASK;
-        I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR,
-                   gdrst | GRDOM_RENDER | GRDOM_RESET_ENABLE);
-        ret = wait_for(I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) & 0x1, 500);
-        if (ret)
-                return ret;
-
-        /* We can't reset render&media without also resetting display ... */
-        gdrst = I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR);
-        gdrst &= ~GRDOM_MASK;
-        I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR,
-                   gdrst | GRDOM_MEDIA | GRDOM_RESET_ENABLE);
-        return wait_for(I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) & 0x1, 500);
-}
-
-static int gen6_do_reset(struct drm_device *dev)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        int     ret;
-        unsigned long irqflags;
-
-        /* Hold gt_lock across reset to prevent any register access
-         * with forcewake not set correctly
-         */
-        spin_lock_irqsave(&dev_priv->gt_lock, irqflags);
-
-        /* Reset the chip */
-
-        /* GEN6_GDRST is not in the gt power well, no need to check
-         * for fifo space for the write or forcewake the chip for
-         * the read
-         */
-        I915_WRITE_NOTRACE(GEN6_GDRST, GEN6_GRDOM_FULL);
-
-        /* Spin waiting for the device to ack the reset request */
-        ret = wait_for((I915_READ_NOTRACE(GEN6_GDRST) & GEN6_GRDOM_FULL) == 0, 500);
-
-        /* If reset with a user forcewake, try to restore, otherwise turn it off */
-        if (dev_priv->forcewake_count)
-                dev_priv->gt.force_wake_get(dev_priv);
-        else
-                dev_priv->gt.force_wake_put(dev_priv);
-
-        /* Restore fifo count */
-        dev_priv->gt_fifo_count = I915_READ_NOTRACE(GT_FIFO_FREE_ENTRIES);
-
-        spin_unlock_irqrestore(&dev_priv->gt_lock, irqflags);
-        return ret;
-}
-
-int intel_gpu_reset(struct drm_device *dev)
-{
-        switch (INTEL_INFO(dev)->gen) {
-        case 7:
-        case 6: return gen6_do_reset(dev);
-        case 5: return ironlake_do_reset(dev);
-        case 4: return i965_do_reset(dev);
-        case 2: return i8xx_do_reset(dev);
-        default: return -ENODEV;
-        }
-}
-
 /**
  * i915_reset - reset chip after a hang
  * @dev: drm device to reset
@@ -1224,133 +1099,3 @@ module_exit(i915_exit);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL and additional rights");
-
-/* We give fast paths for the really cool registers */
-#define NEEDS_FORCE_WAKE(dev_priv, reg) \
-        ((HAS_FORCE_WAKE((dev_priv)->dev)) && \
-         ((reg) < 0x40000) &&            \
-         ((reg) != FORCEWAKE))
-static void
-ilk_dummy_write(struct drm_i915_private *dev_priv)
-{
-        /* WaIssueDummyWriteToWakeupFromRC6:ilk Issue a dummy write to wake up
-         * the chip from rc6 before touching it for real. MI_MODE is masked,
-         * hence harmless to write 0 into. */
-        I915_WRITE_NOTRACE(MI_MODE, 0);
-}
-
-static void
-hsw_unclaimed_reg_clear(struct drm_i915_private *dev_priv, u32 reg)
-{
-        if (HAS_FPGA_DBG_UNCLAIMED(dev_priv->dev) &&
-            (I915_READ_NOTRACE(FPGA_DBG) & FPGA_DBG_RM_NOCLAIM)) {
-                DRM_ERROR("Unknown unclaimed register before writing to %x\n",
-                          reg);
-                I915_WRITE_NOTRACE(FPGA_DBG, FPGA_DBG_RM_NOCLAIM);
-        }
-}
-
-static void
-hsw_unclaimed_reg_check(struct drm_i915_private *dev_priv, u32 reg)
-{
-        if (HAS_FPGA_DBG_UNCLAIMED(dev_priv->dev) &&
-            (I915_READ_NOTRACE(FPGA_DBG) & FPGA_DBG_RM_NOCLAIM)) {
-                DRM_ERROR("Unclaimed write to %x\n", reg);
-                I915_WRITE_NOTRACE(FPGA_DBG, FPGA_DBG_RM_NOCLAIM);
-        }
-}
-
-#define __i915_read(x, y) \
-u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \
-        u##x val = 0; \
-        if (IS_GEN5(dev_priv->dev)) \
-                ilk_dummy_write(dev_priv); \
-        if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \
-                unsigned long irqflags; \
-                spin_lock_irqsave(&dev_priv->gt_lock, irqflags); \
-                if (dev_priv->forcewake_count == 0) \
-                        dev_priv->gt.force_wake_get(dev_priv); \
-                val = read##y(dev_priv->regs + reg); \
-                if (dev_priv->forcewake_count == 0) \
-                        dev_priv->gt.force_wake_put(dev_priv); \
-                spin_unlock_irqrestore(&dev_priv->gt_lock, irqflags); \
-        } else { \
-                val = read##y(dev_priv->regs + reg); \
-        } \
-        trace_i915_reg_rw(false, reg, val, sizeof(val)); \
-        return val; \
-}
-
-__i915_read(8, b)
-__i915_read(16, w)
-__i915_read(32, l)
-__i915_read(64, q)
-#undef __i915_read
-
-#define __i915_write(x, y) \
-void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val) { \
-        u32 __fifo_ret = 0; \
-        trace_i915_reg_rw(true, reg, val, sizeof(val)); \
-        if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \
-                __fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \
-        } \
-        if (IS_GEN5(dev_priv->dev)) \
-                ilk_dummy_write(dev_priv); \
-        hsw_unclaimed_reg_clear(dev_priv, reg); \
-        write##y(val, dev_priv->regs + reg); \
-        if (unlikely(__fifo_ret)) { \
-                gen6_gt_check_fifodbg(dev_priv); \
-        } \
-        hsw_unclaimed_reg_check(dev_priv, reg); \
-}
-__i915_write(8, b)
-__i915_write(16, w)
-__i915_write(32, l)
-__i915_write(64, q)
-#undef __i915_write
-
-static const struct register_whitelist {
-        uint64_t offset;
-        uint32_t size;
-        uint32_t gen_bitmask; /* support gens, 0x10 for 4, 0x30 for 4 and 5, etc. */
-} whitelist[] = {
-        { RING_TIMESTAMP(RENDER_RING_BASE), 8, 0xF0 },
-};
-
-int i915_reg_read_ioctl(struct drm_device *dev,
-                        void *data, struct drm_file *file)
-{
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        struct drm_i915_reg_read *reg = data;
-        struct register_whitelist const *entry = whitelist;
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(whitelist); i++, entry++) {
-                if (entry->offset == reg->offset &&
-                    (1 << INTEL_INFO(dev)->gen & entry->gen_bitmask))
-                        break;
-        }
-
-        if (i == ARRAY_SIZE(whitelist))
-                return -EINVAL;
-
-        switch (entry->size) {
-        case 8:
-                reg->val = I915_READ64(reg->offset);
-                break;
-        case 4:
-                reg->val = I915_READ(reg->offset);
-                break;
-        case 2:
-                reg->val = I915_READ16(reg->offset);
-                break;
-        case 1:
-                reg->val = I915_READ8(reg->offset);
-                break;
-        default:
-                WARN_ON(1);
-                return -EINVAL;
-        }
-
-        return 0;
-}