drm/i915: Fix l3 parity buffer offset
Subsystems (2)
PATCH 1/2 drm/i915: Fix l3 parity buffer offset
The buf pointer used during l3_write is just char *, therefore it does not require the silly /4.
--- drivers/gpu/drm/i915/i915_sysfs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_sysfs.c +1 -3
@@ -184,9 +184,7 @@ i915_l3_write(struct file *filp, struct kobject *kobj,if (temp) dev_priv->l3_parity.remap_info = temp; -memcpy (dev_priv->l3_parity.remap_info + (offset/4 ), - buf + (offset/4 ), - count); +memcpy (dev_priv->l3_parity.remap_info + (offset/4 ), buf, count);i915_gem_l3_remap (drm_dev);
Signature · 1 line
1.8.4
PATCH 2/2 drm/i915: Fix HSW parity test
Haswell changed the log registers to be WO, so we can no longer read them to determine the programming (which sucks, see later note). For now, simply use the cached value, and hope HW doesn't screw us over.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57441
---
Notes:
I'll be able to parity tester feature shortly, so hopefully the current gap will be filled.
Also coming up will be support for the 2nd L3 slice.
drivers/gpu/drm/i915/i915_sysfs.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/i915/i915_sysfs.c +14 -0
@@ -129,6 +129,19 @@ i915_l3_read(struct file *filp, struct kobject *kobj,if (ret)return ret; +if (IS_HASWELL (drm_dev)) { +int last =min_t (int,GEN7_L3LOG_SIZE , count + offset); +if ((!dev_priv->l3_parity.remap_info)) +memset (buf + offset,0 , last - offset); +else +memcpy (buf + offset, + dev_priv->l3_parity.remap_info + (offset/4 ), + last - offset); + + i = last; + goto out; + } + misccpctl =I915_READ (GEN7_MISCCPCTL );I915_WRITE (GEN7_MISCCPCTL , misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE );
@@ -137,6 +150,7 @@ i915_l3_read(struct file *filp, struct kobject *kobj,I915_WRITE (GEN7_MISCCPCTL , misccpctl); +out:mutex_unlock (&drm_dev->struct_mutex);return i - offset;
Signature · 1 line
1.8.4
Re: [PATCH 2/2] drm/i915: Fix HSW parity test
Quoted 6 lines · Ben Widawsky
Haswell changed the log registers to be WO, so we can no longer read them to determine the programming (which sucks, see later note). For now, simply use the cached value, and hope HW doesn't screw us over.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57441
Signed-off-by Ben Widawsky <[email protected]>
Quoted 50 lines
---
Notes:
I'll be able to parity tester feature shortly, so hopefully the current gap will be filled.Also coming up will be support for the 2nd L3 slice.
drivers/gpu/drm/i915/i915_sysfs.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/i915/i915_sysfs.c +14
-0@@ -129,6 +129,19 @@ i915_l3_read(struct file *filp, struct kobject *kobj,if (ret)return ret; +if (IS_HASWELL (drm_dev)) { +int last =min_t (int,GEN7_L3LOG_SIZE , count + offset); +if ((!dev_priv->l3_parity.remap_info)) +memset (buf + offset,0 , last - offset); +else +memcpy (buf + offset, + dev_priv->l3_parity.remap_info + (offset/4 ), + last - offset); + + i = last; + goto out; + } + misccpctl =I915_READ (GEN7_MISCCPCTL );I915_WRITE (GEN7_MISCCPCTL , misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE );@@ -137,6 +150,7 @@ i915_l3_read(struct file *filp, struct kobject *kobj,I915_WRITE (GEN7_MISCCPCTL , misccpctl); +out:mutex_unlock (&drm_dev->struct_mutex);return i - offset;Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch