On Thu, 15 Aug 2019, Chris Wilson <[email protected]> wrote: > Looking around the GT initialisation, we have a few log messages we > think are interesting enough present to the user (such as the amount of L4 > cache) and a few to inform them of the result of actions or conflicting > HW restrictions (i.e. quirks). These are device specific messages, so > use the dev family of printk.
So drm_print.h has DRM_DEV_* variants of all the debug log macros. I am not particularly fond of them, and I'd prefer we added sensible, short functions that take struct drm_device instead of struct device, and converted all of i915 to them. However, I'm even less fond of having a mixture of everything in drm_print.h *and* device.h *and* printk.h. Thoughts? BR, Jani. > > Signed-off-by: Chris Wilson <[email protected]> > Cc: Joonas Lahtinen <[email protected]> > Cc: Michal Wajdeczko <[email protected]> > --- > drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 6 ++++-- > drivers/gpu/drm/i915/i915_drv.c | 3 ++- > drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +++-- > drivers/gpu/drm/i915/i915_gpu_error.c | 12 ++++++------ > drivers/gpu/drm/i915/i915_pmu.c | 2 +- > 5 files changed, 16 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c > b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c > index 696dea5ec7c6..e140da71aef3 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c > @@ -363,12 +363,14 @@ int i915_gem_init_stolen(struct drm_i915_private > *dev_priv) > mutex_init(&dev_priv->mm.stolen_lock); > > if (intel_vgpu_active(dev_priv)) { > - DRM_INFO("iGVT-g active, disabling use of stolen memory\n"); > + dev_notice(dev_priv->drm.dev, > + "iGVT-g active, disabling use of stolen memory\n"); > return 0; > } > > if (intel_vtd_active() && INTEL_GEN(dev_priv) < 8) { > - DRM_INFO("DMAR active, disabling use of stolen memory\n"); > + dev_notice(dev_priv->drm.dev, > + "DMAR active, disabling use of stolen memory\n"); > return 0; > } > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index a7c62bc7950b..2541a3a1c229 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1102,7 +1102,8 @@ static void edram_detect(struct drm_i915_private > *dev_priv) > dev_priv->edram_size_mb = > gen9_edram_size_mb(dev_priv, edram_cap); > > - DRM_INFO("Found %uMB of eDRAM\n", dev_priv->edram_size_mb); > + dev_info(dev_priv->drm.dev, > + "Found %uMB of eDRAM\n", dev_priv->edram_size_mb); > } > > /** > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c > b/drivers/gpu/drm/i915/i915_gem_gtt.c > index e07c1ae971d7..fcf05c213b0a 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -3104,7 +3104,8 @@ static int i915_gmch_probe(struct i915_ggtt *ggtt) > ggtt->vm.vma_ops.clear_pages = clear_pages; > > if (unlikely(ggtt->do_idle_maps)) > - DRM_INFO("applying Ironlake quirks for intel_iommu\n"); > + dev_notice(dev_priv->drm.dev, > + "Applying Ironlake quirks for intel_iommu\n"); > > return 0; > } > @@ -3165,7 +3166,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915) > return ret; > > if (intel_vtd_active()) > - DRM_INFO("VT-d active for gfx access\n"); > + dev_info(i915->drm.dev, "VT-d active for gfx access\n"); > > return 0; > } > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c > b/drivers/gpu/drm/i915/i915_gpu_error.c > index 6718fde1ed4c..0cdbbd32e29a 100644 > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > @@ -1767,12 +1767,12 @@ void i915_capture_error_state(struct drm_i915_private > *i915, > > if (!warned && > ktime_get_real_seconds() - DRIVER_TIMESTAMP < DAY_AS_SECONDS(180)) { > - DRM_INFO("GPU hangs can indicate a bug anywhere in the entire > gfx stack, including userspace.\n"); > - DRM_INFO("Please file a _new_ bug report on > bugs.freedesktop.org against DRI -> DRM/Intel\n"); > - DRM_INFO("drm/i915 developers can then reassign to the right > component if it's not a kernel issue.\n"); > - DRM_INFO("The gpu crash dump is required to analyze gpu hangs, > so please always attach it.\n"); > - DRM_INFO("GPU crash dump saved to > /sys/class/drm/card%d/error\n", > - i915->drm.primary->index); > + pr_info("GPU hangs can indicate a bug anywhere in the entire > gfx stack, including userspace.\n"); > + pr_info("Please file a _new_ bug report on bugs.freedesktop.org > against DRI -> DRM/Intel\n"); > + pr_info("drm/i915 developers can then reassign to the right > component if it's not a kernel issue.\n"); > + pr_info("The gpu crash dump is required to analyze gpu hangs, > so please always attach it.\n"); > + pr_info("GPU crash dump saved to /sys/class/drm/card%d/error\n", > + i915->drm.primary->index); > warned = true; > } > } > diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c > index c7ee0ab180e8..8e251e719390 100644 > --- a/drivers/gpu/drm/i915/i915_pmu.c > +++ b/drivers/gpu/drm/i915/i915_pmu.c > @@ -1053,7 +1053,7 @@ void i915_pmu_register(struct drm_i915_private *i915) > int ret; > > if (INTEL_GEN(i915) <= 2) { > - DRM_INFO("PMU not supported for this GPU."); > + dev_info(i915->drm.dev, "PMU not supported for this GPU."); > return; > } -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
