remove obsolete debugfs entries
Subsystems (2)
cover remove obsolete debugfs entries
These are accessing registers that the chv doesn't seem to have. Read access on these regions cause a system hard hang.
If some of these are still on use just nack and I do gen check patch instead.
Mika Kuoppala (4):
drm/i915: remove i915_delayedfreq_table debugfs entry drm/i915: remove i915_inttoext_table debugfs entry drm/i915: remove i915_gfxec debugfs entry drm/i915: remove i915_rstdby_delays debugfs entry
drivers/gpu/drm/i915/i915_debugfs.c | 102 ----------------------------------- 1 file changed, 102 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/4 drm/i915: remove i915_delayedfreq_table debugfs entry
CHV hard hangs on reading these registers. As these have not been used since cantiga & ilk, remove the debugfs entry.
References: https://bugs.freedesktop.org/show_bug.cgi?id=80893
--- drivers/gpu/drm/i915/i915_debugfs.c | 27 --------------------------- 1 file changed, 27 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +0 -27
@@ -1158,32 +1158,6 @@ out:return ret; } -static int i915_delayfreq_table (struct seq_file *m,void *unused) -{ -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -u32 delayfreq; -int ret, i; - - ret =mutex_lock_interruptible (&dev->struct_mutex); -if (ret) -return ret; -intel_runtime_pm_get (dev_priv); - -for (i =0 ; i <16 ; i++) { - delayfreq =I915_READ (PXVFREQ_BASE + i *4 ); -seq_printf (m,"P%02dVIDFREQ: 0x%08x (VID: %d)\n" , i, delayfreq, - (delayfreq &PXVFREQ_PX_MASK ) >>PXVFREQ_PX_SHIFT ); - } - -intel_runtime_pm_put (dev_priv); - -mutex_unlock (&dev->struct_mutex); - -return 0 ; -} -static inline int MAP_TO_MV (int map) {return 1250 - (map *25 );
@@ -3952,7 +3926,6 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS}, {"i915_rstdby_delays", i915_rstdby_delays, 0}, {"i915_frequency_info", i915_frequency_info, 0}, - {"i915_delayfreq_table", i915_delayfreq_table, 0}, {"i915_inttoext_table", i915_inttoext_table, 0}, {"i915_drpc_info", i915_drpc_info, 0}, {"i915_emon_status", i915_emon_status, 0},
Signature · 1 line
1.7.9.5
Re: [PATCH 1/4] drm/i915: remove i915_delayedfreq_table debugfs entry
Quoted 48 lines · On Wed, 9 Jul 2014 15:10:43 +0300 Mika Kuoppala…
CHV hard hangs on reading these registers. As these have not been used since cantiga & ilk, remove the debugfs entry.
References: https://bugs.freedesktop.org/show_bug.cgi?id=80893
Suggested-by Jesse Barnes <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 27 --------------------------- 1 file changed, 27 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-26@@ -1158,32 +1158,6 @@ out:return ret; } -static int i915_delayfreq_table (struct seq_file *m,void *unused) -{ -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -u32 delayfreq; -int ret, i; - - ret =mutex_lock_interruptible (&dev->struct_mutex); -if (ret) -return ret; -intel_runtime_pm_get (dev_priv); - -for (i =0 ; i <16 ; i++) { - delayfreq =I915_READ (PXVFREQ_BASE + i *4 ); -seq_printf (m,"P%02dVIDFREQ: 0x%08x (VID: %d)\n" , i, delayfreq, - (delayfreq &PXVFREQ_PX_MASK ) >>PXVFREQ_PX_SHIFT ); - } - -intel_runtime_pm_put (dev_priv); - -mutex_unlock (&dev->struct_mutex); - -return 0 ; -} -static inline int MAP_TO_MV (int map) {return 1250 - (map *25 );
drivers/gpu/drm/i915/i915_debugfs.c static const struct drm_info_list i915_debugfs_list[] = { · line 3931
Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-1@@ -3952,7 +3926,6 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS}, {"i915_rstdby_delays", i915_rstdby_delays, 0}, {"i915_frequency_info", i915_frequency_info, 0}, - {"i915_delayfreq_table", i915_delayfreq_table, 0}, {"i915_inttoext_table", i915_inttoext_table, 0}, {"i915_drpc_info", i915_drpc_info, 0}, {"i915_emon_status", i915_emon_status, 0},
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
PATCH 2/4 drm/i915: remove i915_inttoext_table debugfs entry
In reply to Mika KuoppalaCHV hard hangs on reading these registers. As these have not been used since cantiga & ilk, remove the debugfs entry.
References: https://bugs.freedesktop.org/show_bug.cgi?id=80893
--- drivers/gpu/drm/i915/i915_debugfs.c | 30 ------------------------------ 1 file changed, 30 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +0 -30
@@ -1158,35 +1158,6 @@ out:return ret; } -static inline int MAP_TO_MV (int map) -{ -return 1250 - (map *25 ); -} - -static int i915_inttoext_table (struct seq_file *m,void *unused) -{ -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -u32 inttoext; -int ret, i; - - ret =mutex_lock_interruptible (&dev->struct_mutex); -if (ret) -return ret; -intel_runtime_pm_get (dev_priv); - -for (i =1 ; i <=32 ; i++) { - inttoext =I915_READ (INTTOEXT_BASE_ILK + i *4 ); -seq_printf (m,"INTTOEXT%02d: 0x%08x\n" , i, inttoext); - } - -intel_runtime_pm_put (dev_priv); -mutex_unlock (&dev->struct_mutex); - -return 0 ; -} -static int ironlake_drpc_info (struct seq_file *m) {struct drm_info_node *node = m->private;
@@ -3926,7 +3897,6 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS}, {"i915_rstdby_delays", i915_rstdby_delays, 0}, {"i915_frequency_info", i915_frequency_info, 0}, - {"i915_inttoext_table", i915_inttoext_table, 0}, {"i915_drpc_info", i915_drpc_info, 0}, {"i915_emon_status", i915_emon_status, 0}, {"i915_ring_freq_table", i915_ring_freq_table, 0},
Signature · 1 line
1.7.9.5
Re: [PATCH 2/4] drm/i915: remove i915_inttoext_table debugfs entry
Quoted 51 lines · On Wed, 9 Jul 2014 15:10:44 +0300 Mika Kuoppala…
CHV hard hangs on reading these registers. As these have not been used since cantiga & ilk, remove the debugfs entry.
References: https://bugs.freedesktop.org/show_bug.cgi?id=80893
Suggested-by Jesse Barnes <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 30 ------------------------------ 1 file changed, 30 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-29@@ -1158,35 +1158,6 @@ out:return ret; } -static inline int MAP_TO_MV (int map) -{ -return 1250 - (map *25 ); -} - -static int i915_inttoext_table (struct seq_file *m,void *unused) -{ -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -u32 inttoext; -int ret, i; - - ret =mutex_lock_interruptible (&dev->struct_mutex); -if (ret) -return ret; -intel_runtime_pm_get (dev_priv); - -for (i =1 ; i <=32 ; i++) { - inttoext =I915_READ (INTTOEXT_BASE_ILK + i *4 ); -seq_printf (m,"INTTOEXT%02d: 0x%08x\n" , i, inttoext); - } - -intel_runtime_pm_put (dev_priv); -mutex_unlock (&dev->struct_mutex); - -return 0 ; -} -static int ironlake_drpc_info (struct seq_file *m) {struct drm_info_node *node = m->private;
drivers/gpu/drm/i915/i915_debugfs.c static const struct drm_info_list i915_debugfs_list[] = { · line 3902
Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-1@@ -3926,7 +3897,6 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS}, {"i915_rstdby_delays", i915_rstdby_delays, 0}, {"i915_frequency_info", i915_frequency_info, 0}, - {"i915_inttoext_table", i915_inttoext_table, 0}, {"i915_drpc_info", i915_drpc_info, 0}, {"i915_emon_status", i915_emon_status, 0}, {"i915_ring_freq_table", i915_ring_freq_table, 0},
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
PATCH 3/4 drm/i915: remove i915_gfxec debugfs entry
In reply to Mika KuoppalaCHV hard hangs on reading on 0x112f4.
References: https://bugs.freedesktop.org/show_bug.cgi?id=80893
--- drivers/gpu/drm/i915/i915_debugfs.c | 21 --------------------- 1 file changed, 21 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +0 -21
@@ -1582,26 +1582,6 @@ out:return ret; } -static int i915_gfxec (struct seq_file *m,void *unused) -{ -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -int ret; - - ret =mutex_lock_interruptible (&dev->struct_mutex); -if (ret) -return ret; -intel_runtime_pm_get (dev_priv); - -seq_printf (m,"GFXEC: %ld\n" , (unsigned long )I915_READ (0x112f4 )); -intel_runtime_pm_put (dev_priv); - -mutex_unlock (&dev->struct_mutex); - -return 0 ; -} -static int i915_opregion (struct seq_file *m,void *unused) {struct drm_info_node *node = m->private;
@@ -3900,7 +3880,6 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_drpc_info", i915_drpc_info, 0}, {"i915_emon_status", i915_emon_status, 0}, {"i915_ring_freq_table", i915_ring_freq_table, 0}, - {"i915_gfxec", i915_gfxec, 0}, {"i915_fbc_status", i915_fbc_status, 0}, {"i915_ips_status", i915_ips_status, 0}, {"i915_sr_status", i915_sr_status, 0},
Signature · 1 line
1.7.9.5
Re: [PATCH 3/4] drm/i915: remove i915_gfxec debugfs entry
Quoted 41 lines · On Wed, 9 Jul 2014 15:10:45 +0300 Mika Kuoppala…
CHV hard hangs on reading on
0x112f4.References: https://bugs.freedesktop.org/show_bug.cgi?id=80893
Suggested-by Daniel Vetter <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 21 --------------------- 1 file changed, 21 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-20@@ -1582,26 +1582,6 @@ out:return ret; } -static int i915_gfxec (struct seq_file *m,void *unused) -{ -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -int ret; - - ret =mutex_lock_interruptible (&dev->struct_mutex); -if (ret) -return ret; -intel_runtime_pm_get (dev_priv); - -seq_printf (m,"GFXEC: %ld\n" , (unsigned long )I915_READ (0x112f4 )); -intel_runtime_pm_put (dev_priv); - -mutex_unlock (&dev->struct_mutex); - -return 0 ; -} -static int i915_opregion (struct seq_file *m,void *unused) {struct drm_info_node *node = m->private;
drivers/gpu/drm/i915/i915_debugfs.c static const struct drm_info_list i915_debugfs_list[] = { · line 3885
Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-1@@ -3900,7 +3880,6 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_drpc_info", i915_drpc_info, 0}, {"i915_emon_status", i915_emon_status, 0}, {"i915_ring_freq_table", i915_ring_freq_table, 0}, - {"i915_gfxec", i915_gfxec, 0}, {"i915_fbc_status", i915_fbc_status, 0}, {"i915_ips_status", i915_ips_status, 0}, {"i915_sr_status", i915_sr_status, 0},
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
PATCH 4/4 drm/i915: remove i915_rstdby_delays debugfs entry
In reply to Mika KuoppalaCHV hard hangs on reading on 0x11100
References: https://bugs.freedesktop.org/show_bug.cgi?id=80893
--- drivers/gpu/drm/i915/i915_debugfs.c | 24 ------------------------ 1 file changed, 24 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +0 -24
@@ -994,29 +994,6 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops, i915_next_seqno_get, i915_next_seqno_set, "0x%llx\n"); -static int i915_rstdby_delays (struct seq_file *m,void *unused) -{ -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -u16 crstanddelay; -int ret; - - ret =mutex_lock_interruptible (&dev->struct_mutex); -if (ret) -return ret; -intel_runtime_pm_get (dev_priv); - - crstanddelay =I915_READ16 (CRSTANDVID ); - -intel_runtime_pm_put (dev_priv); -mutex_unlock (&dev->struct_mutex); - -seq_printf (m,"w/ctx: %d, w/o ctx: %d\n" , (crstanddelay >>8 ) &0x3f , (crstanddelay &0x3f )); - -return 0 ; -} -static int i915_frequency_info (struct seq_file *m,void *unused) {struct drm_info_node *node = m->private;
@@ -3875,7 +3852,6 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_gem_hws_blt", i915_hws_info, 0, (void *)BCS}, {"i915_gem_hws_bsd", i915_hws_info, 0, (void *)VCS}, {"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS}, - {"i915_rstdby_delays", i915_rstdby_delays, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_drpc_info", i915_drpc_info, 0}, {"i915_emon_status", i915_emon_status, 0},
Signature · 1 line
1.7.9.5
Re: [PATCH 4/4] drm/i915: remove i915_rstdby_delays debugfs entry
Quoted 43 lines · On Wed, 9 Jul 2014 15:10:46 +0300 Mika Kuoppala…
CHV hard hangs on reading on
0x11100References: https://bugs.freedesktop.org/show_bug.cgi?id=80893
Signed-off-by Mika Kuoppala <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 24 ------------------------ 1 file changed, 24 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-23@@ -994,29 +994,6 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops, i915_next_seqno_get, i915_next_seqno_set, "0x%llx\n"); -static int i915_rstdby_delays (struct seq_file *m,void *unused) -{ -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv = dev->dev_private; -u16 crstanddelay; -int ret; - - ret =mutex_lock_interruptible (&dev->struct_mutex); -if (ret) -return ret; -intel_runtime_pm_get (dev_priv); - - crstanddelay =I915_READ16 (CRSTANDVID ); - -intel_runtime_pm_put (dev_priv); -mutex_unlock (&dev->struct_mutex); - -seq_printf (m,"w/ctx: %d, w/o ctx: %d\n" , (crstanddelay >>8 ) &0x3f , (crstanddelay &0x3f )); - -return 0 ; -} -static int i915_frequency_info (struct seq_file *m,void *unused) {struct drm_info_node *node = m->private;
drivers/gpu/drm/i915/i915_debugfs.c static const struct drm_info_list i915_debugfs_list[] = { · line 3857
Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-1@@ -3875,7 +3852,6 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_gem_hws_blt", i915_hws_info, 0, (void *)BCS}, {"i915_gem_hws_bsd", i915_hws_info, 0, (void *)VCS}, {"i915_gem_hws_vebox", i915_hws_info, 0, (void *)VECS}, - {"i915_rstdby_delays", i915_rstdby_delays, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_drpc_info", i915_drpc_info, 0}, {"i915_emon_status", i915_emon_status, 0},
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Quoted 5 lines · Mika Kuoppala
These are accessing registers that the chv doesn't seem to have. Read access on these regions cause a system hard hang.
If some of these are still on use just nack and I do gen check patch instead.
For the first two we could also just restrict them to relevant platforms. But as long as no one screams we might as well rip it out all. Entire series merged.
-Daniel
Quoted 17 lines
Mika Kuoppala (4):
drm/i915: removei915_delayedfreq_tabledebugfs entry drm/i915: removei915_inttoext_tabledebugfs entry drm/i915: removei915_gfxecdebugfs entry drm/i915: removei915_rstdby_delaysdebugfs entrydrivers/gpu/drm/i915/i915_debugfs.c | 102 ----------------------------------- 1 file changed, 102 deletions(-)Signature · 6 lines
1.7.9.5 _______________________________________________ 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