Quoting Michal Wajdeczko (2018-10-16 12:34:14)
> In response for I915_PARAM_HAS_HUC we are returning value that
> indicates if HuC firmware was loaded and verified. However, our
> previously used positive value was based on specific register bit
> which is about to change on future platform. Let's normalize our
> return values to 0 and 1 before clients will start to use Gen9 value.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
> Cc: Michal Winiarski <michal.winiarski@xxxxxxxxx>
> Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
> Cc: Haihao Xiang <haihao.xiang@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_huc.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
> index 37ef540d..46498aa 100644
> --- a/drivers/gpu/drm/i915/intel_huc.c
> +++ b/drivers/gpu/drm/i915/intel_huc.c
> @@ -108,8 +108,9 @@ int intel_huc_auth(struct intel_huc *huc)
> * This function reads status register to verify if HuC
> * firmware was successfully loaded.
> *
> - * Returns positive value if HuC firmware is loaded and verified
> - * and -ENODEV if HuC is not present.
> + * Returns: 1 if HuC firmware is loaded and verified,
> + * 0 if HuC firmware is not loaded and -ENODEV if HuC
> + * is not present on this platform.
> */
> int intel_huc_check_status(struct intel_huc *huc)
> {
> @@ -120,8 +121,8 @@ int intel_huc_check_status(struct intel_huc *huc)
> return -ENODEV;
>
> intel_runtime_pm_get(dev_priv);
> - status = I915_READ(HUC_STATUS2) & HUC_FW_VERIFIED;
> + status = I915_READ(HUC_STATUS2);
> intel_runtime_pm_put(dev_priv);
>
> - return status;
> + return status & HUC_FW_VERIFIED ? 1 : 0;
Wouldn't it have been simpler to just change
u32 status
to
bool status
Then I wouldn't even have to look at a ternary for a boolean.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
