Commit 702668e6 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915/uc: Unify uC platform check 



We have several HAS_* checks for GuC and HuC but we mostly use HAS_GUC
and HAS_HUC, with only 1 exception. Since our HW always has either
both uC or neither of them, just replace all the checks with a unified
HAS_UC.

v2: use HAS_GT_UC (Michal)
v3: fix comment (Michal)

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190725001813.4740-2-daniele.ceraolospurio@intel.com
parent 2bf8fb39

drivers/gpu/drm/i915/gt/intel_reset.c

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ int intel_reset_guc(struct intel_gt *gt) 
		INTEL_GEN(gt->i915) >= 11 ? GEN11_GRDOM_GUC : GEN9_GRDOM_GUC;

	int ret;



	GEM_BUG_ON(!HAS_GUC(gt->i915));

	GEM_BUG_ON(!HAS_GT_UC(gt->i915));



	intel_uncore_forcewake_get(gt->uncore, FORCEWAKE_ALL);

	ret = gen6_hw_domain_reset(gt, guc_domain);

drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw) 


	GEM_BUG_ON(guc_fw->type != INTEL_UC_FW_TYPE_GUC);



	if (!HAS_GUC(i915)) {

	if (!HAS_GT_UC(i915)) {

		guc_fw->fetch_status = INTEL_UC_FIRMWARE_NOT_SUPPORTED;

		return;

	}

drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw) 


	GEM_BUG_ON(huc_fw->type != INTEL_UC_FW_TYPE_HUC);



	if (!HAS_HUC(dev_priv)) {

	if (!HAS_GT_UC(dev_priv)) {

		huc_fw->fetch_status = INTEL_UC_FIRMWARE_NOT_SUPPORTED;

		return;

	}

drivers/gpu/drm/i915/gt/uc/intel_uc.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int __get_platform_enable_guc(struct intel_uc *uc) 
	struct intel_uc_fw *huc_fw = &uc->huc.fw;

	int enable_guc = 0;



	if (!HAS_GUC(uc_to_gt(uc)->i915))

	if (!HAS_GT_UC(uc_to_gt(uc)->i915))

		return 0;



	/* We don't want to enable GuC/HuC on pre-Gen11 by default */

drivers/gpu/drm/i915/gt/uc/selftest_guc.c

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int igt_guc_clients(void *args) 
	struct intel_guc *guc;

	int err = 0;



	GEM_BUG_ON(!HAS_GUC(dev_priv));

	GEM_BUG_ON(!HAS_GT_UC(dev_priv));

	mutex_lock(&dev_priv->drm.struct_mutex);

	wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);
@@ -226,7 +226,7 @@ static int igt_guc_doorbells(void *arg) 
	int i, err = 0;

	u16 db_id;



	GEM_BUG_ON(!HAS_GUC(dev_priv));

	GEM_BUG_ON(!HAS_GT_UC(dev_priv));

	mutex_lock(&dev_priv->drm.struct_mutex);

	wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);