diff mbox

drm/i915: Show dmc debug registers on Kabylake

Message ID 1494324322-28193-1-git-send-email-mika.kuoppala@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Mika Kuoppala May 9, 2017, 10:05 a.m. UTC
The assumption is that the registers offsets are
identical as with skl. Also all the published
kbl firmwares support the debug registers. So
let kbl show the debug counts.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100975
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Imre Deak May 9, 2017, 10:15 a.m. UTC | #1
On Tue, May 09, 2017 at 01:05:22PM +0300, Mika Kuoppala wrote:
> The assumption is that the registers offsets are
> identical as with skl. Also all the published
> kbl firmwares support the debug registers. So
> let kbl show the debug counts.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100975
> Cc: Imre Deak <imre.deak@intel.com>
> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>

Reviewed-by: Imre Deak <imre.deak@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 1003511..34785fb 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2853,7 +2853,8 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
>  	seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
>  		   CSR_VERSION_MINOR(csr->version));
>  
> -	if (IS_SKYLAKE(dev_priv) && csr->version >= CSR_VERSION(1, 6)) {
> +	if (IS_KABYLAKE(dev_priv) ||
> +	    (IS_SKYLAKE(dev_priv) && csr->version >= CSR_VERSION(1, 6))) {
>  		seq_printf(m, "DC3 -> DC5 count: %d\n",
>  			   I915_READ(SKL_CSR_DC3_DC5_COUNT));
>  		seq_printf(m, "DC5 -> DC6 count: %d\n",
> -- 
> 2.7.4
>
Mika Kuoppala May 9, 2017, 1:16 p.m. UTC | #2
Imre Deak <imre.deak@intel.com> writes:

> On Tue, May 09, 2017 at 01:05:22PM +0300, Mika Kuoppala wrote:
>> The assumption is that the registers offsets are
>> identical as with skl. Also all the published
>> kbl firmwares support the debug registers. So
>> let kbl show the debug counts.
>> 
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100975
>> Cc: Imre Deak <imre.deak@intel.com>
>> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
>
> Reviewed-by: Imre Deak <imre.deak@intel.com>

Pushed. Thanks for review!
-Mika


>
>> ---
>>  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 1003511..34785fb 100644
>> --- a/drivers/gpu/drm/i915/i915_debugfs.c
>> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
>> @@ -2853,7 +2853,8 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
>>  	seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
>>  		   CSR_VERSION_MINOR(csr->version));
>>  
>> -	if (IS_SKYLAKE(dev_priv) && csr->version >= CSR_VERSION(1, 6)) {
>> +	if (IS_KABYLAKE(dev_priv) ||
>> +	    (IS_SKYLAKE(dev_priv) && csr->version >= CSR_VERSION(1, 6))) {
>>  		seq_printf(m, "DC3 -> DC5 count: %d\n",
>>  			   I915_READ(SKL_CSR_DC3_DC5_COUNT));
>>  		seq_printf(m, "DC5 -> DC6 count: %d\n",
>> -- 
>> 2.7.4
>>
Mika Kuoppala May 10, 2017, 8:01 a.m. UTC | #3
Nathan Ciobanu <nathan.d.ciobanu@linux.intel.com> writes:

> On Tue, May 09, 2017 at 04:16:12PM +0300, Mika Kuoppala wrote:
>> Imre Deak <imre.deak@intel.com> writes:
>> 
>> > On Tue, May 09, 2017 at 01:05:22PM +0300, Mika Kuoppala wrote:
>> >> The assumption is that the registers offsets are
>> >> identical as with skl. Also all the published
>> >> kbl firmwares support the debug registers. So
>> >> let kbl show the debug counts.
>> >> 
>> >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100975
>> >> Cc: Imre Deak <imre.deak@intel.com>
>> >> Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
>> >
>> > Reviewed-by: Imre Deak <imre.deak@intel.com>
>> 
>> Pushed. Thanks for review!
>> -Mika
> Mika, the initial version of the KBL DMC firmware is 1.01 so
> because CSR_VERSION is checking for >1.6 this will

I am quite certain that it checks the version only with skl.
-Mika

> still not work. See Rodrigo's original patch that added it to
> linux-firmware:
> https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=9facc31d772a3ed399760d2168d644f9de84d6db
>> 
>> 
>> >
>> >> ---
>> >>  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 1003511..34785fb 100644
>> >> --- a/drivers/gpu/drm/i915/i915_debugfs.c
>> >> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
>> >> @@ -2853,7 +2853,8 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
>> >>  	seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
>> >>  		   CSR_VERSION_MINOR(csr->version));
>> >>  
>> >> -	if (IS_SKYLAKE(dev_priv) && csr->version >= CSR_VERSION(1, 6)) {
>> >> +	if (IS_KABYLAKE(dev_priv) ||
>> >> +	    (IS_SKYLAKE(dev_priv) && csr->version >= CSR_VERSION(1, 6))) {
>> >>  		seq_printf(m, "DC3 -> DC5 count: %d\n",
>> >>  			   I915_READ(SKL_CSR_DC3_DC5_COUNT));
>> >>  		seq_printf(m, "DC5 -> DC6 count: %d\n",
>> >> -- 
>> >> 2.7.4
>> >> 
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 1003511..34785fb 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2853,7 +2853,8 @@  static int i915_dmc_info(struct seq_file *m, void *unused)
 	seq_printf(m, "version: %d.%d\n", CSR_VERSION_MAJOR(csr->version),
 		   CSR_VERSION_MINOR(csr->version));
 
-	if (IS_SKYLAKE(dev_priv) && csr->version >= CSR_VERSION(1, 6)) {
+	if (IS_KABYLAKE(dev_priv) ||
+	    (IS_SKYLAKE(dev_priv) && csr->version >= CSR_VERSION(1, 6))) {
 		seq_printf(m, "DC3 -> DC5 count: %d\n",
 			   I915_READ(SKL_CSR_DC3_DC5_COUNT));
 		seq_printf(m, "DC5 -> DC6 count: %d\n",