| Message ID | 1433682144-11741-5-git-send-email-akash.goel@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
I'd prefer 2 separated patches, but seems correct anyway so: Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> On Sun, Jun 7, 2015 at 6:02 AM, <akash.goel@intel.com> wrote: > From: Akash Goel <akash.goel@intel.com> > > Corrected the platform checks in i915_ring_freq_table debugfs function > so as to allow the read of ring frequency table for BDW and disallow for VLV > > Issue: VIZ-5144 > Signed-off-by: Akash Goel <akash.goel@intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 47636f3..1c83596 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1779,7 +1779,8 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) > int ret = 0; > int gpu_freq, ia_freq; > > - if (!(IS_GEN6(dev) || IS_GEN7(dev))) { > + if (!(IS_GEN6(dev) || (IS_GEN7(dev) && !IS_VALLEYVIEW(dev)) || > + IS_BROADWELL(dev))) { > seq_puts(m, "unsupported on this chipset\n"); > return 0; > } > -- > 1.9.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Sun, Jun 07, 2015 at 06:32:23PM +0530, akash.goel@intel.com wrote: > From: Akash Goel <akash.goel@intel.com> > > Corrected the platform checks in i915_ring_freq_table debugfs function > so as to allow the read of ring frequency table for BDW and disallow for VLV > > Issue: VIZ-5144 > Signed-off-by: Akash Goel <akash.goel@intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 47636f3..1c83596 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -1779,7 +1779,8 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) > int ret = 0; > int gpu_freq, ia_freq; > > - if (!(IS_GEN6(dev) || IS_GEN7(dev))) { > + if (!(IS_GEN6(dev) || (IS_GEN7(dev) && !IS_VALLEYVIEW(dev)) || > + IS_BROADWELL(dev))) { This is really hard to read with the double negation. What about if (gen < 6 || IS_VLV(dev)) /* not supported */ instaed? Presuming I decoded this correctly ... -Daniel > seq_puts(m, "unsupported on this chipset\n"); > return 0; > } > -- > 1.9.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, 2015-06-15 at 15:15 +0200, Daniel Vetter wrote: > On Sun, Jun 07, 2015 at 06:32:23PM +0530, akash.goel@intel.com wrote: > > From: Akash Goel <akash.goel@intel.com> > > > > Corrected the platform checks in i915_ring_freq_table debugfs function > > so as to allow the read of ring frequency table for BDW and disallow for VLV > > > > Issue: VIZ-5144 > > Signed-off-by: Akash Goel <akash.goel@intel.com> > > --- > > drivers/gpu/drm/i915/i915_debugfs.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > > index 47636f3..1c83596 100644 > > --- a/drivers/gpu/drm/i915/i915_debugfs.c > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > > @@ -1779,7 +1779,8 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) > > int ret = 0; > > int gpu_freq, ia_freq; > > > > - if (!(IS_GEN6(dev) || IS_GEN7(dev))) { > > + if (!(IS_GEN6(dev) || (IS_GEN7(dev) && !IS_VALLEYVIEW(dev)) || > > + IS_BROADWELL(dev))) { > > This is really hard to read with the double negation. What about > > if (gen < 6 || IS_VLV(dev)) > /* not supported */ > > instaed? Presuming I decoded this correctly ... Yes this way also it is fine. Will make this change. Accordingly the next patch will also change, like this if (gen < 6 || IS_VLV(dev) || IS_BROXTON(dev)) /* not supported */ Best regards Akash > -Daniel > > seq_puts(m, "unsupported on this chipset\n"); > > return 0; > > } > > -- > > 1.9.2 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 47636f3..1c83596 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1779,7 +1779,8 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) int ret = 0; int gpu_freq, ia_freq; - if (!(IS_GEN6(dev) || IS_GEN7(dev))) { + if (!(IS_GEN6(dev) || (IS_GEN7(dev) && !IS_VALLEYVIEW(dev)) || + IS_BROADWELL(dev))) { seq_puts(m, "unsupported on this chipset\n"); return 0; }