| Message ID | 1475520182-9224-9-git-send-email-anusha.srivatsa@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> On Mon, Oct 03, 2016 at 11:43:02AM -0700, Anusha Srivatsa wrote: > From: Peter Antoine <peter.antoine@intel.com> > > This patch will allow for getparams to return the status of the HuC. > As the HuC has to be validated by the GuC this patch uses the validated > status to show when the HuC is loaded and ready for use. You cannot use > the loaded status as with the GuC as the HuC is verified after it is > loaded and is not usable until it is verified. > > v2: removed the forewakes as the registers are already force-woken. > (T.Ursulin) > v4: rebased. > v5: rebased. > > Tested-by: Xiang Haihao <haihao.xiang@intel.com> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > Signed-off-by: Peter Antoine <peter.antoine@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.c | 4 ++++ > drivers/gpu/drm/i915/intel_huc.h | 2 +- > drivers/gpu/drm/i915/intel_huc_loader.c | 14 ++++++++++++++ > include/uapi/drm/i915_drm.h | 1 + > 4 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index ff1c18d..0d7b290 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -49,6 +49,7 @@ > #include "i915_trace.h" > #include "i915_vgpu.h" > #include "intel_drv.h" > +#include "intel_huc.h" > #include "intel_guc.h" > > static struct drm_driver driver; > @@ -343,6 +344,9 @@ static int i915_getparam(struct drm_device *dev, void *data, > case I915_PARAM_HAS_GUC: > value = intel_is_guc_valid(dev_priv); > break; > + case I915_PARAM_HAS_HUC: > + value = intel_is_huc_valid(dev_priv); > + break; > default: > DRM_DEBUG("Unknown parameter %d\n", param->param); > return -EINVAL; > diff --git a/drivers/gpu/drm/i915/intel_huc.h b/drivers/gpu/drm/i915/intel_huc.h > index 946caa7..5eac625 100644 > --- a/drivers/gpu/drm/i915/intel_huc.h > +++ b/drivers/gpu/drm/i915/intel_huc.h > @@ -40,5 +40,5 @@ extern void intel_huc_init(struct drm_device *dev); > extern int intel_huc_load(struct drm_device *dev); > extern void intel_huc_auth(struct drm_device *dev); > extern void intel_huc_fini(struct drm_device *dev); > - > +extern int intel_is_huc_valid(struct drm_i915_private *dev_priv); > #endif > diff --git a/drivers/gpu/drm/i915/intel_huc_loader.c b/drivers/gpu/drm/i915/intel_huc_loader.c > index 87a6948..d574183 100644 > --- a/drivers/gpu/drm/i915/intel_huc_loader.c > +++ b/drivers/gpu/drm/i915/intel_huc_loader.c > @@ -273,3 +273,17 @@ void intel_huc_fini(struct drm_device *dev) > > huc_fw->fetch_status = UC_FIRMWARE_NONE; > } > + > +/** > + * intel_is_huc_valid() - Check to see if the HuC is fully loaded. > + * @dev_priv: drm device to check. > + * > + * This function will return true if the guc has been loaded and > + * has valid firmware. The simplest way of doing this is to check > + * if the HuC has been validated, if so it must have been loaded. > + */ > +int intel_is_huc_valid(struct drm_i915_private *dev_priv) > +{ > + return ((I915_READ(HUC_STATUS2) & HUC_FW_VERIFIED) != 0); > +} > + > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h > index 629fb5e..d236520 100644 > --- a/include/uapi/drm/i915_drm.h > +++ b/include/uapi/drm/i915_drm.h > @@ -389,6 +389,7 @@ typedef struct drm_i915_irq_wait { > #define I915_PARAM_MIN_EU_IN_POOL 39 > #define I915_PARAM_MMAP_GTT_VERSION 40 > #define I915_PARAM_HAS_GUC 41 > +#define I915_PARAM_HAS_HUC 42 > > typedef struct drm_i915_getparam { > __s32 param; > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, Oct 03, 2016 at 11:43:02AM -0700, Anusha Srivatsa wrote: > From: Peter Antoine <peter.antoine@intel.com> > > This patch will allow for getparams to return the status of the HuC. > As the HuC has to be validated by the GuC this patch uses the validated > status to show when the HuC is loaded and ready for use. You cannot use > the loaded status as with the GuC as the HuC is verified after it is > loaded and is not usable until it is verified. > > v2: removed the forewakes as the registers are already force-woken. > (T.Ursulin) > v4: rebased. > v5: rebased. > > Tested-by: Xiang Haihao <haihao.xiang@intel.com> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > Signed-off-by: Peter Antoine <peter.antoine@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.c | 4 ++++ > drivers/gpu/drm/i915/intel_huc.h | 2 +- > drivers/gpu/drm/i915/intel_huc_loader.c | 14 ++++++++++++++ > include/uapi/drm/i915_drm.h | 1 + > 4 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index ff1c18d..0d7b290 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -49,6 +49,7 @@ > #include "i915_trace.h" > #include "i915_vgpu.h" > #include "intel_drv.h" > +#include "intel_huc.h" > #include "intel_guc.h" > > static struct drm_driver driver; > @@ -343,6 +344,9 @@ static int i915_getparam(struct drm_device *dev, void *data, > case I915_PARAM_HAS_GUC: > value = intel_is_guc_valid(dev_priv); > break; > + case I915_PARAM_HAS_HUC: > + value = intel_is_huc_valid(dev_priv); > + break; > default: > DRM_DEBUG("Unknown parameter %d\n", param->param); > return -EINVAL; > diff --git a/drivers/gpu/drm/i915/intel_huc.h b/drivers/gpu/drm/i915/intel_huc.h > index 946caa7..5eac625 100644 > --- a/drivers/gpu/drm/i915/intel_huc.h > +++ b/drivers/gpu/drm/i915/intel_huc.h > @@ -40,5 +40,5 @@ extern void intel_huc_init(struct drm_device *dev); > extern int intel_huc_load(struct drm_device *dev); > extern void intel_huc_auth(struct drm_device *dev); > extern void intel_huc_fini(struct drm_device *dev); > - > +extern int intel_is_huc_valid(struct drm_i915_private *dev_priv); > #endif > diff --git a/drivers/gpu/drm/i915/intel_huc_loader.c b/drivers/gpu/drm/i915/intel_huc_loader.c > index 87a6948..d574183 100644 > --- a/drivers/gpu/drm/i915/intel_huc_loader.c > +++ b/drivers/gpu/drm/i915/intel_huc_loader.c > @@ -273,3 +273,17 @@ void intel_huc_fini(struct drm_device *dev) > > huc_fw->fetch_status = UC_FIRMWARE_NONE; > } > + > +/** > + * intel_is_huc_valid() - Check to see if the HuC is fully loaded. > + * @dev_priv: drm device to check. > + * > + * This function will return true if the guc has been loaded and > + * has valid firmware. The simplest way of doing this is to check > + * if the HuC has been validated, if so it must have been loaded. > + */ > +int intel_is_huc_valid(struct drm_i915_private *dev_priv) I'm still unclear on the 'intel' vs. 'i915' prefix usage. But it seems that intel prefixed functions accept drm_device instead of drm_i915_private. Also, need to see the userspace usage of this new GETPARAM. > +{ > + return ((I915_READ(HUC_STATUS2) & HUC_FW_VERIFIED) != 0); > +} > + > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h > index 629fb5e..d236520 100644 > --- a/include/uapi/drm/i915_drm.h > +++ b/include/uapi/drm/i915_drm.h > @@ -389,6 +389,7 @@ typedef struct drm_i915_irq_wait { > #define I915_PARAM_MIN_EU_IN_POOL 39 > #define I915_PARAM_MMAP_GTT_VERSION 40 > #define I915_PARAM_HAS_GUC 41 > +#define I915_PARAM_HAS_HUC 42 > > typedef struct drm_i915_getparam { > __s32 param; > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, Oct 13, 2016 at 02:47:32PM -0700, Jeff McGee wrote: > On Mon, Oct 03, 2016 at 11:43:02AM -0700, Anusha Srivatsa wrote: > > From: Peter Antoine <peter.antoine@intel.com> > > > > This patch will allow for getparams to return the status of the HuC. > > As the HuC has to be validated by the GuC this patch uses the validated > > status to show when the HuC is loaded and ready for use. You cannot use > > the loaded status as with the GuC as the HuC is verified after it is > > loaded and is not usable until it is verified. > > > > v2: removed the forewakes as the registers are already force-woken. > > (T.Ursulin) > > v4: rebased. > > v5: rebased. > > > > Tested-by: Xiang Haihao <haihao.xiang@intel.com> > > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > > Signed-off-by: Peter Antoine <peter.antoine@intel.com> > > --- > > drivers/gpu/drm/i915/i915_drv.c | 4 ++++ > > drivers/gpu/drm/i915/intel_huc.h | 2 +- > > drivers/gpu/drm/i915/intel_huc_loader.c | 14 ++++++++++++++ > > include/uapi/drm/i915_drm.h | 1 + > > 4 files changed, 20 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > > index ff1c18d..0d7b290 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.c > > +++ b/drivers/gpu/drm/i915/i915_drv.c > > @@ -49,6 +49,7 @@ > > #include "i915_trace.h" > > #include "i915_vgpu.h" > > #include "intel_drv.h" > > +#include "intel_huc.h" > > #include "intel_guc.h" > > > > static struct drm_driver driver; > > @@ -343,6 +344,9 @@ static int i915_getparam(struct drm_device *dev, void *data, > > case I915_PARAM_HAS_GUC: > > value = intel_is_guc_valid(dev_priv); > > break; > > + case I915_PARAM_HAS_HUC: > > + value = intel_is_huc_valid(dev_priv); > > + break; > > default: > > DRM_DEBUG("Unknown parameter %d\n", param->param); > > return -EINVAL; > > diff --git a/drivers/gpu/drm/i915/intel_huc.h b/drivers/gpu/drm/i915/intel_huc.h > > index 946caa7..5eac625 100644 > > --- a/drivers/gpu/drm/i915/intel_huc.h > > +++ b/drivers/gpu/drm/i915/intel_huc.h > > @@ -40,5 +40,5 @@ extern void intel_huc_init(struct drm_device *dev); > > extern int intel_huc_load(struct drm_device *dev); > > extern void intel_huc_auth(struct drm_device *dev); > > extern void intel_huc_fini(struct drm_device *dev); > > - > > +extern int intel_is_huc_valid(struct drm_i915_private *dev_priv); > > #endif > > diff --git a/drivers/gpu/drm/i915/intel_huc_loader.c b/drivers/gpu/drm/i915/intel_huc_loader.c > > index 87a6948..d574183 100644 > > --- a/drivers/gpu/drm/i915/intel_huc_loader.c > > +++ b/drivers/gpu/drm/i915/intel_huc_loader.c > > @@ -273,3 +273,17 @@ void intel_huc_fini(struct drm_device *dev) > > > > huc_fw->fetch_status = UC_FIRMWARE_NONE; > > } > > + > > +/** > > + * intel_is_huc_valid() - Check to see if the HuC is fully loaded. > > + * @dev_priv: drm device to check. > > + * > > + * This function will return true if the guc has been loaded and > > + * has valid firmware. The simplest way of doing this is to check > > + * if the HuC has been validated, if so it must have been loaded. > > + */ > > +int intel_is_huc_valid(struct drm_i915_private *dev_priv) > I'm still unclear on the 'intel' vs. 'i915' prefix usage. But it seems > that intel prefixed functions accept drm_device instead of drm_i915_private. intel_ is core and modeset, i915_ is gem stuff. mostly. Absolutely nothing to do with drm_device vs. drm_i915_private, that should only be a question of whether it's a drm vfunc or an internal one (we're transitioning to that pattern, so atm it's a bit a mess). > Also, need to see the userspace usage of this new GETPARAM. +1 ;-) Cheers, Daniel
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index ff1c18d..0d7b290 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -49,6 +49,7 @@ #include "i915_trace.h" #include "i915_vgpu.h" #include "intel_drv.h" +#include "intel_huc.h" #include "intel_guc.h" static struct drm_driver driver; @@ -343,6 +344,9 @@ static int i915_getparam(struct drm_device *dev, void *data, case I915_PARAM_HAS_GUC: value = intel_is_guc_valid(dev_priv); break; + case I915_PARAM_HAS_HUC: + value = intel_is_huc_valid(dev_priv); + break; default: DRM_DEBUG("Unknown parameter %d\n", param->param); return -EINVAL; diff --git a/drivers/gpu/drm/i915/intel_huc.h b/drivers/gpu/drm/i915/intel_huc.h index 946caa7..5eac625 100644 --- a/drivers/gpu/drm/i915/intel_huc.h +++ b/drivers/gpu/drm/i915/intel_huc.h @@ -40,5 +40,5 @@ extern void intel_huc_init(struct drm_device *dev); extern int intel_huc_load(struct drm_device *dev); extern void intel_huc_auth(struct drm_device *dev); extern void intel_huc_fini(struct drm_device *dev); - +extern int intel_is_huc_valid(struct drm_i915_private *dev_priv); #endif diff --git a/drivers/gpu/drm/i915/intel_huc_loader.c b/drivers/gpu/drm/i915/intel_huc_loader.c index 87a6948..d574183 100644 --- a/drivers/gpu/drm/i915/intel_huc_loader.c +++ b/drivers/gpu/drm/i915/intel_huc_loader.c @@ -273,3 +273,17 @@ void intel_huc_fini(struct drm_device *dev) huc_fw->fetch_status = UC_FIRMWARE_NONE; } + +/** + * intel_is_huc_valid() - Check to see if the HuC is fully loaded. + * @dev_priv: drm device to check. + * + * This function will return true if the guc has been loaded and + * has valid firmware. The simplest way of doing this is to check + * if the HuC has been validated, if so it must have been loaded. + */ +int intel_is_huc_valid(struct drm_i915_private *dev_priv) +{ + return ((I915_READ(HUC_STATUS2) & HUC_FW_VERIFIED) != 0); +} + diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index 629fb5e..d236520 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -389,6 +389,7 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_MIN_EU_IN_POOL 39 #define I915_PARAM_MMAP_GTT_VERSION 40 #define I915_PARAM_HAS_GUC 41 +#define I915_PARAM_HAS_HUC 42 typedef struct drm_i915_getparam { __s32 param;