| Message ID | 20180910104150.101752-1-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [CI,v2,1/2] drm/i915/guc: Update GuC power domain states | expand |
Quoting Michal Wajdeczko (2018-09-10 11:41:49) > We should update GuC power domain states also when GuC submission > is disabled, otherwise GuC might complain or ignore our requests. > This seems to be required for all currently released GuC firmwares. Was it expected to fix the live_guc selftest? Might be worth mentioning Testcase: igt/drv_selftest/live_guc in that case. -Chris
>-----Original Message----- >From: Wajdeczko, Michal >Sent: Monday, September 10, 2018 3:42 AM >To: intel-gfx@lists.freedesktop.org >Cc: Wajdeczko, Michal <Michal.Wajdeczko@intel.com>; Spotswood, John A ><john.a.spotswood@intel.com>; Srivatsa, Anusha <anusha.srivatsa@intel.com>; >Lis, Tomasz <tomasz.lis@intel.com>; Ceraolo Spurio, Daniele ><daniele.ceraolospurio@intel.com> >Subject: [CI v2 1/2] drm/i915/guc: Update GuC power domain states > >We should update GuC power domain states also when GuC submission is >disabled, otherwise GuC might complain or ignore our requests. >This seems to be required for all currently released GuC firmwares. > >v2: it is only needed by pre-Gen11 firmwares > >Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> >Cc: John Spotswood <john.a.spotswood@intel.com> >Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> >Cc: Tomasz Lis <tomasz.lis@intel.com> >Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com> >--- > drivers/gpu/drm/i915/intel_uc.c | 4 ++++ > 1 file changed, 4 insertions(+) > >diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c >index 7c95697..b1b3e81 100644 >--- a/drivers/gpu/drm/i915/intel_uc.c >+++ b/drivers/gpu/drm/i915/intel_uc.c >@@ -401,6 +401,10 @@ int intel_uc_init_hw(struct drm_i915_private *i915) > ret = intel_guc_submission_enable(guc); > if (ret) > goto err_communication; >+ } else if (INTEL_GEN(i915) < 11) { >+ ret = intel_guc_sample_forcewake(guc); >+ if (ret) >+ goto err_communication; > } > > dev_info(i915->drm.dev, "GuC firmware version %u.%u\n", >-- >1.9.1
Quoting Srivatsa, Anusha (2018-09-10 17:39:30) > > > >-----Original Message----- > >From: Wajdeczko, Michal > >Sent: Monday, September 10, 2018 3:42 AM > >To: intel-gfx@lists.freedesktop.org > >Cc: Wajdeczko, Michal <Michal.Wajdeczko@intel.com>; Spotswood, John A > ><john.a.spotswood@intel.com>; Srivatsa, Anusha <anusha.srivatsa@intel.com>; > >Lis, Tomasz <tomasz.lis@intel.com>; Ceraolo Spurio, Daniele > ><daniele.ceraolospurio@intel.com> > >Subject: [CI v2 1/2] drm/i915/guc: Update GuC power domain states > > > >We should update GuC power domain states also when GuC submission is > >disabled, otherwise GuC might complain or ignore our requests. > >This seems to be required for all currently released GuC firmwares. > > > >v2: it is only needed by pre-Gen11 firmwares > > > >Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> > >Cc: John Spotswood <john.a.spotswood@intel.com> > >Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> > >Cc: Tomasz Lis <tomasz.lis@intel.com> > >Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com> And pushed. Thanks for the patch and review, -Chris
Quoting Chris Wilson (2018-09-10 16:34:36) > Quoting Michal Wajdeczko (2018-09-10 11:41:49) > > We should update GuC power domain states also when GuC submission > > is disabled, otherwise GuC might complain or ignore our requests. > > This seems to be required for all currently released GuC firmwares. > > Was it expected to fix the live_guc selftest? Might be worth mentioning > Testcase: igt/drv_selftest/live_guc > in that case. Yes. It was because HAX wasn't to enable guc live I thought it was going to be, but to clear guc submission. My bad for not reading before speaking. -Chris
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 7c95697..b1b3e81 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -401,6 +401,10 @@ int intel_uc_init_hw(struct drm_i915_private *i915) ret = intel_guc_submission_enable(guc); if (ret) goto err_communication; + } else if (INTEL_GEN(i915) < 11) { + ret = intel_guc_sample_forcewake(guc); + if (ret) + goto err_communication; } dev_info(i915->drm.dev, "GuC firmware version %u.%u\n",
We should update GuC power domain states also when GuC submission is disabled, otherwise GuC might complain or ignore our requests. This seems to be required for all currently released GuC firmwares. v2: it is only needed by pre-Gen11 firmwares Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: John Spotswood <john.a.spotswood@intel.com> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> Cc: Tomasz Lis <tomasz.lis@intel.com> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> --- drivers/gpu/drm/i915/intel_uc.c | 4 ++++ 1 file changed, 4 insertions(+)