Commit 12be4a4c authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915/uc: Prefer dev_info for reporting options 



While modparams are global for the i915 module, we are reporting
status of the params applied against specific device instance.

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/20190807170034.8440-2-michal.wajdeczko@intel.com
parent a37f08a8

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

+16 −9
Original line number Diff line number Diff line
@@ -59,7 +59,10 @@ static int __intel_uc_reset_hw(struct intel_uc *uc) 


static void __confirm_options(struct intel_uc *uc)

{

	DRM_DEBUG_DRIVER("enable_guc=%d (guc:%s submission:%s huc:%s)\n",

	struct drm_i915_private *i915 = uc_to_gt(uc)->i915;



	DRM_DEV_DEBUG_DRIVER(i915->drm.dev,

			     "enable_guc=%d (guc:%s submission:%s huc:%s)\n",

			     i915_modparams.enable_guc,

			     yesno(intel_uc_supports_guc(uc)),

			     yesno(intel_uc_supports_guc_submission(uc)),
@@ -76,22 +79,26 @@ static void __confirm_options(struct intel_uc *uc) 
	}



	if (!intel_uc_supports_guc(uc))

		DRM_INFO("Incompatible option enable_guc=%d - %s\n",

		dev_info(i915->drm.dev,

			 "Incompatible option enable_guc=%d - %s\n",

			 i915_modparams.enable_guc, "GuC is not supported!");



	if (i915_modparams.enable_guc & ENABLE_GUC_LOAD_HUC &&

	    !intel_uc_supports_huc(uc))

		DRM_INFO("Incompatible option enable_guc=%d - %s\n",

		dev_info(i915->drm.dev,

			 "Incompatible option enable_guc=%d - %s\n",

			 i915_modparams.enable_guc, "HuC is not supported!");



	if (i915_modparams.enable_guc & ENABLE_GUC_SUBMISSION &&

	    !intel_uc_supports_guc_submission(uc))

		DRM_INFO("Incompatible option enable_guc=%d - %s\n",

		dev_info(i915->drm.dev,

			 "Incompatible option enable_guc=%d - %s\n",

			 i915_modparams.enable_guc, "GuC submission is N/A");



	if (i915_modparams.enable_guc & ~(ENABLE_GUC_SUBMISSION |

					  ENABLE_GUC_LOAD_HUC))

		DRM_INFO("Incompatible option enable_guc=%d - %s\n",

		dev_info(i915->drm.dev,

			 "Incompatible option enable_guc=%d - %s\n",

			 i915_modparams.enable_guc, "undocumented flag");

}