diff options
| author | Michal Wajdeczko <michal.wajdeczko@intel.com> | 2019-08-07 17:00:28 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-08-07 20:53:14 +0100 |
| commit | 12be4a4c75a2a41ba32b4b1368e9f40e43bfda0a (patch) | |
| tree | da565fe2ab7dcf4376829654d5e03aac583f5631 /drivers/gpu/drm/i915 | |
| parent | a37f08a882b01a6e86a07512a082b14d20ee0773 (diff) | |
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: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190807170034.8440-2-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_uc.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index e87b7904ab7a..3c007e0e1a20 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -59,11 +59,14 @@ 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", - i915_modparams.enable_guc, - yesno(intel_uc_supports_guc(uc)), - yesno(intel_uc_supports_guc_submission(uc)), - yesno(intel_uc_supports_huc(uc))); + 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)), + yesno(intel_uc_supports_huc(uc))); if (i915_modparams.enable_guc == -1) return; @@ -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"); } |