Quoting Anusha Srivatsa (2018-06-22 19:19:03)
> In the guc_ctl_debug_flags, the ads struct is programmed only
> when USES_GUC_SUBMISSION is satisfied. But, this has to be
> programmed for all suspend/resume cases.
> Remove the condition and program the ads struct for
> both huc loading and guc submission.
>
> This issue was noticed when CI threw errors for enable_guc=2
> (load huc; disable submission)
>
> v2:
> - Change commit title.
> - Correct the shifts. (Daniele)
>
> Credits to: Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx>
> Cc: John Spotswood <john.a.spotswood@xxxxxxxxx>
> Cc: Oscar Mateo <oscar.mateo@xxxxxxxxx>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx>
> Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx>
> Reviewed-by: John Spotswood <john.a.spotswood@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_guc.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
> index 1aff30b..a2a9236 100644
> --- a/drivers/gpu/drm/i915/intel_guc.c
> +++ b/drivers/gpu/drm/i915/intel_guc.c
> @@ -207,6 +207,7 @@ static u32 guc_ctl_debug_flags(struct intel_guc *guc)
> {
> u32 level = intel_guc_log_get_level(&guc->log);
> u32 flags = 0;
> + u32 ads = 0;
>
> if (!GUC_LOG_LEVEL_IS_ENABLED(level))
> flags |= GUC_LOG_DEFAULT_DISABLED;
> @@ -217,12 +218,10 @@ static u32 guc_ctl_debug_flags(struct intel_guc *guc)
> flags |= GUC_LOG_LEVEL_TO_VERBOSITY(level) <<
> GUC_LOG_VERBOSITY_SHIFT;
>
> - if (USES_GUC_SUBMISSION(guc_to_i915(guc))) {
> - u32 ads = intel_guc_ggtt_offset(guc, guc->ads_vma)
> - >> PAGE_SHIFT;
> + ads = intel_guc_ggtt_offset(guc, guc->ads_vma) >>
> + PAGE_SHIFT;
I repaired the unnecessary line split and pushed.
Thanks for the patch and review,
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
