On 2020-08-04 at 05:01:37 +0530, Souza, Jose wrote: > On Fri, 2020-07-24 at 14:39 -0700, Lucas De Marchi wrote: > > From: Anshuman Gupta < > > anshuman.gupta@xxxxxxxxx > > > > > > > DGFX devices have different DMC_DEBUG* counter MMIO address > > offset. Incorporate these changes in i915_reg.h for DG1 DC5/DC6 > > counter and handle i915_dmc_info accordingly. > > > > Cc: Uma Shankar < > > uma.shankar@xxxxxxxxx > > > > > Signed-off-by: Anshuman Gupta < > > anshuman.gupta@xxxxxxxxx > > > > > Signed-off-by: Lucas De Marchi < > > lucas.demarchi@xxxxxxxxx > > > > > --- > > drivers/gpu/drm/i915/display/intel_display_debugfs.c | 9 +++++++-- > > drivers/gpu/drm/i915/i915_reg.h | 2 ++ > > 2 files changed, 9 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > index 3644752cc5ec..e3536edcb394 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > @@ -515,8 +515,13 @@ static int i915_dmc_info(struct seq_file *m, void *unused) > > CSR_VERSION_MINOR(csr->version)); > > > > if (INTEL_GEN(dev_priv) >= 12) { > > - dc5_reg = TGL_DMC_DEBUG_DC5_COUNT; > > - dc6_reg = TGL_DMC_DEBUG_DC6_COUNT; > > + if (IS_DG1(dev_priv)) { > > + dc5_reg = DG1_DMC_DEBUG_DC5_COUNT; > > + } else { > > + dc5_reg = TGL_DMC_DEBUG_DC5_COUNT; > > + dc6_reg = TGL_DMC_DEBUG_DC6_COUNT; > > + } > > + > > /* > > * NOTE: DMC_DEBUG3 is a general purpose reg. > > * According to B.Specs:49196 DMC f/w reuses DC5/6 counter > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > > index 4e95312eba24..78bdce67da08 100644 > > --- a/drivers/gpu/drm/i915/i915_reg.h > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > @@ -7549,6 +7549,8 @@ enum { > > #define BXT_CSR_DC3_DC5_COUNT _MMIO(0x80038) > > #define TGL_DMC_DEBUG_DC5_COUNT _MMIO(0x101084) > > #define TGL_DMC_DEBUG_DC6_COUNT _MMIO(0x101088) > > +#define DG1_DMC_DEBUG_DC5_COUNT _MMIO(0x134154) > > +#define DG1_DMC_DEBUG_DC6_COUNT _MMIO(0x134158) > > DG1_DMC_DEBUG_DC6_COUNT is not used as DG1 do not support DC6. > Removing it: DG1_DMC_DEBUG_DC6_COUNT is still valid DMC_DEBUG counter for future igfx platforms, considering name consistency it has been kept with name DG1_* inline to B.Spec Index:49787. Thanks, Anshuman Gupta. > > Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx> > > > > > > #define DMC_DEBUG3 _MMIO(0x101090) > > > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx