summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_perf.c
diff options
context:
space:
mode:
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>2017-11-10 19:08:39 +0000
committerLionel Landwerlin <lionel.g.landwerlin@intel.com>2017-11-13 15:59:00 +0000
commita54b19f17746b9574c30acb8cefca75ed5de0f9f (patch)
tree5346017e79d2a10647c630ea33c8d626555bda60 /drivers/gpu/drm/i915/i915_perf.c
parent10bf0a38c4084c14c57df5d635a5ba0867a3c260 (diff)
downloadlinux-stable-a54b19f17746b9574c30acb8cefca75ed5de0f9f.tar.gz
linux-stable-a54b19f17746b9574c30acb8cefca75ed5de0f9f.tar.bz2
linux-stable-a54b19f17746b9574c30acb8cefca75ed5de0f9f.zip
drm/i915/perf: complete whitelisting for OA programming on HSW
We were missing some registers and also can name one for which we only had the offset. Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Reviewed-by: Matthew Auld <matthew.auld@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171110190845.32574-2-lionel.g.landwerlin@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_perf.c')
-rw-r--r--drivers/gpu/drm/i915/i915_perf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 59ee808f8fd9..45aef15b9e7c 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -3023,7 +3023,8 @@ static bool hsw_is_valid_mux_addr(struct drm_i915_private *dev_priv, u32 addr)
{
return gen7_is_valid_mux_addr(dev_priv, addr) ||
(addr >= 0x25100 && addr <= 0x2FF90) ||
- addr == 0x9ec0;
+ (addr >= HSW_MBVID2_NOA0.reg && addr <= HSW_MBVID2_NOA9.reg) ||
+ addr == HSW_MBVID2_MISR0.reg;
}
static bool chv_is_valid_mux_addr(struct drm_i915_private *dev_priv, u32 addr)