| Message ID | 1417628004-16195-1-git-send-email-damien.lespiau@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Dec 03, 2014 at 05:33:24PM +0000, Damien Lespiau wrote: > When playing around with debugfs and a HSW machine I noticed that we > were displaying some garbled value in i915_ddb_info. This debugfs file > is only meaningful for gen9+, so don't display anything on earlier > platforms. > > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 6c16939..d0e445e 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -2743,6 +2743,9 @@ static int i915_ddb_info(struct seq_file *m, void *unused) > enum pipe pipe; > int plane; > > + if (INTEL_INFO(dev)->gen < 9) > + return 0; -ENODEV or somesuch? But I guess we're not too consistent how we deal with such things, so seems OK as is too: Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > + > drm_modeset_lock_all(dev); > > ddb = &dev_priv->wm.skl_hw.ddb; > -- > 1.8.3.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 364/364 364/364
ILK +1 365/366 366/366
SNB 450/450 450/450
IVB 498/498 498/498
BYT 289/289 289/289
HSW 564/564 564/564
BDW 417/417 417/417
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
ILK igt_kms_flip_wf_vblank-ts-check DMESG_WARN(2, M26)PASS(15, M26M37) PASS(1, M37)
Note: You need to pay more attention to line start with '*'
On Wed, Dec 03, 2014 at 10:19:24PM +0200, Ville Syrjälä wrote: > On Wed, Dec 03, 2014 at 05:33:24PM +0000, Damien Lespiau wrote: > > When playing around with debugfs and a HSW machine I noticed that we > > were displaying some garbled value in i915_ddb_info. This debugfs file > > is only meaningful for gen9+, so don't display anything on earlier > > platforms. > > > > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> > > --- > > drivers/gpu/drm/i915/i915_debugfs.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > > index 6c16939..d0e445e 100644 > > --- a/drivers/gpu/drm/i915/i915_debugfs.c > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > > @@ -2743,6 +2743,9 @@ static int i915_ddb_info(struct seq_file *m, void *unused) > > enum pipe pipe; > > int plane; > > > > + if (INTEL_INFO(dev)->gen < 9) > > + return 0; > > -ENODEV or somesuch? But I guess we're not too consistent how we deal > with such things, so seems OK as is too: > > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Queued for -next, thanks for the patch. -Daniel
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 6c16939..d0e445e 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2743,6 +2743,9 @@ static int i915_ddb_info(struct seq_file *m, void *unused) enum pipe pipe; int plane; + if (INTEL_INFO(dev)->gen < 9) + return 0; + drm_modeset_lock_all(dev); ddb = &dev_priv->wm.skl_hw.ddb;
When playing around with debugfs and a HSW machine I noticed that we were displaying some garbled value in i915_ddb_info. This debugfs file is only meaningful for gen9+, so don't display anything on earlier platforms. Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 3 +++ 1 file changed, 3 insertions(+)