]> Pileus Git - ~andy/linux/commitdiff
drm/i915: remove intel_uncore_clear_errors
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 16 Nov 2013 15:02:04 +0000 (16:02 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 18 Nov 2013 16:52:33 +0000 (17:52 +0100)
This was forgotten in

commit 9d1cb9147dbe45f6e94dc796518ecf67cb64b359
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date:   Fri Nov 1 13:32:08 2013 -0200

    drm/i915: avoid unclaimed registers when capturing the error state

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_uncore.c

index 6b96e91c6f1af859616f2cd268a3710e4c16ea5d..18ff544670d86978d0ce09310d3775de9970f792 100644 (file)
@@ -1920,7 +1920,6 @@ extern void intel_pm_init(struct drm_device *dev);
 extern void intel_uncore_sanitize(struct drm_device *dev);
 extern void intel_uncore_early_sanitize(struct drm_device *dev);
 extern void intel_uncore_init(struct drm_device *dev);
-extern void intel_uncore_clear_errors(struct drm_device *dev);
 extern void intel_uncore_check_errors(struct drm_device *dev);
 extern void intel_uncore_fini(struct drm_device *dev);
 
index 5103d80fc3ae09f201e2bbbd12433873ca86a840..07c0ad0e1583b2e35b40b1b223edeb26fa85457a 100644 (file)
@@ -828,15 +828,6 @@ int intel_gpu_reset(struct drm_device *dev)
        }
 }
 
-void intel_uncore_clear_errors(struct drm_device *dev)
-{
-       struct drm_i915_private *dev_priv = dev->dev_private;
-
-       /* XXX needs spinlock around caller's grouping */
-       if (HAS_FPGA_DBG_UNCLAIMED(dev))
-               __raw_i915_write32(dev_priv, FPGA_DBG, FPGA_DBG_RM_NOCLAIM);
-}
-
 void intel_uncore_check_errors(struct drm_device *dev)
 {
        struct drm_i915_private *dev_priv = dev->dev_private;