[2/2] drm/i915: Make warned variable private
diff mbox series

Message ID 20191211160724.26467-2-venkata.s.dhanalakota@intel.com
State New
Headers show
Series
  • [1/2] drm/i915/perf: Register sysctl path globally
Related show

Commit Message

Venkata Sandeep Dhanalakota Dec. 11, 2019, 4:07 p.m. UTC
Make each instance to report the hang only once.

Cc: Sudeep Dutt <sudeep.dutt@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h       | 2 ++
 drivers/gpu/drm/i915/i915_gpu_error.c | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Chris Wilson Dec. 11, 2019, 4:17 p.m. UTC | #1
Quoting Venkata Sandeep Dhanalakota (2019-12-11 16:07:24)
> Make each instance to report the hang only once.
> 
> Cc: Sudeep Dutt <sudeep.dutt@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>

I still don't think so, since the we only want to pester the _user_ once
to file a bug, and that is irrespective of the device.
-Chris
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
Chris Wilson Dec. 11, 2019, 4:19 p.m. UTC | #2
Quoting Chris Wilson (2019-12-11 16:17:23)
> Quoting Venkata Sandeep Dhanalakota (2019-12-11 16:07:24)
> > Make each instance to report the hang only once.
> > 
> > Cc: Sudeep Dutt <sudeep.dutt@intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Signed-off-by: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
> 
> I still don't think so, since the we only want to pester the _user_ once
> to file a bug, and that is irrespective of the device.

Or to put it another way, the dmesg stream is global and this is a flag
around that stream.
-Chris
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
Lucas De Marchi Dec. 11, 2019, 10:20 p.m. UTC | #3
On Wed, Dec 11, 2019 at 04:19:58PM +0000, Chris Wilson wrote:
>Quoting Chris Wilson (2019-12-11 16:17:23)
>> Quoting Venkata Sandeep Dhanalakota (2019-12-11 16:07:24)
>> > Make each instance to report the hang only once.
>> >
>> > Cc: Sudeep Dutt <sudeep.dutt@intel.com>
>> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> > Cc: Jani Nikula <jani.nikula@intel.com>
>> > Signed-off-by: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
>>
>> I still don't think so, since the we only want to pester the _user_ once
>> to file a bug, and that is irrespective of the device.
>
>Or to put it another way, the dmesg stream is global and this is a flag
>around that stream.

maybe we could use WARN_ONCE()?

Lucas De Marchi

>-Chris
>---------------------------------------------------------------------
>Intel Corporation (UK) Limited
>Registered No. 1134945 (England)
>Registered Office: Pipers Way, Swindon SN3 1RJ
>VAT No: 860 2173 47
>
>This e-mail and any attachments may contain confidential material for
>the sole use of the intended recipient(s). Any review or distribution
>by others is strictly prohibited. If you are not the intended
>recipient, please contact the sender and delete all copies.
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson Dec. 11, 2019, 10:22 p.m. UTC | #4
Quoting Lucas De Marchi (2019-12-11 22:20:13)
> On Wed, Dec 11, 2019 at 04:19:58PM +0000, Chris Wilson wrote:
> >Quoting Chris Wilson (2019-12-11 16:17:23)
> >> Quoting Venkata Sandeep Dhanalakota (2019-12-11 16:07:24)
> >> > Make each instance to report the hang only once.
> >> >
> >> > Cc: Sudeep Dutt <sudeep.dutt@intel.com>
> >> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> >> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> >> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> >> > Cc: Jani Nikula <jani.nikula@intel.com>
> >> > Signed-off-by: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
> >>
> >> I still don't think so, since the we only want to pester the _user_ once
> >> to file a bug, and that is irrespective of the device.
> >
> >Or to put it another way, the dmesg stream is global and this is a flag
> >around that stream.
> 
> maybe we could use WARN_ONCE()?

It's not a warning and doesn't justify being one.
-Chris
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ce130e1f1e47..8e35f92f914e 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1284,6 +1284,8 @@  struct drm_i915_private {
 	/* Mutex to protect the above hdcp component related values. */
 	struct mutex hdcp_comp_mutex;
 
+	bool warned;
+
 	I915_SELFTEST_DECLARE(struct i915_selftest_stash selftest;)
 
 	/*
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 8374d50c0770..ea282d9a9a3a 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1785,7 +1785,6 @@  void i915_capture_error_state(struct drm_i915_private *i915,
 			      intel_engine_mask_t engine_mask,
 			      const char *msg)
 {
-	static bool warned;
 	struct i915_gpu_state *error;
 	unsigned long flags;
 
@@ -1815,7 +1814,7 @@  void i915_capture_error_state(struct drm_i915_private *i915,
 		return;
 	}
 
-	if (!xchg(&warned, true) &&
+	if (!xchg(&i915->warned, true) &&
 	    ktime_get_real_seconds() - DRIVER_TIMESTAMP < DAY_AS_SECONDS(180)) {
 		pr_info("GPU hangs can indicate a bug anywhere in the entire gfx stack, including userspace.\n");
 		pr_info("Please file a _new_ bug report on bugs.freedesktop.org against DRI -> DRM/Intel\n");