summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2016-09-28 08:42:00 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2016-10-31 10:00:08 +0800
commit4df9c162a151e27a040101faa059af161c992cdf (patch)
treee4c76084acc6b154dfba73c3d4dd07552a0dbf6d
parent5ce9588287b5aa1ba98517b4e1ea96fac8d1b5ed (diff)
downloadlibva-intel-driver-4df9c162a151e27a040101faa059af161c992cdf.tar.gz
Check whether there is a fully loaded HuC firmware
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com> Reviewed-by: Zhao Yakui <yakui.zhao@intel.com> (cherry picked from commit 60a27d6bf7bf69accabe5b783000eb7aebbb2ed7)
-rw-r--r--src/intel_driver.c12
-rw-r--r--src/intel_driver.h1
2 files changed, 13 insertions, 0 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c
index 96c1994b..bb194015 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -44,6 +44,12 @@ uint32_t g_intel_debug_option_flags = 0;
#define LOCAL_I915_PARAM_HAS_BSD2 30
#endif
+#ifdef I915_PARAM_HAS_HUC
+#define LOCAL_I915_PARAM_HAS_HUC I915_PARAM_HAS_HUC
+#else
+#define LOCAL_I915_PARAM_HAS_HUC 42
+#endif
+
static Bool
intel_driver_get_param(struct intel_driver_data *intel, int param, int *value)
{
@@ -130,6 +136,12 @@ intel_driver_init(VADriverContextP ctx)
if (intel_driver_get_param(intel, LOCAL_I915_PARAM_HAS_BSD2, &ret_value))
intel->has_bsd2 = !!ret_value;
+ intel->has_huc = 0;
+ ret_value = 0;
+
+ if (intel_driver_get_param(intel, LOCAL_I915_PARAM_HAS_HUC, &ret_value))
+ intel->has_huc = !!ret_value;
+
intel_driver_get_revid(intel, &intel->revision);
return true;
}
diff --git a/src/intel_driver.h b/src/intel_driver.h
index c9a80c80..dcdc03b8 100644
--- a/src/intel_driver.h
+++ b/src/intel_driver.h
@@ -181,6 +181,7 @@ struct intel_driver_data
unsigned int has_blt : 1; /* Flag: has BLT unit? */
unsigned int has_vebox : 1; /* Flag: has VEBOX unit */
unsigned int has_bsd2 : 1; /* Flag: has the second BSD video ring unit */
+ unsigned int has_huc : 1; /* Flag: has a fully loaded HuC firmware? */
const struct intel_device_info *device_info;
};