From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org
Subject: [PATCH 7/8] drm/i915/uc: convert to drm device based logging
Date: Tue, 10 Dec 2019 14:30:49 +0200 [thread overview]
Message-ID: <20191210123050.8799-7-jani.nikula@intel.com> (raw)
In-Reply-To: <20191210123050.8799-1-jani.nikula@intel.com>
Prefer drm_dbg() over DRM_DEV_DEBUG_DRIVER().
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_uc.c | 12 ++++++------
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 10 +++++-----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
index 922a19635d20..72cff3224971 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@ -379,7 +379,7 @@ int intel_guc_init(struct intel_guc *guc)
intel_uc_fw_fini(&guc->fw);
err_fetch:
intel_uc_fw_cleanup_fetch(&guc->fw);
- DRM_DEV_DEBUG_DRIVER(gt->i915->drm.dev, "failed with %d\n", ret);
+ drm_dbg(>->i915->drm, "failed with %d\n", ret);
return ret;
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 32a069841c14..7f30d4a048d6 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -127,7 +127,7 @@ int intel_huc_init(struct intel_huc *huc)
intel_uc_fw_fini(&huc->fw);
out:
intel_uc_fw_cleanup_fetch(&huc->fw);
- DRM_DEV_DEBUG_DRIVER(i915->drm.dev, "failed with %d\n", err);
+ drm_dbg(&i915->drm, "failed with %d\n", err);
return err;
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index c6519066a0f6..de4feaa4b7a0 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -42,12 +42,12 @@ static void __confirm_options(struct intel_uc *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_uses_guc(uc)),
- yesno(intel_uc_uses_guc_submission(uc)),
- yesno(intel_uc_uses_huc(uc)));
+ drm_dbg(&i915->drm,
+ "enable_guc=%d (guc:%s submission:%s huc:%s)\n",
+ i915_modparams.enable_guc,
+ yesno(intel_uc_uses_guc(uc)),
+ yesno(intel_uc_uses_guc_submission(uc)),
+ yesno(intel_uc_uses_huc(uc)));
if (i915_modparams.enable_guc == -1)
return;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 66a30ab7044a..a88f4066be41 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -26,11 +26,11 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
enum intel_uc_fw_status status)
{
uc_fw->__status = status;
- DRM_DEV_DEBUG_DRIVER(__uc_fw_to_gt(uc_fw)->i915->drm.dev,
- "%s firmware -> %s\n",
- intel_uc_fw_type_repr(uc_fw->type),
- status == INTEL_UC_FIRMWARE_SELECTED ?
- uc_fw->path : intel_uc_fw_status_repr(status));
+ drm_dbg(&__uc_fw_to_gt(uc_fw)->i915->drm,
+ "%s firmware -> %s\n",
+ intel_uc_fw_type_repr(uc_fw->type),
+ status == INTEL_UC_FIRMWARE_SELECTED ?
+ uc_fw->path : intel_uc_fw_status_repr(status));
}
#endif
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 7/8] drm/i915/uc: convert to drm device based logging
Date: Tue, 10 Dec 2019 14:30:49 +0200 [thread overview]
Message-ID: <20191210123050.8799-7-jani.nikula@intel.com> (raw)
In-Reply-To: <20191210123050.8799-1-jani.nikula@intel.com>
Prefer drm_dbg() over DRM_DEV_DEBUG_DRIVER().
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_uc.c | 12 ++++++------
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 10 +++++-----
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
index 922a19635d20..72cff3224971 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@ -379,7 +379,7 @@ int intel_guc_init(struct intel_guc *guc)
intel_uc_fw_fini(&guc->fw);
err_fetch:
intel_uc_fw_cleanup_fetch(&guc->fw);
- DRM_DEV_DEBUG_DRIVER(gt->i915->drm.dev, "failed with %d\n", ret);
+ drm_dbg(>->i915->drm, "failed with %d\n", ret);
return ret;
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 32a069841c14..7f30d4a048d6 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -127,7 +127,7 @@ int intel_huc_init(struct intel_huc *huc)
intel_uc_fw_fini(&huc->fw);
out:
intel_uc_fw_cleanup_fetch(&huc->fw);
- DRM_DEV_DEBUG_DRIVER(i915->drm.dev, "failed with %d\n", err);
+ drm_dbg(&i915->drm, "failed with %d\n", err);
return err;
}
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index c6519066a0f6..de4feaa4b7a0 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -42,12 +42,12 @@ static void __confirm_options(struct intel_uc *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_uses_guc(uc)),
- yesno(intel_uc_uses_guc_submission(uc)),
- yesno(intel_uc_uses_huc(uc)));
+ drm_dbg(&i915->drm,
+ "enable_guc=%d (guc:%s submission:%s huc:%s)\n",
+ i915_modparams.enable_guc,
+ yesno(intel_uc_uses_guc(uc)),
+ yesno(intel_uc_uses_guc_submission(uc)),
+ yesno(intel_uc_uses_huc(uc)));
if (i915_modparams.enable_guc == -1)
return;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 66a30ab7044a..a88f4066be41 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -26,11 +26,11 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
enum intel_uc_fw_status status)
{
uc_fw->__status = status;
- DRM_DEV_DEBUG_DRIVER(__uc_fw_to_gt(uc_fw)->i915->drm.dev,
- "%s firmware -> %s\n",
- intel_uc_fw_type_repr(uc_fw->type),
- status == INTEL_UC_FIRMWARE_SELECTED ?
- uc_fw->path : intel_uc_fw_status_repr(status));
+ drm_dbg(&__uc_fw_to_gt(uc_fw)->i915->drm,
+ "%s firmware -> %s\n",
+ intel_uc_fw_type_repr(uc_fw->type),
+ status == INTEL_UC_FIRMWARE_SELECTED ?
+ uc_fw->path : intel_uc_fw_status_repr(status));
}
#endif
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-12-10 12:31 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 12:30 [PATCH 1/8] drm/print: introduce new struct drm_device based logging macros Jani Nikula
2019-12-10 12:30 ` [Intel-gfx] " Jani Nikula
2019-12-10 12:30 ` [PATCH 2/8] drm/client: convert to drm device based logging Jani Nikula
2019-12-10 12:30 ` [Intel-gfx] " Jani Nikula
2019-12-17 18:51 ` Sam Ravnborg
2019-12-17 18:51 ` [Intel-gfx] " Sam Ravnborg
2019-12-10 12:30 ` [PATCH 3/8] drm/fb-helper: " Jani Nikula
2019-12-10 12:30 ` [Intel-gfx] " Jani Nikula
2019-12-17 18:56 ` Sam Ravnborg
2019-12-17 18:56 ` [Intel-gfx] " Sam Ravnborg
2019-12-10 12:30 ` [PATCH 4/8] drm/gem-fb-helper: " Jani Nikula
2019-12-10 12:30 ` [Intel-gfx] " Jani Nikula
2019-12-17 18:57 ` Sam Ravnborg
2019-12-17 18:57 ` [Intel-gfx] " Sam Ravnborg
2019-12-19 14:23 ` Jani Nikula
2019-12-19 14:23 ` [Intel-gfx] " Jani Nikula
2019-12-10 12:30 ` [PATCH 5/8] drm/mipi-dbi: " Jani Nikula
2019-12-10 12:30 ` [Intel-gfx] " Jani Nikula
2019-12-17 19:00 ` Sam Ravnborg
2019-12-17 19:00 ` [Intel-gfx] " Sam Ravnborg
2019-12-17 19:10 ` Sam Ravnborg
2019-12-17 19:10 ` [Intel-gfx] " Sam Ravnborg
2019-12-10 12:30 ` [PATCH 6/8] drm/atomic: " Jani Nikula
2019-12-10 12:30 ` [Intel-gfx] " Jani Nikula
2019-12-12 8:07 ` [6/8] " james qian wang (Arm Technology China)
2019-12-12 8:07 ` [Intel-gfx] " james qian wang (Arm Technology China)
2019-12-12 8:33 ` Jani Nikula
2019-12-12 8:33 ` [Intel-gfx] " Jani Nikula
2019-12-17 19:07 ` [PATCH 6/8] " Sam Ravnborg
2019-12-17 19:07 ` [Intel-gfx] " Sam Ravnborg
2019-12-10 12:30 ` Jani Nikula [this message]
2019-12-10 12:30 ` [Intel-gfx] [PATCH 7/8] drm/i915/uc: " Jani Nikula
2019-12-10 12:30 ` [PATCH 8/8] drm/i915/wopcm: " Jani Nikula
2019-12-10 12:30 ` [Intel-gfx] " Jani Nikula
2019-12-10 12:34 ` [PATCH 1/8] drm/print: introduce new struct drm_device based logging macros Jani Nikula
2019-12-10 12:34 ` [Intel-gfx] " Jani Nikula
2019-12-10 22:07 ` Daniel Vetter
2019-12-10 22:07 ` [Intel-gfx] " Daniel Vetter
2019-12-10 19:27 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/8] " Patchwork
2019-12-10 19:52 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2019-12-12 21:53 ` [PATCH 1/8] " Sam Ravnborg
2019-12-12 21:53 ` [Intel-gfx] " Sam Ravnborg
2019-12-13 14:41 ` Jani Nikula
2019-12-13 14:41 ` [Intel-gfx] " Jani Nikula
2019-12-13 13:48 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/8] drm/print: introduce new struct drm_device based logging macros (rev2) Patchwork
2019-12-13 15:01 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2019-12-13 19:40 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/8] drm/print: introduce new struct drm_device based logging macros (rev3) Patchwork
2019-12-13 20:22 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2019-12-14 16:10 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2019-12-17 14:45 ` [PATCH 1/8] drm/print: introduce new struct drm_device based logging macros Jani Nikula
2019-12-17 14:45 ` [Intel-gfx] " Jani Nikula
2019-12-17 16:11 ` Sam Ravnborg
2019-12-17 16:11 ` [Intel-gfx] " Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191210123050.8799-7-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.