From: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> To: jani.nikula@linux.intel.com, daniel@ffwll.ch, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, David Airlie <airlied@linux.ie> Cc: pankaj.laxminarayan.bharadiya@intel.com Subject: [Intel-gfx][PATCH 10/10] drm/i915: Make MISSING_CASE backtrace i915 specific Date: Tue, 25 Feb 2020 19:17:09 +0530 [thread overview] Message-ID: <20200225134709.6153-11-pankaj.laxminarayan.bharadiya@intel.com> (raw) In-Reply-To: <20200225134709.6153-1-pankaj.laxminarayan.bharadiya@intel.com> i915_MISSING_CASE macro includes the device information in the backtrace, so we know what device the warnings originate from. Covert MISSING_CASE calls with i915 specific i915_MISSING_CASE variant in functions where drm_i915_private struct pointer is readily available. The conversion was done automatically with below coccinelle semantic patch. @rule1@ identifier func, T; @@ func(...) { ... struct drm_i915_private *T = ...; <... -MISSING_CASE( +i915_MISSING_CASE(T, ...) ...> } @rule2@ identifier func, T; @@ func(struct drm_i915_private *T,...) { <... -MISSING_CASE( +i915_MISSING_CASE(T, ...) ...> } Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 3 ++- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 13 +++++++------ drivers/gpu/drm/i915/intel_pm.c | 10 +++++----- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 8f2525e4ce0f..fa2cbee62a3b 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -192,7 +192,8 @@ i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) break; default: - MISSING_CASE(vma->ggtt_view.type); + i915_MISSING_CASE(dev_priv, + vma->ggtt_view.type); break; } } diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index dba5fe1391e8..fe328fcc4267 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -784,7 +784,7 @@ skl_get_dram_type(struct drm_i915_private *dev_priv) case SKL_DRAM_DDR_TYPE_LPDDR4: return INTEL_DRAM_LPDDR4; default: - MISSING_CASE(val); + i915_MISSING_CASE(dev_priv, val); return INTEL_DRAM_UNKNOWN; } } diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.c b/drivers/gpu/drm/i915/i915_gem_fence_reg.c index 049cd3785347..8a417085265d 100644 --- a/drivers/gpu/drm/i915/i915_gem_fence_reg.c +++ b/drivers/gpu/drm/i915/i915_gem_fence_reg.c @@ -908,5 +908,5 @@ void intel_gt_init_swizzling(struct intel_gt *gt) GAMTARBMODE, _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_BDW)); else - MISSING_CASE(INTEL_GEN(i915)); + i915_MISSING_CASE(i915, INTEL_GEN(i915)); } diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 2a4cd0ba5464..9bdc9835a318 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -1150,7 +1150,7 @@ static void engine_record_registers(struct intel_engine_coredump *ee) if (IS_GEN(i915, 7)) { switch (engine->id) { default: - MISSING_CASE(engine->id); + i915_MISSING_CASE(i915, engine->id); /* fall through */ case RCS0: mmio = RENDER_HWS_PGA_GEN7; diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index 8e99ad097830..5e2f32d6643a 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -615,7 +615,7 @@ static void hsw_sseu_info_init(struct drm_i915_private *dev_priv) */ switch (INTEL_INFO(dev_priv)->gt) { default: - MISSING_CASE(INTEL_INFO(dev_priv)->gt); + i915_MISSING_CASE(dev_priv, INTEL_INFO(dev_priv)->gt); /* fall through */ case 1: sseu->slice_mask = BIT(0); @@ -634,8 +634,8 @@ static void hsw_sseu_info_init(struct drm_i915_private *dev_priv) fuse1 = I915_READ(HSW_PAVP_FUSE1); switch ((fuse1 & HSW_F1_EU_DIS_MASK) >> HSW_F1_EU_DIS_SHIFT) { default: - MISSING_CASE((fuse1 & HSW_F1_EU_DIS_MASK) >> - HSW_F1_EU_DIS_SHIFT); + i915_MISSING_CASE(dev_priv, (fuse1 & HSW_F1_EU_DIS_MASK) >> + HSW_F1_EU_DIS_SHIFT); /* fall through */ case HSW_F1_EU_DIS_10EUS: sseu->eu_per_subslice = 10; @@ -701,7 +701,7 @@ static u32 gen10_get_crystal_clock_freq(struct drm_i915_private *dev_priv, case GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ: return f24_mhz; default: - MISSING_CASE(crystal_clock); + i915_MISSING_CASE(dev_priv, crystal_clock); return 0; } } @@ -727,7 +727,7 @@ static u32 gen11_get_crystal_clock_freq(struct drm_i915_private *dev_priv, case GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_25_MHZ: return f25_mhz; default: - MISSING_CASE(crystal_clock); + i915_MISSING_CASE(dev_priv, crystal_clock); return 0; } } @@ -805,7 +805,8 @@ static u32 read_timestamp_frequency(struct drm_i915_private *dev_priv) return freq; } - MISSING_CASE("Unknown gen, unable to read command streamer timestamp frequency\n"); + i915_MISSING_CASE(dev_priv, + "Unknown gen, unable to read command streamer timestamp frequency\n"); return 0; } diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 22aa205793e5..f3fa012ef98a 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -491,7 +491,7 @@ static void vlv_get_fifo_size(struct intel_crtc_state *crtc_state) sprite1_start = VLV_FIFO_START(dsparb3, dsparb2, 8, 20); break; default: - MISSING_CASE(pipe); + i915_MISSING_CASE(dev_priv, pipe); return; } @@ -2922,7 +2922,7 @@ static void intel_read_wm_latency(struct drm_i915_private *dev_priv, wm[1] = (mltr >> MLTR_WM1_SHIFT) & ILK_SRLT_MASK; wm[2] = (mltr >> MLTR_WM2_SHIFT) & ILK_SRLT_MASK; } else { - MISSING_CASE(INTEL_DEVID(dev_priv)); + i915_MISSING_CASE(dev_priv, INTEL_DEVID(dev_priv)); } } @@ -3657,7 +3657,7 @@ skl_setup_sagv_block_time(struct drm_i915_private *dev_priv) dev_priv->sagv_block_time_us = 30; return; } else { - MISSING_CASE(INTEL_GEN(dev_priv)); + i915_MISSING_CASE(dev_priv, INTEL_GEN(dev_priv)); } /* Default to an unusable block time */ @@ -4905,7 +4905,7 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state, wp->y_min_scanlines = 4; break; default: - MISSING_CASE(wp->cpp); + i915_MISSING_CASE(dev_priv, wp->cpp); return -EINVAL; } } else { @@ -7420,7 +7420,7 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv) else if (IS_GEN(dev_priv, 2)) dev_priv->display.init_clock_gating = i830_init_clock_gating; else { - MISSING_CASE(INTEL_DEVID(dev_priv)); + i915_MISSING_CASE(dev_priv, INTEL_DEVID(dev_priv)); dev_priv->display.init_clock_gating = nop_init_clock_gating; } } -- 2.23.0 _______________________________________________ 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: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> To: jani.nikula@linux.intel.com, daniel@ffwll.ch, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, David Airlie <airlied@linux.ie> Subject: [Intel-gfx] [PATCH 10/10] drm/i915: Make MISSING_CASE backtrace i915 specific Date: Tue, 25 Feb 2020 19:17:09 +0530 [thread overview] Message-ID: <20200225134709.6153-11-pankaj.laxminarayan.bharadiya@intel.com> (raw) In-Reply-To: <20200225134709.6153-1-pankaj.laxminarayan.bharadiya@intel.com> i915_MISSING_CASE macro includes the device information in the backtrace, so we know what device the warnings originate from. Covert MISSING_CASE calls with i915 specific i915_MISSING_CASE variant in functions where drm_i915_private struct pointer is readily available. The conversion was done automatically with below coccinelle semantic patch. @rule1@ identifier func, T; @@ func(...) { ... struct drm_i915_private *T = ...; <... -MISSING_CASE( +i915_MISSING_CASE(T, ...) ...> } @rule2@ identifier func, T; @@ func(struct drm_i915_private *T,...) { <... -MISSING_CASE( +i915_MISSING_CASE(T, ...) ...> } Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 3 ++- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 13 +++++++------ drivers/gpu/drm/i915/intel_pm.c | 10 +++++----- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 8f2525e4ce0f..fa2cbee62a3b 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -192,7 +192,8 @@ i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) break; default: - MISSING_CASE(vma->ggtt_view.type); + i915_MISSING_CASE(dev_priv, + vma->ggtt_view.type); break; } } diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index dba5fe1391e8..fe328fcc4267 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -784,7 +784,7 @@ skl_get_dram_type(struct drm_i915_private *dev_priv) case SKL_DRAM_DDR_TYPE_LPDDR4: return INTEL_DRAM_LPDDR4; default: - MISSING_CASE(val); + i915_MISSING_CASE(dev_priv, val); return INTEL_DRAM_UNKNOWN; } } diff --git a/drivers/gpu/drm/i915/i915_gem_fence_reg.c b/drivers/gpu/drm/i915/i915_gem_fence_reg.c index 049cd3785347..8a417085265d 100644 --- a/drivers/gpu/drm/i915/i915_gem_fence_reg.c +++ b/drivers/gpu/drm/i915/i915_gem_fence_reg.c @@ -908,5 +908,5 @@ void intel_gt_init_swizzling(struct intel_gt *gt) GAMTARBMODE, _MASKED_BIT_ENABLE(ARB_MODE_SWIZZLE_BDW)); else - MISSING_CASE(INTEL_GEN(i915)); + i915_MISSING_CASE(i915, INTEL_GEN(i915)); } diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 2a4cd0ba5464..9bdc9835a318 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -1150,7 +1150,7 @@ static void engine_record_registers(struct intel_engine_coredump *ee) if (IS_GEN(i915, 7)) { switch (engine->id) { default: - MISSING_CASE(engine->id); + i915_MISSING_CASE(i915, engine->id); /* fall through */ case RCS0: mmio = RENDER_HWS_PGA_GEN7; diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index 8e99ad097830..5e2f32d6643a 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -615,7 +615,7 @@ static void hsw_sseu_info_init(struct drm_i915_private *dev_priv) */ switch (INTEL_INFO(dev_priv)->gt) { default: - MISSING_CASE(INTEL_INFO(dev_priv)->gt); + i915_MISSING_CASE(dev_priv, INTEL_INFO(dev_priv)->gt); /* fall through */ case 1: sseu->slice_mask = BIT(0); @@ -634,8 +634,8 @@ static void hsw_sseu_info_init(struct drm_i915_private *dev_priv) fuse1 = I915_READ(HSW_PAVP_FUSE1); switch ((fuse1 & HSW_F1_EU_DIS_MASK) >> HSW_F1_EU_DIS_SHIFT) { default: - MISSING_CASE((fuse1 & HSW_F1_EU_DIS_MASK) >> - HSW_F1_EU_DIS_SHIFT); + i915_MISSING_CASE(dev_priv, (fuse1 & HSW_F1_EU_DIS_MASK) >> + HSW_F1_EU_DIS_SHIFT); /* fall through */ case HSW_F1_EU_DIS_10EUS: sseu->eu_per_subslice = 10; @@ -701,7 +701,7 @@ static u32 gen10_get_crystal_clock_freq(struct drm_i915_private *dev_priv, case GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_24_MHZ: return f24_mhz; default: - MISSING_CASE(crystal_clock); + i915_MISSING_CASE(dev_priv, crystal_clock); return 0; } } @@ -727,7 +727,7 @@ static u32 gen11_get_crystal_clock_freq(struct drm_i915_private *dev_priv, case GEN11_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_25_MHZ: return f25_mhz; default: - MISSING_CASE(crystal_clock); + i915_MISSING_CASE(dev_priv, crystal_clock); return 0; } } @@ -805,7 +805,8 @@ static u32 read_timestamp_frequency(struct drm_i915_private *dev_priv) return freq; } - MISSING_CASE("Unknown gen, unable to read command streamer timestamp frequency\n"); + i915_MISSING_CASE(dev_priv, + "Unknown gen, unable to read command streamer timestamp frequency\n"); return 0; } diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 22aa205793e5..f3fa012ef98a 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -491,7 +491,7 @@ static void vlv_get_fifo_size(struct intel_crtc_state *crtc_state) sprite1_start = VLV_FIFO_START(dsparb3, dsparb2, 8, 20); break; default: - MISSING_CASE(pipe); + i915_MISSING_CASE(dev_priv, pipe); return; } @@ -2922,7 +2922,7 @@ static void intel_read_wm_latency(struct drm_i915_private *dev_priv, wm[1] = (mltr >> MLTR_WM1_SHIFT) & ILK_SRLT_MASK; wm[2] = (mltr >> MLTR_WM2_SHIFT) & ILK_SRLT_MASK; } else { - MISSING_CASE(INTEL_DEVID(dev_priv)); + i915_MISSING_CASE(dev_priv, INTEL_DEVID(dev_priv)); } } @@ -3657,7 +3657,7 @@ skl_setup_sagv_block_time(struct drm_i915_private *dev_priv) dev_priv->sagv_block_time_us = 30; return; } else { - MISSING_CASE(INTEL_GEN(dev_priv)); + i915_MISSING_CASE(dev_priv, INTEL_GEN(dev_priv)); } /* Default to an unusable block time */ @@ -4905,7 +4905,7 @@ skl_compute_wm_params(const struct intel_crtc_state *crtc_state, wp->y_min_scanlines = 4; break; default: - MISSING_CASE(wp->cpp); + i915_MISSING_CASE(dev_priv, wp->cpp); return -EINVAL; } } else { @@ -7420,7 +7420,7 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv) else if (IS_GEN(dev_priv, 2)) dev_priv->display.init_clock_gating = i830_init_clock_gating; else { - MISSING_CASE(INTEL_DEVID(dev_priv)); + i915_MISSING_CASE(dev_priv, INTEL_DEVID(dev_priv)); dev_priv->display.init_clock_gating = nop_init_clock_gating; } } -- 2.23.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-02-25 13:59 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-25 13:46 [Intel-gfx][PATCH 00/10] drm/i915: Introduce i915 based i915_MISSING_CASE macro and us it in i915 Pankaj Bharadiya 2020-02-25 13:46 ` [Intel-gfx] [PATCH " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx][PATCH 01/10] drm/i915: Add i915 device based MISSING_CASE macro Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx] [PATCH " Pankaj Bharadiya 2020-02-25 14:01 ` [Intel-gfx][PATCH " Chris Wilson 2020-02-25 14:01 ` [Intel-gfx] [PATCH " Chris Wilson 2020-02-27 6:33 ` [Intel-gfx][PATCH " Laxminarayan Bharadiya, Pankaj 2020-02-27 6:33 ` [Intel-gfx] [PATCH " Laxminarayan Bharadiya, Pankaj 2020-02-27 8:29 ` [Intel-gfx][PATCH " Jani Nikula 2020-02-27 8:29 ` [Intel-gfx] [PATCH " Jani Nikula 2020-02-28 5:02 ` [Intel-gfx][PATCH " Laxminarayan Bharadiya, Pankaj 2020-02-28 5:02 ` [Intel-gfx] [PATCH " Laxminarayan Bharadiya, Pankaj 2020-02-25 13:47 ` [Intel-gfx][PATCH 02/10] drm/i915/display/cdclk: Make MISSING_CASE backtrace i915 specific Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx] [PATCH " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx][PATCH 03/10] drm/i915/display/ddi: " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx] [PATCH " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx][PATCH 04/10] drm/i915/display/display: " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx] [PATCH " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx][PATCH 05/10] drm/i915/dp: " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx] [PATCH " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx][PATCH 06/10] drm/i915/display/hdmi: " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx] [PATCH " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx][PATCH 07/10] drm/i915/display: " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx] [PATCH " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx][PATCH 08/10] drm/i915/gem: " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx] [PATCH " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx][PATCH 09/10] drm/i915/gt: " Pankaj Bharadiya 2020-02-25 13:47 ` [Intel-gfx] [PATCH " Pankaj Bharadiya 2020-02-25 13:47 ` Pankaj Bharadiya [this message] 2020-02-25 13:47 ` [Intel-gfx] [PATCH 10/10] drm/i915: " Pankaj Bharadiya 2020-02-26 16:04 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Introduce i915 based i915_MISSING_CASE macro and us it in i915 Patchwork 2020-02-26 17:22 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-02-27 6:37 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
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=20200225134709.6153-11-pankaj.laxminarayan.bharadiya@intel.com \ --to=pankaj.laxminarayan.bharadiya@intel.com \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@linux.intel.com \ --cc=joonas.lahtinen@linux.intel.com \ --cc=rodrigo.vivi@intel.com \ /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: linkBe 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.