| Message ID | 20231101214446.600290-1-zhanjun.dong@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Skip pxp init if gt is wedged | expand |
On Wed, Nov 01, 2023 at 02:44:46PM -0700, Zhanjun Dong wrote: > The gt wedged could be triggered by missing guc firmware file, HW not > working, etc. Once triggered, it means all gt usage is dead, therefore we > can't enable pxp under this fatal error condition. > > v2: Updated commit message. > > Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com> > --- > drivers/gpu/drm/i915/pxp/intel_pxp.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.c b/drivers/gpu/drm/i915/pxp/intel_pxp.c > index dc327cf40b5a..923f233c91e1 100644 > --- a/drivers/gpu/drm/i915/pxp/intel_pxp.c > +++ b/drivers/gpu/drm/i915/pxp/intel_pxp.c > @@ -212,6 +212,9 @@ int intel_pxp_init(struct drm_i915_private *i915) > if (!gt) > return -ENODEV; > > + if (intel_gt_is_wedged(gt)) > + return -ENODEV; we need some error message. also we need to fix the fact that these returns are entirely ignored. or you convert this function to void and then add a message here before return; on this case. Or you return some different error and at probe if error but error different then ENODEV you print a message saying pxp init failed. but we need some log/error information. I honestly would prefer to convert to void and print the msg here. with some changes like this you can count with my rv-b > + > /* > * At this point, we will either enable full featured PXP capabilities > * including session and object management, or we will init the backend tee > -- > 2.34.1 >
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.c b/drivers/gpu/drm/i915/pxp/intel_pxp.c index dc327cf40b5a..923f233c91e1 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp.c +++ b/drivers/gpu/drm/i915/pxp/intel_pxp.c @@ -212,6 +212,9 @@ int intel_pxp_init(struct drm_i915_private *i915) if (!gt) return -ENODEV; + if (intel_gt_is_wedged(gt)) + return -ENODEV; + /* * At this point, we will either enable full featured PXP capabilities * including session and object management, or we will init the backend tee
The gt wedged could be triggered by missing guc firmware file, HW not working, etc. Once triggered, it means all gt usage is dead, therefore we can't enable pxp under this fatal error condition. v2: Updated commit message. Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com> --- drivers/gpu/drm/i915/pxp/intel_pxp.c | 3 +++ 1 file changed, 3 insertions(+)