diff mbox

drm/i915: fixup l3 parity sysfs access check

Message ID 1354697534-32242-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter Dec. 5, 2012, 8:52 a.m. UTC
When l3 parity support for Haswell was enabled in

commit f27b92651d72e863c308ea5dca5615fc98e38ca6
Author: Ben Widawsky <benjamin.widawsky@intel.com>
Date:   Tue Jul 24 20:47:32 2012 -0700

    drm/i915: Expand DPF support to Haswell

no one noticed that the patch which introduced this macro

commit e1ef7cc299839e68dae3f1843f62e52acda04538
Author: Ben Widawsky <benjamin.widawsky@intel.com>
Date:   Tue Jul 24 20:47:31 2012 -0700

    drm/i915: Macro to determine DPF support

missed one spot. Fix this.

Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57441
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/i915_sysfs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ben Widawsky Dec. 5, 2012, 4:41 p.m. UTC | #1
On Wed,  5 Dec 2012 09:52:14 +0100
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> When l3 parity support for Haswell was enabled in
> 
> commit f27b92651d72e863c308ea5dca5615fc98e38ca6
> Author: Ben Widawsky <benjamin.widawsky@intel.com>
> Date:   Tue Jul 24 20:47:32 2012 -0700
> 
>     drm/i915: Expand DPF support to Haswell
> 
> no one noticed that the patch which introduced this macro
> 
> commit e1ef7cc299839e68dae3f1843f62e52acda04538
> Author: Ben Widawsky <benjamin.widawsky@intel.com>
> Date:   Tue Jul 24 20:47:31 2012 -0700
> 
>     drm/i915: Macro to determine DPF support
> 
> missed one spot. Fix this.
> 
> Cc: Ben Widawsky <benjamin.widawsky@intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57441
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Reviewed-by: Ben Widawsky <benjamin.widawsky@intel.com>

> ---
>  drivers/gpu/drm/i915/i915_sysfs.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_sysfs.c
> b/drivers/gpu/drm/i915/i915_sysfs.c index 3bf51d5..9462081 100644
> --- a/drivers/gpu/drm/i915/i915_sysfs.c
> +++ b/drivers/gpu/drm/i915/i915_sysfs.c
> @@ -97,7 +97,7 @@ static struct attribute_group rc6_attr_group = {
>  
>  static int l3_access_valid(struct drm_device *dev, loff_t offset)
>  {
> -	if (!IS_IVYBRIDGE(dev))
> +	if (!HAS_L3_GPU_CACHE(dev))
>  		return -EPERM;
>  
>  	if (offset % 4 != 0)
Daniel Vetter Dec. 5, 2012, 6:10 p.m. UTC | #2
On Wed, Dec 05, 2012 at 08:41:25AM -0800, Ben Widawsky wrote:
> On Wed,  5 Dec 2012 09:52:14 +0100
> Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> 
> > When l3 parity support for Haswell was enabled in
> > 
> > commit f27b92651d72e863c308ea5dca5615fc98e38ca6
> > Author: Ben Widawsky <benjamin.widawsky@intel.com>
> > Date:   Tue Jul 24 20:47:32 2012 -0700
> > 
> >     drm/i915: Expand DPF support to Haswell
> > 
> > no one noticed that the patch which introduced this macro
> > 
> > commit e1ef7cc299839e68dae3f1843f62e52acda04538
> > Author: Ben Widawsky <benjamin.widawsky@intel.com>
> > Date:   Tue Jul 24 20:47:31 2012 -0700
> > 
> >     drm/i915: Macro to determine DPF support
> > 
> > missed one spot. Fix this.
> > 
> > Cc: Ben Widawsky <benjamin.widawsky@intel.com>
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57441
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> Reviewed-by: Ben Widawsky <benjamin.widawsky@intel.com>

Picked up for -fixes, thanks for the review.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index 3bf51d5..9462081 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -97,7 +97,7 @@  static struct attribute_group rc6_attr_group = {
 
 static int l3_access_valid(struct drm_device *dev, loff_t offset)
 {
-	if (!IS_IVYBRIDGE(dev))
+	if (!HAS_L3_GPU_CACHE(dev))
 		return -EPERM;
 
 	if (offset % 4 != 0)