Commit 801a0caa authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915/huc: make "support huc" reflect HW capabilities 



We currently initialize HuC support based on GuC being enabled in
modparam; this means that huc_is_supported() can return false on HW that
does have a HuC when enable_guc=0. The rationale for this behavior is
that HuC requires GuC for authentication and therefore is not supported
by itself. However, we do not allow defining HuC fw wthout GuC fw and
selecting HuC in modparam implicitly selects GuC as well, so we can't
actually hit a scenario where HuC is selected alone. Therefore, we can
flip the support check to reflect the HW capabilities and fw
availability, which is more intuitive and will make it cleaner to log
HuC the difference between not supported in HW and not selected.

Removing the difference between GuC and HuC also allows us to simplify
the init_early, since we don't need to differentiate the support based
on the type of uC.

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@intel.com>
Reviewed-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200326181121.16869-4-daniele.ceraolospurio@intel.com
parent 708249a6

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

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ void intel_guc_init_early(struct intel_guc *guc) 
{

	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;



	intel_guc_fw_init_early(guc);

	intel_uc_fw_init_early(&guc->fw, INTEL_UC_FW_TYPE_GUC);

	intel_guc_ct_init_early(&guc->ct);

	intel_guc_log_init_early(&guc->log);

	intel_guc_submission_init_early(guc);

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

+0 −14
Original line number Diff line number Diff line
@@ -13,20 +13,6 @@ 
#include "intel_guc_fw.h"

#include "i915_drv.h"



/**

 * intel_guc_fw_init_early() - initializes GuC firmware struct

 * @guc: intel_guc struct

 *

 * On platforms with GuC selects firmware for uploading

 */

void intel_guc_fw_init_early(struct intel_guc *guc)

{

	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;



	intel_uc_fw_init_early(&guc->fw, INTEL_UC_FW_TYPE_GUC, HAS_GT_UC(i915),

			       INTEL_INFO(i915)->platform, INTEL_REVID(i915));

}



static void guc_prepare_xfer(struct intel_uncore *uncore)

{

	u32 shim_flags = GUC_DISABLE_SRAM_INIT_TO_ZEROES |

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

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 


struct intel_guc;



void intel_guc_fw_init_early(struct intel_guc *guc);

int intel_guc_fw_upload(struct intel_guc *guc);



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ void intel_huc_init_early(struct intel_huc *huc) 
{

	struct drm_i915_private *i915 = huc_to_gt(huc)->i915;



	intel_huc_fw_init_early(huc);

	intel_uc_fw_init_early(&huc->fw, INTEL_UC_FW_TYPE_HUC);



	if (INTEL_GEN(i915) >= 11) {

		huc->status.reg = GEN11_HUC_KERNEL_LOAD_INFO;

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

+0 −17
Original line number Diff line number Diff line
@@ -7,23 +7,6 @@ 
#include "intel_huc_fw.h"

#include "i915_drv.h"



/**

 * intel_huc_fw_init_early() - initializes HuC firmware struct

 * @huc: intel_huc struct

 *

 * On platforms with HuC selects firmware for uploading

 */

void intel_huc_fw_init_early(struct intel_huc *huc)

{

	struct intel_gt *gt = huc_to_gt(huc);

	struct intel_uc *uc = &gt->uc;

	struct drm_i915_private *i915 = gt->i915;



	intel_uc_fw_init_early(&huc->fw, INTEL_UC_FW_TYPE_HUC,

			       intel_uc_wants_guc(uc),

			       INTEL_INFO(i915)->platform, INTEL_REVID(i915));

}



/**

 * intel_huc_fw_upload() - load HuC uCode to device

 * @huc: intel_huc structure

CRA Git | Maintained and supported by SUSTech CRA and CCSE