drm/i915: Collect gtier properly on HSW.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/2 drm/i915: Collect gtier properly on HSW.
GTIER and DEIER doesn't have same interface on HSW so this "or" operation makes the information provided useless.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -314,6 +314,7 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; +u32 gtier;u32 ccid;u32 derrmr;u32 forcewake;
drivers/gpu/drm/i915/i915_gpu_error.c +10 -6
@@ -359,6 +359,8 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_HASWELL (dev)) +err_printf (m,"GTIER: 0x%08x\n" , error->gtier);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);
@@ -1135,13 +1137,15 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) +if (IS_HASWELL (dev)) { + error->ier =I915_READ (DEIER ); + error->gtier =I915_READ (GTIER ); + }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ) |I915_READ (GTIER ); -else { -if (IS_GEN2 (dev)) - error->ier =I915_READ16 (IER ); -else - error->ier =I915_READ (IER ); + }else if (IS_GEN2 (dev)) { + error->ier =I915_READ16 (IER ); + }else { + error->ier =I915_READ (IER ); }/* 4: Everything else */
Signature · 1 line
1.9.3
Rodrigo Vivi
maintainerPATCH 2/2 drm/i915: Fix DEIER and GTIER collecting for BDW.
BDW has many other Display Engine interrupts and GT interrupts registers. Collecting it properly on gpu_error_state.
On debugfs all was properly listed already but besides we were also listing old DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:
https://bugs.freedesktop.org/show_bug.cgi?id=81701
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 4 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 23 ++++++++++++++++++++--- 3 files changed, 24 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -783,7 +783,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"Pipe %c stat: %08x\n" ,pipe_name (pipe),I915_READ (PIPESTAT (pipe))); - }else { + }else if (!IS_BROADWELL (dev)) {seq_printf (m,"North Display Interrupt enable: %08x\n" ,I915_READ (DEIER )); seq_printf(m, "North Display Interrupt identity: %08x\n",
drivers/gpu/drm/i915/i915_drv.h +3 -1
@@ -314,7 +314,9 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ]; +u32 deier[3 ]; +u32 de_misc_ier;u32 ccid;u32 derrmr;u32 forcewake;
drivers/gpu/drm/i915/i915_gpu_error.c +20 -3
@@ -358,9 +358,19 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"Suspend count: %u\n" , error->suspend_count);err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir); -err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_BROADWELL (dev)) { +for_each_pipe (i) +err_printf (m,"DEIER pipe %c: 0x%08x\n" ,pipe_name (i), + error->deier[i]); +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); +err_printf (m,"DE_MISC_IER: 0x%08x\n" , error->de_misc_ier); + }else { +err_printf (m,"IER: 0x%08x\n" , error->ier); + }if (IS_HASWELL (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);
@@ -1093,6 +1103,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, struct drm_i915_error_state *error) {struct drm_device *dev = dev_priv->dev; +int i;/* General organization * 1. Registers specific to a single generation
@@ -1139,7 +1150,13 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (IS_HASWELL (dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); + }else if (IS_BROADWELL (dev)) { +for_each_pipe (i) + error->deier[i] =I915_READ (GEN8_DE_PIPE_IER (i)); +for (i =0 ; i <4 ; i++) + error->gtier[3 ] =I915_READ (GEN8_GT_IER (i)); + error->de_misc_ier =I915_READ (GEN8_DE_MISC_IER ); }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ) |I915_READ (GTIER ); }else if (IS_GEN2 (dev)) {
Signature · 1 line
1.9.3
Re: [PATCH 2/2] drm/i915: Fix DEIER and GTIER collecting for BDW.
2014-07-28 12:19 GMT-03:00 Rodrigo Vivi <[email protected]>:
Quoted 22 lines
BDW has many other Display Engine interrupts and GT interrupts registers. Collecting it properly on
gpu_error_state.On debugfs all was properly listed already but besides we were also listing old DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:
https://bugs.freedesktop.org/show_bug.cgi?id=81701
Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 4 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 23 ++++++++++++++++++++--- 3 files changed, 24 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0
drivers/gpu/drm/i915/i915_debugfs.c static int i915_interrupt_info(struct seq_file *m, void *data) · line 789
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -783,7 +783,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"Pipe %c stat: %08x\n" ,pipe_name (pipe),I915_READ (PIPESTAT (pipe))); - }else { + }else if (!IS_BROADWELL (dev)) {seq_printf (m,"North Display Interrupt enable: %08x\n" ,I915_READ (DEIER )); seq_printf(m, "North Display Interrupt identity: %08x\n",
This chunk is not needed since we already have a check for "gen >= 8" at the top.
Quoted 50 lines
drivers/gpu/drm/i915/i915_drv.h +3
-1@@ -314,7 +314,9 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ]; +u32 deier[3 ]; +u32 de_misc_ier;u32 ccid;u32 derrmr;u32 forcewake;drivers/gpu/drm/i915/i915_gpu_error.c +13
-2@@ -358,9 +358,19 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"Suspend count: %u\n" , error->suspend_count);err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir); -err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_BROADWELL (dev)) { +for_each_pipe (i) +err_printf (m,"DEIER pipe %c: 0x%08x\n" ,pipe_name (i), + error->deier[i]); +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); +err_printf (m,"DE_MISC_IER: 0x%08x\n" , error->de_misc_ier); + }else { +err_printf (m,"IER: 0x%08x\n" , error->ier); + }if (IS_HASWELL (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);@@ -1093,6 +1103,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, struct drm_i915_error_state *error) {struct drm_device *dev = dev_priv->dev; +int i;/* General organization * 1. Registers specific to a single generation
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct drm_i915_private *dev_priv, · line 1156
Quoted 8 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4
-1@@ -1139,7 +1150,13 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (IS_HASWELL (dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); + }else if (IS_BROADWELL (dev)) { +for_each_pipe (i) + error->deier[i] =I915_READ (GEN8_DE_PIPE_IER (i));
for_each_pipe(i)
if (intel_display_power_enabled(dev_priv, POWER_DOMAIN_PIPE(i)))
error->deier[i] = I915_READ(GEN8_DE_PIPE_IER(i));
If the pipe's power well is disabled, the IER register is powered off and we can get an unclaimed register errors too.
I also just noticed that this function contains the "/* 4: Everything else */" comment twice. You could remove one :)
Quoted 13 lines
drivers/gpu/drm/i915/i915_gpu_error.c +3
-1+for (i =0 ; i <4 ; i++) + error->gtier[3 ] =I915_READ (GEN8_GT_IER (i)); + error->de_misc_ier =I915_READ (GEN8_DE_MISC_IER ); }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ) |I915_READ (GTIER ); }else if (IS_GEN2 (dev)) { --1.9.3
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Paulo Zanoni
Re: [PATCH 2/2] drm/i915: Fix DEIER and GTIER collecting for BDW.
Quoted 32 lines · Paulo Zanoni
2014-07-28 12:19 GMT-03:00 Rodrigo Vivi <[email protected]>:
Quoted 4 lines
BDW has many other Display Engine interrupts and GT interrupts registers. Collecting it properly on
gpu_error_state.On debugfs all was properly listed already but besides we were also
listing old
Quoted 7 lines
DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:
https://bugs.freedesktop.org/show_bug.cgi?id=81701
Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Review
Quoted 7 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 4 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 23 ++++++++++++++++++++--- 3 files changed, 24 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_debugfs.cdrivers/gpu/drm/i915/i915_debugfs.c static int i915_interrupt_info(struct seq_file *m,
Quoted 4 lines
index 9e737b7..679cda6 100644
drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -783,7 +783,7 @@ static int i915_interrupt_info(struct seq_file *m,void *data)
drivers/gpu/drm/i915/i915_debugfs.c static int i915_interrupt_info(struct seq_file *m, void *data)
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1seq_printf (m,"Pipe %c stat: %08x\n" ,pipe_name (pipe),I915_READ (PIPESTAT (pipe))); - }else { + }else if (!IS_BROADWELL (dev)) { seq_printf(m, "North Display Interrupt enable:
Quoted 8 lines
%08x\n",
drivers/gpu/drm/i915/i915_debugfs.c static int i915_interrupt_info(struct seq_file *m, · line 789
Quoted 2 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-0I915_READ(DEIER)); seq_printf(m, "North Display Interrupt identity:%08x\n",
This chunk is not needed since we already have a check for "gen >= 8" at the top.
oh, for a moment I thought it was messy as the other code and it was writing twice...
mainly when you mentioned that you could reproduce the unclaimed when reading debugfs...
but probably was related to the powerwell you mentioned below...
Quoted 68 lines
Review
Quoted 3 lines
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hReview
Quoted 15 lines
index ccb97f1..ee28cd7 100644
drivers/gpu/drm/i915/i915_drv.h +3
-1@@ -314,7 +314,9 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ]; +u32 deier[3 ]; +u32 de_misc_ier;u32 ccid;u32 derrmr;u32 forcewake;(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_gpu_error.cdrivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct
Quoted 4 lines
index 372fea3..f865d1d 100644
drivers/gpu/drm/i915/i915_gpu_error.c +0
-0@@ -358,9 +358,19 @@ int i915_error_state_to_str(struct
drm_i915_error_state_buf*m,drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
Quoted 7 lines
drivers/gpu/drm/i915/i915_gpu_error.c +3
-1err_printf (m,"Suspend count: %u\n" , error->suspend_count);err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir); -err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_BROADWELL (dev)) { +for_each_pipe (i) + err_printf(m, "DEIER pipe %c: 0x%08x\n",
pipe_name(i),drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
Quoted 5 lines
drivers/gpu/drm/i915/i915_gpu_error.c +5
-0+ error->deier[i]); +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); + err_printf(m, "DE_MISC_IER: 0x%08x\n",
error->de_misc_ier);drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct
Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4
-1+ }else { +err_printf (m,"IER: 0x%08x\n" , error->ier); + }if (IS_HASWELL (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);@@ -1093,6 +1103,7 @@ static void i915_capture_reg_state(struct
drm_i915_private*dev_priv,drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct
Quoted 8 lines
drivers/gpu/drm/i915/i915_gpu_error.c +1
-0struct drm_i915_error_state *error) {struct drm_device *dev = dev_priv->dev; +int i;/* General organization * 1. Registers specific to a single generation @@ -1139,7 +1150,13 @@ static void i915_capture_reg_state(struct
drm_i915_private*dev_priv,drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct drm_i915_private *dev_priv, · line 1156
Quoted 8 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4
-1if (IS_HASWELL (dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); + }else if (IS_BROADWELL (dev)) { +for_each_pipe (i) + error->deier[i] =I915_READ (GEN8_DE_PIPE_IER (i));
Quoted 7 lines
for_each_pipe(i)
if (intel_display_power_enabled(dev_priv, POWER_DOMAIN_PIPE(i)))
error->deier[i] = I915_READ(GEN8_DE_PIPE_IER(i));If the pipe's power well is disabled, the IER register is powered off and we can get an unclaimed register errors too.
thanks! I'll add it...
Also also need to be added to debugfs interface.
Quoted 4 lines
I also just noticed that this function contains the "/* 4: Everything else */" comment twice. You could remove one :)
indeed.
Quoted 25 lines
Quoted 11 lines
drivers/gpu/drm/i915/i915_gpu_error.c +3
-1+for (i =0 ; i <4 ; i++) + error->gtier[3 ] =I915_READ (GEN8_GT_IER (i)); + error->de_misc_ier =I915_READ (GEN8_DE_MISC_IER ); }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ) |I915_READ (GTIER ); }else if (IS_GEN2 (dev)) { --1.9.3
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Paulo Zanoni
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Fix DEIER and GTIER collecting for BDW.
2014-07-30 15:20 GMT-03:00 Rodrigo Vivi <[email protected]>:
Quoted 47 lines · Paulo Zanoni
Quoted 33 lines
2014-07-28 12:19 GMT-03:00 Rodrigo Vivi <[email protected]>:
Quoted 31 lines
BDW has many other Display Engine interrupts and GT interrupts registers.
Collecting it properly ongpu_error_state.On debugfs all was properly listed already but besides we were also listing old
DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:https://bugs.freedesktop.org/show_bug.cgi?id=81701
Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 4 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 23 ++++++++++++++++++++--- 3 files changed, 24 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -783,7 +783,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) seq_printf(m, "Pipe %c stat: %08x\n",pipe_name (pipe), I915_READ(PIPESTAT(pipe))); - }else { + }else if (!IS_BROADWELL (dev)) {Quoted 8 lines
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-0seq_printf(m, "North Display Interrupt enable: %08x\n",
I915_READ(DEIER));
seq_printf(m, "North Display Interrupt identity:
%08x\n",This chunk is not needed since we already have a check for "gen >= 8" at the top.
Quoted 5 lines
oh, for a moment I thought it was messy as the other code and it was writing twice...
mainly when you mentioned that you could reproduce the unclaimed when reading debugfs...
but probably was related to the powerwell you mentioned below...
Yes, at i915_interrupt_info we also need to call intel_display_power_enabled().
I also won't complain if you fix i915_frequency_info on BDW :)
Quoted 124 lines
Quoted 75 lines
Quoted 60 lines
drivers/gpu/drm/i915/i915_drv.h +3
-1@@ -314,7 +314,9 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ]; +u32 deier[3 ]; +u32 de_misc_ier;u32 ccid;u32 derrmr;u32 forcewake;drivers/gpu/drm/i915/i915_gpu_error.c +12
-2@@ -358,9 +358,19 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"Suspend count: %u\n" , error->suspend_count);err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir); -err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_BROADWELL (dev)) { +for_each_pipe (i) +err_printf (m,"DEIER pipe %c: 0x%08x\n" ,pipe_name (i), + error->deier[i]); +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); +err_printf (m,"DE_MISC_IER: 0x%08x\n" , error->de_misc_ier); + }else { +err_printf (m,"IER: 0x%08x\n" , error->ier); + }if (IS_HASWELL (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf(m, "PGTBL_ER: 0x%08x\n", error->pgtbl_er); err_printf(m, "FORCEWAKE: 0x%08x\n", error->forcewake); err_printf(m, "DERRMR: 0x%08x\n", error->derrmr);drivers/gpu/drm/i915/i915_gpu_error.c +1
-0@@ -1093,6 +1103,7 @@ static void i915_capture_reg_state(structdrm_i915_private *dev_priv, struct drm_i915_error_state *error) { struct drm_device *dev = dev_priv->dev; +int i;/* General organization * 1. Registers specific to a single generation
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct · line 1158
Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4
-1@@ -1139,7 +1150,13 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, if (IS_HASWELL(dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); + } else if (IS_BROADWELL(dev)) { +for_each_pipe (i) + error->deier[i] =I915_READ (GEN8_DE_PIPE_IER (i));
for_each_pipe(i)
if (intel_display_power_enabled(dev_priv, POWER_DOMAIN_PIPE(i)))
error->deier[i] = I915_READ(GEN8_DE_PIPE_IER(i));Quoted 2 lines
If the pipe's power well is disabled, the IER register is powered off and we can get an unclaimed register errors too.
thanks! I'll add it...
Also also need to be added to debugfs interface.Quoted 4 lines
I also just noticed that this function contains the "/* 4: Everything else */" comment twice. You could remove one :)
indeed.
Quoted 19 lines
Quoted 9 lines
drivers/gpu/drm/i915/i915_gpu_error.c +3
-0+for (i =0 ; i <4 ; i++) + error->gtier[3 ] =I915_READ (GEN8_GT_IER (i)); + error->de_misc_ier =I915_READ (GEN8_DE_MISC_IER ); }else if (HAS_PCH_SPLIT (dev)) {error->ier = I915_READ(DEIER) | I915_READ(GTIER); } else if (IS_GEN2(dev)) {Quoted 7 lines
--
1.9.3_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfxQuoted 6 lines
--
Paulo Zanoni
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
Signature · 1 line
Paulo Zanoni
Rodrigo Vivi
maintainerPATCH 2/2 drm/i915: Fix DEIER and GTIER collecting for BDW.
BDW has many other Display Engine interrupts and GT interrupts registers. Collecting it properly on gpu_error_state.
On debugfs all was properly listed already but besides we were also listing old DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:
https://bugs.freedesktop.org/show_bug.cgi?id=81701
v2: Fix small issues of first version and don't read DEIER regs when pipe's
power well is disabled
--- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++++ drivers/gpu/drm/i915/i915_drv.h | 4 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 29 +++++++++++++++++++++++++---- 3 files changed, 32 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -0
@@ -703,6 +703,10 @@ static int i915_interrupt_info(struct seq_file *m, void *data) }for_each_pipe (pipe) { +if (!intel_display_power_enabled (dev_priv, +POWER_DOMAIN_PIPE (pipe))) +continue ; +seq_printf (m,"Pipe %c IMR:\t%08x\n" ,pipe_name (pipe),I915_READ (GEN8_DE_PIPE_IMR (pipe)));
drivers/gpu/drm/i915/i915_drv.h +3 -1
@@ -317,7 +317,9 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ]; +u32 deier[3 ]; +u32 de_misc_ier;u32 ccid;u32 derrmr;u32 forcewake;
drivers/gpu/drm/i915/i915_gpu_error.c +25 -4
@@ -359,8 +359,19 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_BROADWELL (dev)) { +for_each_pipe (i) +err_printf (m,"DEIER pipe %c: 0x%08x\n" ,pipe_name (i), + error->deier[i]); +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); +err_printf (m,"DE_MISC_IER: 0x%08x\n" , error->de_misc_ier); + }else { +err_printf (m,"IER: 0x%08x\n" , error->ier); + }if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);
@@ -1093,6 +1104,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, struct drm_i915_error_state *error) {struct drm_device *dev = dev_priv->dev; +int i;/* General organization * 1. Registers specific to a single generation
@@ -1104,7 +1116,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }
@@ -1138,9 +1150,18 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) { +if (IS_BROADWELL (dev)) { +for_each_pipe (i) +if (intel_display_power_enabled (dev_priv, +POWER_DOMAIN_PIPE (i))) + error->deier[i] = +I915_READ (GEN8_DE_PIPE_IER (i)); +for (i =0 ; i <4 ; i++) + error->gtier[i] =I915_READ (GEN8_GT_IER (i)); + error->de_misc_ier =I915_READ (GEN8_DE_MISC_IER ); + }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); }else if (IS_GEN2 (dev)) { error->ier =I915_READ16 (IER ); }else {
Signature · 1 line
1.9.1
Re: [PATCH 2/2] drm/i915: Fix DEIER and GTIER collecting for BDW.
2014-08-01 6:14 GMT-03:00 Rodrigo Vivi <[email protected]>:
Quoted 25 lines
BDW has many other Display Engine interrupts and GT interrupts registers. Collecting it properly on
gpu_error_state.On debugfs all was properly listed already but besides we were also listing old DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:
https://bugs.freedesktop.org/show_bug.cgi?id=81701
v2: Fix small issues of first version and don't read DEIER regs when pipe's
power well is disabledCc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++++ drivers/gpu/drm/i915/i915_drv.h | 4 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 29 +++++++++++++++++++++++++---- 3 files changed, 32 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0
drivers/gpu/drm/i915/i915_debugfs.c static int i915_interrupt_info(struct seq_file *m, void *data) · line 708
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +3
-0@@ -703,6 +703,10 @@ static int i915_interrupt_info(struct seq_file *m, void *data) }for_each_pipe (pipe) { +if (!intel_display_power_enabled (dev_priv, +POWER_DOMAIN_PIPE (pipe))) +continue ;
Bikeshed: print something here (e.g., "Pipe %c: power disabled\n").
Quoted 45 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0+seq_printf (m,"Pipe %c IMR:\t%08x\n" ,pipe_name (pipe),I915_READ (GEN8_DE_PIPE_IMR (pipe)));drivers/gpu/drm/i915/i915_drv.h +3
-1@@ -317,7 +317,9 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ]; +u32 deier[3 ]; +u32 de_misc_ier;u32 ccid;u32 derrmr;u32 forcewake;drivers/gpu/drm/i915/i915_gpu_error.c +12
-1@@ -359,8 +359,19 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_BROADWELL (dev)) { +for_each_pipe (i) +err_printf (m,"DEIER pipe %c: 0x%08x\n" ,pipe_name (i), + error->deier[i]); +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); +err_printf (m,"DE_MISC_IER: 0x%08x\n" , error->de_misc_ier); + }else { +err_printf (m,"IER: 0x%08x\n" , error->ier); + }if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct drm_i915_private *dev_priv, · line 1107
Quoted 4 lines
drivers/gpu/drm/i915/i915_gpu_error.c +1
-0@@ -1093,6 +1104,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, struct drm_i915_error_state *error) {struct drm_device *dev = dev_priv->dev; +int i;
Bikeshed: also add "enum pipe pipe" and use it for the pipe iteration.
With or without these changes: Reviewed-by: Paulo Zanoni <[email protected]>
Quoted 40 lines
drivers/gpu/drm/i915/i915_gpu_error.c +12
-4/* General organization * 1. Registers specific to a single generation @@ -1104,7 +1116,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }@@ -1138,9 +1150,18 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) { +if (IS_BROADWELL (dev)) { +for_each_pipe (i) +if (intel_display_power_enabled (dev_priv, +POWER_DOMAIN_PIPE (i))) + error->deier[i] = +I915_READ (GEN8_DE_PIPE_IER (i)); +for (i =0 ; i <4 ; i++) + error->gtier[i] =I915_READ (GEN8_GT_IER (i)); + error->de_misc_ier =I915_READ (GEN8_DE_MISC_IER ); + }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); }else if (IS_GEN2 (dev)) { error->ier =I915_READ16 (IER ); }else { --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Paulo Zanoni
Rodrigo Vivi
maintainerPATCH 2/2 drm/i915: Fix DEIER and GTIER collecting for BDW.
BDW has many other Display Engine interrupts and GT interrupts registers. Collecting it properly on gpu_error_state.
On debugfs all was properly listed already but besides we were also listing old DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:
https://bugs.freedesktop.org/show_bug.cgi?id=81701
v2: Fix small issues of first version and don't read DEIER regs when pipe's
power well is disabled
v3: bikeshed accepted: use enum pipe pipe instead of int i for pipe interection
--- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++++ drivers/gpu/drm/i915/i915_drv.h | 4 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 32 ++++++++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +4 -0
@@ -703,6 +703,10 @@ static int i915_interrupt_info(struct seq_file *m, void *data) }for_each_pipe (pipe) { +if (!intel_display_power_enabled (dev_priv, +POWER_DOMAIN_PIPE (pipe))) +continue ; +seq_printf (m,"Pipe %c IMR:\t%08x\n" ,pipe_name (pipe),I915_READ (GEN8_DE_PIPE_IMR (pipe)));
drivers/gpu/drm/i915/i915_drv.h +3 -1
@@ -317,7 +317,9 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ]; +u32 deier[3 ]; +u32 de_misc_ier;u32 ccid;u32 derrmr;u32 forcewake;
drivers/gpu/drm/i915/i915_gpu_error.c +28 -4
@@ -328,6 +328,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,struct drm_i915_private *dev_priv = dev->dev_private;struct drm_i915_error_state *error = error_priv->error;struct drm_i915_error_object *obj; +enum pipe pipe;int i, j, offset, elt;int max_hangcheck_score;
@@ -359,8 +360,20 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_BROADWELL (dev)) { +for_each_pipe (pipe) +err_printf (m,"DEIER pipe %c: 0x%08x\n" , +pipe_name (pipe), + error->deier[pipe]); +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); +err_printf (m,"DE_MISC_IER: 0x%08x\n" , error->de_misc_ier); + }else { +err_printf (m,"IER: 0x%08x\n" , error->ier); + }if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);
@@ -1093,6 +1106,8 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, struct drm_i915_error_state *error) {struct drm_device *dev = dev_priv->dev; +enum pipe pipe; +int i;/* General organization * 1. Registers specific to a single generation
@@ -1104,7 +1119,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }
@@ -1138,9 +1153,18 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) { +if (IS_BROADWELL (dev)) { +for_each_pipe (pipe) +if (intel_display_power_enabled (dev_priv, +POWER_DOMAIN_PIPE (pipe))) + error->deier[pipe] = +I915_READ (GEN8_DE_PIPE_IER (pipe)); +for (i =0 ; i <4 ; i++) + error->gtier[i] =I915_READ (GEN8_GT_IER (i)); + error->de_misc_ier =I915_READ (GEN8_DE_MISC_IER ); + }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); }else if (IS_GEN2 (dev)) { error->ier =I915_READ16 (IER ); }else if (!IS_VALLEYVIEW (dev)) {
Signature · 1 line
1.9.1
Re: [PATCH 2/2] drm/i915: Fix DEIER and GTIER collecting for BDW.
2014-08-01 13:13 GMT-03:00 Rodrigo Vivi <[email protected]>:
Quoted 7 lines
BDW has many other Display Engine interrupts and GT interrupts registers. Collecting it properly on
gpu_error_state.On debugfs all was properly listed already but besides we were also listing old DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:
Quoted 5 lines
https://bugs.freedesktop.org/show_bug.cgi?id=81701
v2: Fix small issues of first version and don't read DEIER regs when pipe's
power well is disabled
v3: bikeshed accepted: use enum pipe pipe instead of int i for pipe interection
Quoted 119 lines
Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++++ drivers/gpu/drm/i915/i915_drv.h | 4 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 32 ++++++++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +4
-0@@ -703,6 +703,10 @@ static int i915_interrupt_info(struct seq_file *m, void *data) }for_each_pipe (pipe) { +if (!intel_display_power_enabled (dev_priv, +POWER_DOMAIN_PIPE (pipe))) +continue ; +seq_printf (m,"Pipe %c IMR:\t%08x\n" ,pipe_name (pipe),I915_READ (GEN8_DE_PIPE_IMR (pipe)));drivers/gpu/drm/i915/i915_drv.h +3
-1@@ -317,7 +317,9 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ]; +u32 deier[3 ]; +u32 de_misc_ier;u32 ccid;u32 derrmr;u32 forcewake;drivers/gpu/drm/i915/i915_gpu_error.c +28
-5@@ -328,6 +328,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,struct drm_i915_private *dev_priv = dev->dev_private;struct drm_i915_error_state *error = error_priv->error;struct drm_i915_error_object *obj; +enum pipe pipe;int i, j, offset, elt;int max_hangcheck_score;@@ -359,8 +360,20 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_BROADWELL (dev)) { +for_each_pipe (pipe) +err_printf (m,"DEIER pipe %c: 0x%08x\n" , +pipe_name (pipe), + error->deier[pipe]); +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); +err_printf (m,"DE_MISC_IER: 0x%08x\n" , error->de_misc_ier); + }else { +err_printf (m,"IER: 0x%08x\n" , error->ier); + }if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);@@ -1093,6 +1106,8 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, struct drm_i915_error_state *error) {struct drm_device *dev = dev_priv->dev; +enum pipe pipe; +int i;/* General organization * 1. Registers specific to a single generation @@ -1104,7 +1119,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }@@ -1138,9 +1153,18 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) { +if (IS_BROADWELL (dev)) { +for_each_pipe (pipe) +if (intel_display_power_enabled (dev_priv, +POWER_DOMAIN_PIPE (pipe))) + error->deier[pipe] = +I915_READ (GEN8_DE_PIPE_IER (pipe)); +for (i =0 ; i <4 ; i++) + error->gtier[i] =I915_READ (GEN8_GT_IER (i)); + error->de_misc_ier =I915_READ (GEN8_DE_MISC_IER ); + }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); }else if (IS_GEN2 (dev)) { error->ier =I915_READ16 (IER ); }else if (!IS_VALLEYVIEW (dev)) { --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Paulo Zanoni
Re: [PATCH 2/2] drm/i915: Fix DEIER and GTIER collecting for BDW.
Quoted 8 lines · Paulo Zanoni
2014-08-01 13:13 GMT-03:00 Rodrigo Vivi <[email protected]>:
Quoted 7 lines
BDW has many other Display Engine interrupts and GT interrupts registers. Collecting it properly on
gpu_error_state.On debugfs all was properly listed already but besides we were also listing old DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:
Quoted 7 lines
Quoted 5 lines
https://bugs.freedesktop.org/show_bug.cgi?id=81701
v2: Fix small issues of first version and don't read DEIER regs when pipe's
power well is disabled
v3: bikeshed accepted: use enum pipe pipe instead of int i for pipe interectionReviewed-by Paulo Zanoni <[email protected]>
Both patches merged to dinq, thanks.
-Daniel
Quoted 129 lines
Quoted 120 lines
Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++++ drivers/gpu/drm/i915/i915_drv.h | 4 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 32 ++++++++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +4
-0@@ -703,6 +703,10 @@ static int i915_interrupt_info(struct seq_file *m, void *data) }for_each_pipe (pipe) { +if (!intel_display_power_enabled (dev_priv, +POWER_DOMAIN_PIPE (pipe))) +continue ; +seq_printf (m,"Pipe %c IMR:\t%08x\n" ,pipe_name (pipe),I915_READ (GEN8_DE_PIPE_IMR (pipe)));drivers/gpu/drm/i915/i915_drv.h +3
-1@@ -317,7 +317,9 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ]; +u32 deier[3 ]; +u32 de_misc_ier;u32 ccid;u32 derrmr;u32 forcewake;drivers/gpu/drm/i915/i915_gpu_error.c +28
-5@@ -328,6 +328,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,struct drm_i915_private *dev_priv = dev->dev_private;struct drm_i915_error_state *error = error_priv->error;struct drm_i915_error_object *obj; +enum pipe pipe;int i, j, offset, elt;int max_hangcheck_score;@@ -359,8 +360,20 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_BROADWELL (dev)) { +for_each_pipe (pipe) +err_printf (m,"DEIER pipe %c: 0x%08x\n" , +pipe_name (pipe), + error->deier[pipe]); +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); +err_printf (m,"DE_MISC_IER: 0x%08x\n" , error->de_misc_ier); + }else { +err_printf (m,"IER: 0x%08x\n" , error->ier); + }if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);@@ -1093,6 +1106,8 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, struct drm_i915_error_state *error) {struct drm_device *dev = dev_priv->dev; +enum pipe pipe; +int i;/* General organization * 1. Registers specific to a single generation @@ -1104,7 +1119,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }@@ -1138,9 +1153,18 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) { +if (IS_BROADWELL (dev)) { +for_each_pipe (pipe) +if (intel_display_power_enabled (dev_priv, +POWER_DOMAIN_PIPE (pipe))) + error->deier[pipe] = +I915_READ (GEN8_DE_PIPE_IER (pipe)); +for (i =0 ; i <4 ; i++) + error->gtier[i] =I915_READ (GEN8_GT_IER (i)); + error->de_misc_ier =I915_READ (GEN8_DE_MISC_IER ); + }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); }else if (IS_GEN2 (dev)) { error->ier =I915_READ16 (IER ); }else if (!IS_VALLEYVIEW (dev)) { --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 5 lines
Paulo Zanoni _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915: Fix DEIER and GTIER collecting for BDW.
BDW has many other Display Engine interrupts and GT interrupts registers. Collecting it properly on gpu_error_state.
On debugfs all was properly listed already but besides we were also listing old DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:
https://bugs.freedesktop.org/show_bug.cgi?id=81701
v2: Fix small issues of first version and don't read DEIER regs when pipe's
power well is disabled
v3: bikeshed accepted: use enum pipe pipe instead of int i for pipe interection
v4: Ben notice previous version was checking for display_power_enabled without
using propper locks. Using _unlocked version isn't reliable and we cannot get this registers when power well is off. So let's avoid getting all DE_IER per pipe for now. If someone think this is an useful information it can be added later.
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 ------------ drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 19 ++++++++++++++----- 3 files changed, 15 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +0 -12
@@ -702,18 +702,6 @@ static int i915_interrupt_info(struct seq_file *m, void *data) i, I915_READ(GEN8_GT_IER(i))); } -for_each_pipe (pipe) { -seq_printf (m,"Pipe %c IMR:\t%08x\n" , -pipe_name (pipe), -I915_READ (GEN8_DE_PIPE_IMR (pipe))); -seq_printf (m,"Pipe %c IIR:\t%08x\n" , -pipe_name (pipe), -I915_READ (GEN8_DE_PIPE_IIR (pipe))); -seq_printf (m,"Pipe %c IER:\t%08x\n" , -pipe_name (pipe), -I915_READ (GEN8_DE_PIPE_IER (pipe))); - } -seq_printf (m,"Display Engine port interrupt mask:\t%08x\n" ,I915_READ (GEN8_DE_PORT_IMR )); seq_printf(m, "Display Engine port interrupt identity:\t%08x\n",
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -317,7 +317,7 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ];u32 ccid;u32 derrmr;u32 forcewake;
drivers/gpu/drm/i915/i915_gpu_error.c +14 -5
@@ -359,8 +359,12 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); -if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +if (IS_BROADWELL (dev)) { +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); + }else if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);
@@ -1094,6 +1098,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, struct drm_i915_error_state *error) {struct drm_device *dev = dev_priv->dev; +int i;/* General organization * 1. Registers specific to a single generation
@@ -1105,7 +1110,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }
@@ -1139,9 +1144,13 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) { +if (IS_BROADWELL (dev)) { + error->ier =I915_READ (GEN8_DE_MISC_IER ); +for (i =0 ; i <4 ; i++) + error->gtier[i] =I915_READ (GEN8_GT_IER (i)); + }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); }else if (IS_GEN2 (dev)) { error->ier =I915_READ16 (IER ); }else if (!IS_VALLEYVIEW (dev)) {
Signature · 1 line
1.9.1
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915: Fix DEIER and GTIER collecting for BDW.
BDW has many other Display Engine interrupts and GT interrupts registers. Collecting it properly on gpu_error_state.
On debugfs all was properly listed already but besides we were also listing old DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:
https://bugs.freedesktop.org/show_bug.cgi?id=81701
v2: Fix small issues of first version and don't read DEIER regs when pipe's
power well is disabled
v3: bikeshed accepted: use enum pipe pipe instead of int i for pipe interection
v4: Ben notice previous version was checking for display_power_enabled without
using propper locks. Using _unlocked version isn't reliable and we cannot get this registers when power well is off. So let's avoid getting all DE_IER per pipe for now. If someone think this is an useful information it can be added later.
v5: Ben: put back debugfs stuff that might be coverred by pm_get and use
gen >= 8 trying to predict future.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -322,7 +322,7 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ];u32 ccid;u32 derrmr;u32 forcewake;
drivers/gpu/drm/i915/i915_gpu_error.c +14 -5
@@ -361,8 +361,12 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); -if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +if (INTEL_INFO (dev)->gen >=8 ) { +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); + }else if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);
@@ -1096,6 +1100,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, struct drm_i915_error_state *error) {struct drm_device *dev = dev_priv->dev; +int i;/* General organization * 1. Registers specific to a single generation
@@ -1107,7 +1112,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }
@@ -1141,9 +1146,13 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) { +if (INTEL_INFO (dev)->gen >=8 ) { + error->ier =I915_READ (GEN8_DE_MISC_IER ); +for (i =0 ; i <4 ; i++) + error->gtier[i] =I915_READ (GEN8_GT_IER (i)); + }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); }else if (IS_GEN2 (dev)) { error->ier =I915_READ16 (IER ); }else if (!IS_VALLEYVIEW (dev)) {
Signature · 1 line
1.9.3
Daniel Vetter
AppliedRe: [PATCH] drm/i915: Fix DEIER and GTIER collecting for BDW.
Quoted 20 lines · Rodrigo Vivi
BDW has many other Display Engine interrupts and GT interrupts registers. Collecting it properly on
gpu_error_state.On debugfs all was properly listed already but besides we were also listing old DEIER and GTIER that doesn't exist on BDW anymore. This was causing unclaimed register messages:
https://bugs.freedesktop.org/show_bug.cgi?id=81701
v2: Fix small issues of first version and don't read DEIER regs when pipe's
power well is disabled
v3: bikeshed accepted: use enum pipe pipe instead of int i for pipe interection
v4: Ben notice previous version was checking fordisplay_power_enabledwithout
using propper locks. Using_unlockedversion isn't reliable and we cannot get this registers when power well is off. So let's avoid getting allDE_IERper pipe for now. If someone think this is an useful information it can be added later.
v5: Ben: put back debugfs stuff that might be coverred bypm_getand use
gen >= 8 trying to predict future.
Quoted 5 lines
Cc Ben Widawsky <[email protected]>Cc Paulo Zanoni <[email protected]>Reviewed-by Ben Widawsky <[email protected]>Reviewed-by (v3) Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 77 lines
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-1@@ -322,7 +322,7 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; -u32 gtier; +u32 gtier[4 ];u32 ccid;u32 derrmr;u32 forcewake;drivers/gpu/drm/i915/i915_gpu_error.c +14
-5@@ -361,8 +361,12 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); -if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) -err_printf (m,"GTIER: 0x%08x\n" , error->gtier); +if (INTEL_INFO (dev)->gen >=8 ) { +for (i =0 ; i <4 ; i++) +err_printf (m,"GTIER gt %d: 0x%08x\n" , i, + error->gtier[i]); + }else if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) +err_printf (m,"GTIER: 0x%08x\n" , error->gtier[0 ]);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);@@ -1096,6 +1100,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, struct drm_i915_error_state *error) {struct drm_device *dev = dev_priv->dev; +int i;/* General organization * 1. Registers specific to a single generation @@ -1107,7 +1112,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }@@ -1141,9 +1146,13 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) { +if (INTEL_INFO (dev)->gen >=8 ) { + error->ier =I915_READ (GEN8_DE_MISC_IER ); +for (i =0 ; i <4 ; i++) + error->gtier[i] =I915_READ (GEN8_GT_IER (i)); + }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ); - error->gtier =I915_READ (GTIER ); + error->gtier[0 ] =I915_READ (GTIER ); }else if (IS_GEN2 (dev)) { error->ier =I915_READ16 (IER ); }else if (!IS_VALLEYVIEW (dev)) {Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
2014-07-28 12:19 GMT-03:00 Rodrigo Vivi <[email protected]>:
Quoted 36 lines
GTIER and DEIER doesn't have same interface on HSW so this "or" operation makes the information provided useless.
Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -314,6 +314,7 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; +u32 gtier;u32 ccid;u32 derrmr;u32 forcewake;drivers/gpu/drm/i915/i915_gpu_error.c +2
-0@@ -359,6 +359,8 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_HASWELL (dev)) +err_printf (m,"GTIER: 0x%08x\n" , error->gtier);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct drm_i915_private *dev_priv, · line 1144
Quoted 9 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4
-1@@ -1135,13 +1137,15 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) +if (IS_HASWELL (dev)) { + error->ier =I915_READ (DEIER ); + error->gtier =I915_READ (GTIER ); + }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ) |I915_READ (GTIER );
You did a change for HSW only, but we have these bits since Gen5. Why don't you do this change for the whole HAS_PCH_SPLIT chunk instead of adding a HSW-specific piece?
I am not a huge user of these error state files, I can't really think why we would want to "or" the IER bits, so your patch looks correct to me.
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct drm_i915_private *dev_priv, · line 1148
Quoted 9 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4
-5-else { -if (IS_GEN2 (dev)) - error->ier =I915_READ16 (IER ); -else - error->ier =I915_READ (IER ); + }else if (IS_GEN2 (dev)) { + error->ier =I915_READ16 (IER ); + }else { + error->ier =I915_READ (IER );
While reviewing your patch I also noticed that at the top of this function we set error->ier for VLV, but then at this point we just overwrite what was previously set. You could write another patch to fix VLV too :)
Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +0
-1}/* 4: Everything else */ --1.9.3
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Paulo Zanoni
Quoted 51 lines · Paulo Zanoni
2014-07-28 12:19 GMT-03:00 Rodrigo Vivi <[email protected]>:
Review
Quoted 11 lines
GTIER and DEIER doesn't have same interface on HSW so this "or" operation makes the information provided useless.
Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hReview
Quoted 12 lines
index ef38c3b..ccb97f1 100644
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -314,6 +314,7 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; +u32 gtier;u32 ccid;u32 derrmr;u32 forcewake;(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_gpu_error.cdrivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct
Quoted 4 lines
index 0b3f694..372fea3 100644
drivers/gpu/drm/i915/i915_gpu_error.c +0
-0@@ -359,6 +359,8 @@ int i915_error_state_to_str(struct
drm_i915_error_state_buf*m,drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct
Quoted 9 lines
drivers/gpu/drm/i915/i915_gpu_error.c +2
-0err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (IS_HASWELL (dev)) +err_printf (m,"GTIER: 0x%08x\n" , error->gtier);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);@@ -1135,13 +1137,15 @@ static void i915_capture_reg_state(struct
drm_i915_private*dev_priv,drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct drm_i915_private *dev_priv, · line 1144
Quoted 9 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4
-1if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) +if (IS_HASWELL (dev)) { + error->ier =I915_READ (DEIER ); + error->gtier =I915_READ (GTIER ); + }else if (HAS_PCH_SPLIT (dev)) { error->ier =I915_READ (DEIER ) |I915_READ (GTIER );
Quoted 8 lines
You did a change for HSW only, but we have these bits since Gen5. Why don't you do this change for the whole
HAS_PCH_SPLITchunk instead of adding a HSW-specific piece?I am not a huge user of these error state files, I can't really think why we would want to "or" the IER bits, so your patch looks correct to me.
I believe before HSW they had the same interface both DEIR and GTIER, but since I'm splitting it for HSW you are right we can split everywhere else with or without common interface.
Quoted 12 lines
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct drm_i915_private *dev_priv, · line 1148
Quoted 11 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4
-5-else { -if (IS_GEN2 (dev)) - error->ier =I915_READ16 (IER ); -else - error->ier =I915_READ (IER ); + }else if (IS_GEN2 (dev)) { + error->ier =I915_READ16 (IER ); + }else { + error->ier =I915_READ (IER );
Quoted 5 lines
While reviewing your patch I also noticed that at the top of this function we set
error->ierfor VLV, but then at this point we just overwrite what was previously set. You could write another patch to fix VLV too :)
Yeah, it is messy... I'll also split for VLV and organize a bit to avoid overwriting...
Quoted 22 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_gpu_error.c +0
-1}/* 4: Everything else */ --1.9.3
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Paulo Zanoni
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 1/2 drm/i915: Collect gtier properly on HSW.
GTIER and DEIER doesn't have same interface on HSW so this "or" operation makes the information provided useless.
v2: since we have gtier variable already let's split for everybody and avoid the strange | op.
Also avoid overriding the value that was set for vlv. In this case I believe that we should reorganize the whole function, but I'll respect the comment that ask to not touch the order and let this organization work to be done later.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -317,6 +317,7 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; +u32 gtier;u32 ccid;u32 derrmr;u32 forcewake;
drivers/gpu/drm/i915/i915_gpu_error.c +14 -10
@@ -359,6 +359,8 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) +err_printf (m,"GTIER: 0x%08x\n" , error->gtier);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);
@@ -1102,7 +1104,8 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->ier =I915_READ (GTIER ) |I915_READ (VLV_IER ); + error->gtier =I915_READ (GTIER ); + error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }
@@ -1135,17 +1138,18 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) - error->ier =I915_READ (DEIER ) |I915_READ (GTIER ); -else { -if (IS_GEN2 (dev)) - error->ier =I915_READ16 (IER ); -else - error->ier =I915_READ (IER ); +if (HAS_PCH_SPLIT (dev)) { + error->ier =I915_READ (DEIER ); + error->gtier =I915_READ (GTIER ); + }else if (IS_GEN2 (dev)) { + error->ier =I915_READ16 (IER ); + }else { + error->ier =I915_READ (IER ); } -/* 4: Everything else */ - error->eir =I915_READ (EIR ); +/* do not override what was set above for VLV */ +if (!IS_VALLEYVIEW (dev)) + error->eir =I915_READ (EIR ); error->pgtbl_er =I915_READ (PGTBL_ER );i915_get_extra_instdone (dev, error->extra_instdone);
Signature · 1 line
1.9.1
2014-08-01 6:13 GMT-03:00 Rodrigo Vivi <[email protected]>:
Quoted 34 lines
GTIER and DEIER doesn't have same interface on HSW so this "or" operation makes the information provided useless.
v2: since we have gtier variable already let's split for everybody and avoid the strange | op.
Also avoid overriding the value that was set for vlv. In this case I believe that we should reorganize the whole function, but I'll respect the comment that ask to not touch the order and let this organization work to be done later.Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -317,6 +317,7 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; +u32 gtier;u32 ccid;u32 derrmr;u32 forcewake;drivers/gpu/drm/i915/i915_gpu_error.c +0
-0
drivers/gpu/drm/i915/i915_gpu_error.c int i915_error_state_to_str(struct drm_i915_error_state_buf *m, · line 363
Quoted 5 lines
drivers/gpu/drm/i915/i915_gpu_error.c +2
-0@@ -359,6 +359,8 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) +err_printf (m,"GTIER: 0x%08x\n" , error->gtier);
Optional bikeshed: you could just check for Gen >= 5 here.
Quoted 21 lines
drivers/gpu/drm/i915/i915_gpu_error.c +2
-5err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);@@ -1102,7 +1104,8 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->ier =I915_READ (GTIER ) |I915_READ (VLV_IER ); + error->gtier =I915_READ (GTIER ); + error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }@@ -1135,17 +1138,18 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) - error->ier =I915_READ (DEIER ) |I915_READ (GTIER ); -else { -if (IS_GEN2 (dev))
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct drm_i915_private *dev_priv, · line 1147
Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +7
-3- error->ier =I915_READ16 (IER ); - else - error->ier = I915_READ(IER); +if (HAS_PCH_SPLIT (dev)) { + error->ier =I915_READ (DEIER ); + error->gtier =I915_READ (GTIER ); + }else if (IS_GEN2 (dev)) { + error->ier =I915_READ16 (IER ); + }else { + error->ier =I915_READ (IER );
We're still overwriting VLV's IER here.
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_capture_reg_state(struct drm_i915_private *dev_priv, · line 1152
Quoted 7 lines
drivers/gpu/drm/i915/i915_gpu_error.c +3
-2} -/* 4: Everything else */ - error->eir =I915_READ (EIR ); +/* do not override what was set above for VLV */ +if (!IS_VALLEYVIEW (dev)) + error->eir =I915_READ (EIR );
I don't see EIR being set above on VLV. It was IER, not EIR.
Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +0
-1error->pgtbl_er =I915_READ (PGTBL_ER );i915_get_extra_instdone (dev, error->extra_instdone); --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Paulo Zanoni
Rodrigo Vivi
maintainerPATCH 1/2 drm/i915: Collect gtier properly on HSW.
GTIER and DEIER doesn't have same interface on HSW so this "or" operation makes the information provided useless.
v2: since we have gtier variable already let's split for everybody and avoid the strange | op.
Also avoid overriding the value that was set for vlv. In this case I believe that we should reorganize the whole function, but I'll respect the comment that ask to not touch the order and let this organization work to be done later.
v3: moving VLV check to the right place.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -317,6 +317,7 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; +u32 gtier;u32 ccid;u32 derrmr;u32 forcewake;
drivers/gpu/drm/i915/i915_gpu_error.c +11 -10
@@ -359,6 +359,8 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) +err_printf (m,"GTIER: 0x%08x\n" , error->gtier);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);
@@ -1102,7 +1104,8 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->ier =I915_READ (GTIER ) |I915_READ (VLV_IER ); + error->gtier =I915_READ (GTIER ); + error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }
@@ -1135,16 +1138,14 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) - error->ier =I915_READ (DEIER ) |I915_READ (GTIER ); -else { -if (IS_GEN2 (dev)) - error->ier =I915_READ16 (IER ); -else - error->ier =I915_READ (IER ); +if (HAS_PCH_SPLIT (dev)) { + error->ier =I915_READ (DEIER ); + error->gtier =I915_READ (GTIER ); + }else if (IS_GEN2 (dev)) { + error->ier =I915_READ16 (IER ); + }else if (!IS_VALLEYVIEW (dev)) { + error->ier =I915_READ (IER ); } - -/* 4: Everything else */ error->eir =I915_READ (EIR ); error->pgtbl_er =I915_READ (PGTBL_ER );
Signature · 1 line
1.9.1
2014-08-01 13:12 GMT-03:00 Rodrigo Vivi <[email protected]>:
Quoted 11 lines
GTIER and DEIER doesn't have same interface on HSW so this "or" operation makes the information provided useless.
v2: since we have gtier variable already let's split for everybody and avoid the strange | op.
Also avoid overriding the value that was set for vlv. In this case I believe that we should reorganize the whole function, but I'll respect the comment that ask to not touch the order and let this organization work to be done later.
v3: moving VLV check to the right place.
Quoted 2 lines
Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>
Quoted 71 lines
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -317,6 +317,7 @@ struct drm_i915_error_state {u32 eir;u32 pgtbl_er;u32 ier; +u32 gtier;u32 ccid;u32 derrmr;u32 forcewake;drivers/gpu/drm/i915/i915_gpu_error.c +11
-11@@ -359,6 +359,8 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device);err_printf (m,"EIR: 0x%08x\n" , error->eir);err_printf (m,"IER: 0x%08x\n" , error->ier); +if (HAS_PCH_SPLIT (dev) ||IS_VALLEYVIEW (dev)) +err_printf (m,"GTIER: 0x%08x\n" , error->gtier);err_printf (m,"PGTBL_ER: 0x%08x\n" , error->pgtbl_er);err_printf (m,"FORCEWAKE: 0x%08x\n" , error->forcewake);err_printf (m,"DERRMR: 0x%08x\n" , error->derrmr);@@ -1102,7 +1104,8 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,/* 1: Registers specific to a single generation */ if (IS_VALLEYVIEW (dev)) { - error->ier =I915_READ (GTIER ) |I915_READ (VLV_IER ); + error->gtier =I915_READ (GTIER ); + error->ier =I915_READ (VLV_IER ); error->forcewake =I915_READ (FORCEWAKE_VLV ); }@@ -1135,16 +1138,14 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,if (HAS_HW_CONTEXTS (dev)) error->ccid =I915_READ (CCID ); -if (HAS_PCH_SPLIT (dev)) - error->ier =I915_READ (DEIER ) |I915_READ (GTIER ); -else { -if (IS_GEN2 (dev)) - error->ier =I915_READ16 (IER ); -else - error->ier =I915_READ (IER ); +if (HAS_PCH_SPLIT (dev)) { + error->ier =I915_READ (DEIER ); + error->gtier =I915_READ (GTIER ); + }else if (IS_GEN2 (dev)) { + error->ier =I915_READ16 (IER ); + }else if (!IS_VALLEYVIEW (dev)) { + error->ier =I915_READ (IER ); } - -/* 4: Everything else */ error->eir =I915_READ (EIR ); error->pgtbl_er =I915_READ (PGTBL_ER ); --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Paulo Zanoni