Commit 07587c34 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915/uc: Update messages from fw upload step 



Our old messages were redundant or misleading (as loaded is
not the same as running). Keep only one message for debug.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190811195132.9660-4-michal.wajdeczko@intel.com
parent d8d6e5eb

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

+3 −11
Original line number Diff line number Diff line
@@ -493,9 +493,6 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, struct intel_gt *gt, 
{

	int err;



	DRM_DEBUG_DRIVER("%s fw load %s\n",

			 intel_uc_fw_type_repr(uc_fw->type), uc_fw->path);



	/* make sure the status was cleared the last time we reset the uc */

	GEM_BUG_ON(intel_uc_fw_is_loaded(uc_fw));
@@ -514,14 +511,9 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, struct intel_gt *gt, 
		goto fail;



	uc_fw->status = INTEL_UC_FIRMWARE_TRANSFERRED;

	DRM_DEBUG_DRIVER("%s fw xfer completed\n",

			 intel_uc_fw_type_repr(uc_fw->type));



	DRM_INFO("%s: Loaded firmware %s (version %u.%u)\n",

		 intel_uc_fw_type_repr(uc_fw->type),

		 uc_fw->path,

		 uc_fw->major_ver_found, uc_fw->minor_ver_found);



	DRM_DEV_DEBUG_DRIVER(gt->i915->drm.dev, "%s firmware %s: %s\n",

			     intel_uc_fw_type_repr(uc_fw->type), uc_fw->path,

			     intel_uc_fw_status_repr(uc_fw->status));

	return 0;



fail: