drm/i915: add unclaimed register checks to BDW
Subsystems (2)
PATCH 1/1 drm/i915: add unclaimed register checks to BDW
From: Paulo Zanoni <[email protected]>
Just like we do to Haswell.
Signed-off-by Paulo Zanoni <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/intel_uncore.c | 2 ++ 2 files changed, 4 insertions(+)
This patch is totally untested! Only checked against the spec.
drivers/gpu/drm/i915/i915_drv.c +2 -0
@@ -265,6 +265,7 @@ static const struct intel_device_info intel_broadwell_d_info = { .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, .has_llc = 1, .has_ddi = 1, + .has_fpga_dbg = 1, GEN_DEFAULT_PIPEOFFSETS, };
@@ -274,6 +275,7 @@ static const struct intel_device_info intel_broadwell_m_info = { .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, .has_llc = 1, .has_ddi = 1, + .has_fpga_dbg = 1, GEN_DEFAULT_PIPEOFFSETS, };
drivers/gpu/drm/i915/intel_uncore.c +2 -0
@@ -657,11 +657,13 @@ gen8_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace dev_priv->uncore.funcs.force_wake_get (dev_priv, \FORCEWAKE_ALL ); \ } \ +hsw_unclaimed_reg_clear (dev_priv, reg); \ __raw_i915_write##x(dev_priv, reg, val); \ if (__needs_put) { \ dev_priv->uncore.funcs.force_wake_put(dev_priv, \ FORCEWAKE_ALL); \ } \ + hsw_unclaimed_reg_check(dev_priv, reg); \ REG_WRITE_FOOTER; \ }
Signature · 1 line
1.8.5.3
Quoted 42 lines · Paulo Zanoni
From: Paulo Zanoni <[email protected]>
Just like we do to Haswell.
Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/intel_uncore.c | 2 ++ 2 files changed, 4 insertions(+)This patch is totally untested! Only checked against the spec.
drivers/gpu/drm/i915/i915_drv.c +2
-0@@ -265,6 +265,7 @@ static const struct intel_device_info intel_broadwell_d_info = { .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, .has_llc = 1, .has_ddi = 1, + .has_fpga_dbg = 1, GEN_DEFAULT_PIPEOFFSETS, };@@ -274,6 +275,7 @@ static const struct intel_device_info intel_broadwell_m_info = { .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, .has_llc = 1, .has_ddi = 1, + .has_fpga_dbg = 1, GEN_DEFAULT_PIPEOFFSETS, };drivers/gpu/drm/i915/intel_uncore.c +0
-0@@ -657,11 +657,13 @@ gen8_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace dev_priv->uncore.funcs.force_wake_get (dev_priv, \FORCEWAKE_ALL ); \ } \
drivers/gpu/drm/i915/intel_uncore.c gen8_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace · line 669
Quoted 10 lines
drivers/gpu/drm/i915/intel_uncore.c +2
-0+hsw_unclaimed_reg_clear (dev_priv, reg); \ __raw_i915_write##x(dev_priv, reg, val); \ if (__needs_put) { \ dev_priv->uncore.funcs.force_wake_put(dev_priv, \ FORCEWAKE_ALL); \ } \ + hsw_unclaimed_reg_check(dev_priv, reg); \ REG_WRITE_FOOTER; \ }
Would you mind rebasing this on Mika's recent fix here?
http://patchwork.freedesktop.org/patch/20798/
Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center