<div dir="ltr">Reviewed-by: Rodrigo Vivi <<a href="mailto:rodrigo.vivi@intel.com">rodrigo.vivi@intel.com</a>></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Jul 4, 2014 at 7:50 AM, Paulo Zanoni <span dir="ltr"><<a href="mailto:przanoni@gmail.com" target="_blank">przanoni@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Paulo Zanoni <<a href="mailto:paulo.r.zanoni@intel.com">paulo.r.zanoni@intel.com</a>><br>
<br>
By the time I wrote this patch, it allowed me to catch some problems.<br>
But due to patch reordering - in order to prevent fake "regression"<br>
reports - this patch may be merged after the fixes of the problems<br>
identified by this patch.<br>
<br>
Signed-off-by: Paulo Zanoni <<a href="mailto:paulo.r.zanoni@intel.com">paulo.r.zanoni@intel.com</a>><br>
---<br>
 drivers/gpu/drm/i915/i915_drv.c     | 4 ++++<br>
 drivers/gpu/drm/i915/intel_uncore.c | 3 +++<br>
 2 files changed, 7 insertions(+)<br>
<br>
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c<br>
index 8a0cb0c..bdb223c 100644<br>
--- a/drivers/gpu/drm/i915/i915_drv.c<br>
+++ b/drivers/gpu/drm/i915/i915_drv.c<br>
@@ -303,6 +303,7 @@ static const struct intel_device_info intel_broadwell_d_info = {<br>
        .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,<br>
        .has_llc = 1,<br>
        .has_ddi = 1,<br>
+       .has_fpga_dbg = 1,<br>
        .has_fbc = 1,<br>
        GEN_DEFAULT_PIPEOFFSETS,<br>
        IVB_CURSOR_OFFSETS,<br>
@@ -314,6 +315,7 @@ static const struct intel_device_info intel_broadwell_m_info = {<br>
        .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,<br>
        .has_llc = 1,<br>
        .has_ddi = 1,<br>
+       .has_fpga_dbg = 1,<br>
        .has_fbc = 1,<br>
        GEN_DEFAULT_PIPEOFFSETS,<br>
        IVB_CURSOR_OFFSETS,<br>
@@ -325,6 +327,7 @@ static const struct intel_device_info intel_broadwell_gt3d_info = {<br>
        .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,<br>
        .has_llc = 1,<br>
        .has_ddi = 1,<br>
+       .has_fpga_dbg = 1,<br>
        .has_fbc = 1,<br>
        GEN_DEFAULT_PIPEOFFSETS,<br>
        IVB_CURSOR_OFFSETS,<br>
@@ -336,6 +339,7 @@ static const struct intel_device_info intel_broadwell_gt3m_info = {<br>
        .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,<br>
        .has_llc = 1,<br>
        .has_ddi = 1,<br>
+       .has_fpga_dbg = 1,<br>
        .has_fbc = 1,<br>
        GEN_DEFAULT_PIPEOFFSETS,<br>
        IVB_CURSOR_OFFSETS,<br>
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c<br>
index de5402f..1fcf78b 100644<br>
--- a/drivers/gpu/drm/i915/intel_uncore.c<br>
+++ b/drivers/gpu/drm/i915/intel_uncore.c<br>
@@ -788,6 +788,7 @@ static bool is_gen8_shadowed(struct drm_i915_private *dev_priv, u32 reg)<br>
 static void \<br>
 gen8_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace) { \<br>
        REG_WRITE_HEADER; \<br>
+       hsw_unclaimed_reg_debug(dev_priv, reg, false, true); \<br>
        if (reg < 0x40000 && !is_gen8_shadowed(dev_priv, reg)) { \<br>
                if (dev_priv->uncore.forcewake_count == 0) \<br>
                        dev_priv->uncore.funcs.force_wake_get(dev_priv, \<br>
@@ -799,6 +800,8 @@ gen8_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace<br>
        } else { \<br>
                __raw_i915_write##x(dev_priv, reg, val); \<br>
        } \<br>
+       hsw_unclaimed_reg_debug(dev_priv, reg, false, false); \<br>
+       hsw_unclaimed_reg_detect(dev_priv); \<br>
        REG_WRITE_FOOTER; \<br>
 }<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.0.0<br>
<br>
_______________________________________________<br>
Intel-gfx mailing list<br>
<a href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/intel-gfx" target="_blank">http://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Rodrigo Vivi</div><div>Blog: <a href="http://blog.vivi.eng.br" target="_blank">http://blog.vivi.eng.br</a></div><div> </div>
</div>