[4/4] Revert "drm/i915/guc: Disable global reset"
diff mbox series

Message ID 20190409213102.30124-5-fernando.pacheco@intel.com
State New
Headers show
Series
  • Perma-pin uC firmware and re-enable global reset
Related show

Commit Message

Fernando Pacheco April 9, 2019, 9:31 p.m. UTC
This reverts commit fe62365f9f80a1c1d438c54fba21f5108a182de8.

Signed-off-by: Fernando Pacheco <fernando.pacheco@intel.com>
---
 drivers/gpu/drm/i915/i915_reset.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Chris Wilson April 9, 2019, 9:54 p.m. UTC | #1
Quoting Fernando Pacheco (2019-04-09 22:31:02)
> This reverts commit fe62365f9f80a1c1d438c54fba21f5108a182de8.

And don't forget the test code that skips guc.
-Chris
Fernando Pacheco April 16, 2019, 2:45 p.m. UTC | #2
On 4/9/19 2:54 PM, Chris Wilson wrote:
> Quoting Fernando Pacheco (2019-04-09 22:31:02)
>> This reverts commit fe62365f9f80a1c1d438c54fba21f5108a182de8.
> And don't forget the test code that skips guc.
> -Chris

Selftests? I couldn't find anything that skips guc.
I found some skips for guc submission.

Fernando
Chris Wilson April 16, 2019, 3:05 p.m. UTC | #3
Quoting Fernando Pacheco (2019-04-16 15:45:03)
> 
> 
> On 4/9/19 2:54 PM, Chris Wilson wrote:
> > Quoting Fernando Pacheco (2019-04-09 22:31:02)
> >> This reverts commit fe62365f9f80a1c1d438c54fba21f5108a182de8.
> > And don't forget the test code that skips guc.
> > -Chris
> 
> Selftests? I couldn't find anything that skips guc.
> I found some skips for guc submission.

That should be moved to just skip the per-engine reset.
-Chris
Fernando Pacheco April 16, 2019, 3:10 p.m. UTC | #4
On 4/16/19 8:05 AM, Chris Wilson wrote:
> Quoting Fernando Pacheco (2019-04-16 15:45:03)
>>
>> On 4/9/19 2:54 PM, Chris Wilson wrote:
>>> Quoting Fernando Pacheco (2019-04-09 22:31:02)
>>>> This reverts commit fe62365f9f80a1c1d438c54fba21f5108a182de8.
>>> And don't forget the test code that skips guc.
>>> -Chris
>> Selftests? I couldn't find anything that skips guc.
>> I found some skips for guc submission.
> That should be moved to just skip the per-engine reset.
> -Chris

Thanks for the clarification.

Fernando

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/i915_reset.c b/drivers/gpu/drm/i915/i915_reset.c
index 68875ba43b8d..6f823d81c428 100644
--- a/drivers/gpu/drm/i915/i915_reset.c
+++ b/drivers/gpu/drm/i915/i915_reset.c
@@ -625,9 +625,6 @@  int intel_gpu_reset(struct drm_i915_private *i915,
 
 bool intel_has_gpu_reset(struct drm_i915_private *i915)
 {
-	if (USES_GUC(i915))
-		return false;
-
 	if (!i915_modparams.reset)
 		return NULL;