drm/i915: Shrink pipe config checker
Subsystems (2)
Tvrtko Ursulin
maintainerPATCH 1/1 drm/i915: Shrink pipe config checker
From: Tvrtko Ursulin <[email protected]>
Replace INTEL_ERR_OR_DBG_KMS macro with an intel_err_or_dbg_kms function to shrink the code and rodata strings.
text data bss dec hex filename
1271480 41831 2016 1315327 1411ff i915.ko.0 1265160 41831 2016 1309007 13f94f i915.ko.2
Total of ~6 KiB saving across text and strings.
--- drivers/gpu/drm/i915/intel_display.c | 51 ++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_display.c +34 -17
@@ -13218,6 +13218,31 @@ intel_compare_link_m_n(const struct intel_link_m_n *m_n,return false; } +static void +intel_err_or_dbg_kms (bool adjust,const char *name,const char *format, ...) +{ +char *level; +unsigned int category; +struct va_format vaf; +va_list args; + +if (adjust) { + level =KERN_DEBUG ; + category =DRM_UT_KMS ; + }else { + level =KERN_ERR ; + category =DRM_UT_NONE ; + } + +va_start (args, format); + vaf.fmt = format; + vaf.va = &args; + +drm_printk (level, category,"mismatch in %s %pV" , name, &vaf); + +va_end (args); +} + static bool intel_pipe_config_compare(struct drm_i915_private *dev_priv, struct intel_crtc_state *current_config,
@@ -13226,17 +13251,9 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv, {bool ret = true; -#define INTEL_ERR_OR_DBG_KMS (fmt, ...) \ - do { \ - if (!adjust) \ - DRM_ERROR(fmt, ##__VA_ARGS__); \ - else \ - DRM_DEBUG_KMS(fmt, ##__VA_ARGS__); \ - } while (0) -#define PIPE_CONF_CHECK_X (name) \ if (current_config->name != pipe_config->name) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + intel_err_or_dbg_kms(adjust, __stringify(name), \ "(expected 0x%08x, found 0x%08x)\n", \ current_config->name, \ pipe_config->name); \
@@ -13245,7 +13262,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,#define PIPE_CONF_CHECK_I (name) \ if (current_config->name != pipe_config->name) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + intel_err_or_dbg_kms(adjust, __stringify(name), \ "(expected %i, found %i)\n", \ current_config->name, \ pipe_config->name); \
@@ -13254,7 +13271,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,#define PIPE_CONF_CHECK_P (name) \ if (current_config->name != pipe_config->name) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + intel_err_or_dbg_kms(adjust, __stringify(name), \ "(expected %p, found %p)\n", \ current_config->name, \ pipe_config->name); \
@@ -13265,7 +13282,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,if (!intel_compare_link_m_n (¤t_config->name, \ &pipe_config->name,\ adjust)) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + intel_err_or_dbg_kms(adjust, __stringify(name), \ "(expected tu %i gmch %i/%i link %i/%i, " \ "found tu %i, gmch %i/%i link %i/%i)\n", \ current_config->name.tu, \
@@ -13291,7 +13308,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv, &pipe_config->name, adjust) && \ !intel_compare_link_m_n(¤t_config->alt_name, \ &pipe_config->name, adjust)) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + intel_err_or_dbg_kms(adjust, __stringify(name), \ "(expected tu %i gmch %i/%i link %i/%i, " \ "or tu %i gmch %i/%i link %i/%i, " \ "found tu %i, gmch %i/%i link %i/%i)\n", \
@@ -13315,8 +13332,9 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,#define PIPE_CONF_CHECK_FLAGS (name, mask) \ if ((current_config->name ^ pipe_config->name) & (mask)) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name "(" #mask ") " \ - "(expected %i, found %i)\n", \ + intel_err_or_dbg_kms(adjust, __stringify(name), \ + "(%x) (expected %i, found %i)\n", \ + (mask), \ current_config->name & (mask), \ pipe_config->name & (mask)); \ ret = false; \
@@ -13324,7 +13342,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,#define PIPE_CONF_CHECK_CLOCK_FUZZY (name) \ if (!intel_fuzzy_clock_check(current_config->name, pipe_config->name)) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + intel_err_or_dbg_kms(adjust, __stringify(name), \ "(expected %i, found %i)\n", \ current_config->name, \ pipe_config->name); \
@@ -13441,7 +13459,6 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,#undef PIPE_CONF_CHECK_FLAGS#undef PIPE_CONF_CHECK_CLOCK_FUZZY#undef PIPE_CONF_QUIRK -#undef INTEL_ERR_OR_DBG_KMSreturn ret; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Shrink pipe config checker
== Series Details ==
== Series Details ==
Series: drm/i915: Shrink pipe config checker
URL : https://patchwork.freedesktop.org/series/16359/
State : success
== Summary ==
Series 16359v1 drm/i915: Shrink pipe config checker
https://patchwork.freedesktop.org/api/1.0/series/16359/revisions/1/mbox/
Test gem_busy:
Subgroup basic-hang-default:
fail -> PASS (fi-hsw-4770r)fi-bdw-5557u total:247 pass:232 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:247 pass:207 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:247 pass:194 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7500u total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6770hq total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32 fi-snb-2600 total:247 pass:214 dwarn:0 dfail:0 fail:0 skip:33
a947529bb652fdcf50e8c0e8ee5102b737bae23e drm-tip: 2016y-12m-05d-14h-27m-06s UTC integration manifest 1beaa9a drm/i915: Shrink pipe config checker
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3191/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 38 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Replace
INTEL_ERR_OR_DBG_KMSmacro with anintel_err_or_dbg_kmsfunction to shrink the code and rodata strings.text data bss dec hex filename
1271480 41831 2016 1315327 1411ff i915.ko.0 1265160 41831 2016 1309007 13f94f i915.ko.2Total of ~6 KiB saving across text and strings.
Signed-off-by Tvrtko Ursulin <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 51 ++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/intel_display.c +14
-0@@ -13218,6 +13218,31 @@ intel_compare_link_m_n(const struct intel_link_m_n *m_n,return false; } +static void +intel_err_or_dbg_kms (bool adjust,const char *name,const char *format, ...) +{ +char *level; +unsigned int category; +struct va_format vaf; +va_list args; + +if (adjust) { + level =KERN_DEBUG ; + category =DRM_UT_KMS ; + }else { + level =KERN_ERR ; + category =DRM_UT_NONE ;
drivers/gpu/drm/i915/intel_display.c intel_compare_link_m_n(const struct intel_link_m_n *m_n, · line 13244
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +10
-0+ } + +va_start (args, format); + vaf.fmt = format; + vaf.va = &args; + +drm_printk (level, category,"mismatch in %s %pV" , name, &vaf); + +va_end (args); +}
Function name still does not quite work for me, best I could suggest was pipe_config_err() or pipe_config_msg().
However, that is immaterial to this patch which is primarly about taking advantage of the new drm_printk().
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH v2 1/1 drm/i915: Shrink pipe config checker
From: Tvrtko Ursulin <[email protected]>
Replace INTEL_ERR_OR_DBG_KMS macro with an intel_err_or_dbg_kms function to shrink the code and rodata strings.
text data bss dec hex filename
1271480 41831 2016 1315327 1411ff i915.ko.0 1265160 41831 2016 1309007 13f94f i915.ko.2
Total of ~6 KiB saving across text and strings.
v2:
* Annotate the function for printf-style checking.
* Rename to pipe_config_err. (Chris Wilson)
--- drivers/gpu/drm/i915/intel_display.c | 51 ++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_display.c +34 -17
@@ -13209,6 +13209,31 @@ intel_compare_link_m_n(const struct intel_link_m_n *m_n,return false; } +static void __printf(3, 4) +pipe_config_err(bool adjust, const char *name, const char *format, ...) +{ + char *level; +unsigned int category; +struct va_format vaf; +va_list args; + + if (adjust) { + level =KERN_DEBUG ; + category =DRM_UT_KMS ; + } else { + level =KERN_ERR ; + category =DRM_UT_NONE ; + } + +va_start (args, format); + vaf.fmt = format; + vaf.va = &args; + +drm_printk (level, category,"mismatch in %s %pV" , name, &vaf); + +va_end (args); +} + static bool intel_pipe_config_compare(struct drm_i915_private *dev_priv, struct intel_crtc_state *current_config,
@@ -13217,17 +13242,9 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv, {bool ret = true; -#define INTEL_ERR_OR_DBG_KMS (fmt, ...) \ - do { \ - if (!adjust) \ - DRM_ERROR(fmt, ##__VA_ARGS__); \ - else \ - DRM_DEBUG_KMS(fmt, ##__VA_ARGS__); \ - } while (0) -#define PIPE_CONF_CHECK_X (name) \ if (current_config->name != pipe_config->name) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + pipe_config_err(adjust, __stringify(name), \ "(expected 0x%08x, found 0x%08x)\n", \ current_config->name, \ pipe_config->name); \
@@ -13236,7 +13253,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,#define PIPE_CONF_CHECK_I (name) \ if (current_config->name != pipe_config->name) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + pipe_config_err(adjust, __stringify(name), \ "(expected %i, found %i)\n", \ current_config->name, \ pipe_config->name); \
@@ -13245,7 +13262,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,#define PIPE_CONF_CHECK_P (name) \ if (current_config->name != pipe_config->name) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + pipe_config_err(adjust, __stringify(name), \ "(expected %p, found %p)\n", \ current_config->name, \ pipe_config->name); \
@@ -13256,7 +13273,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,if (!intel_compare_link_m_n (¤t_config->name, \ &pipe_config->name,\ adjust)) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + pipe_config_err(adjust, __stringify(name), \ "(expected tu %i gmch %i/%i link %i/%i, " \ "found tu %i, gmch %i/%i link %i/%i)\n", \ current_config->name.tu, \
@@ -13282,7 +13299,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv, &pipe_config->name, adjust) && \ !intel_compare_link_m_n(¤t_config->alt_name, \ &pipe_config->name, adjust)) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + pipe_config_err(adjust, __stringify(name), \ "(expected tu %i gmch %i/%i link %i/%i, " \ "or tu %i gmch %i/%i link %i/%i, " \ "found tu %i, gmch %i/%i link %i/%i)\n", \
@@ -13306,8 +13323,9 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,#define PIPE_CONF_CHECK_FLAGS (name, mask) \ if ((current_config->name ^ pipe_config->name) & (mask)) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name "(" #mask ") " \ - "(expected %i, found %i)\n", \ + pipe_config_err(adjust, __stringify(name), \ + "(%x) (expected %i, found %i)\n", \ + (mask), \ current_config->name & (mask), \ pipe_config->name & (mask)); \ ret = false; \
@@ -13315,7 +13333,7 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,#define PIPE_CONF_CHECK_CLOCK_FUZZY (name) \ if (!intel_fuzzy_clock_check(current_config->name, pipe_config->name)) { \ - INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \ + pipe_config_err(adjust, __stringify(name), \ "(expected %i, found %i)\n", \ current_config->name, \ pipe_config->name); \
@@ -13432,7 +13450,6 @@ intel_pipe_config_compare(struct drm_i915_private *dev_priv,#undef PIPE_CONF_CHECK_FLAGS#undef PIPE_CONF_CHECK_CLOCK_FUZZY#undef PIPE_CONF_QUIRK -#undef INTEL_ERR_OR_DBG_KMSreturn ret; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Shrink pipe config checker (rev2)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915: Shrink pipe config checker (rev2)
URL : https://patchwork.freedesktop.org/series/16359/
State : success
== Summary ==
Series 16359v2 drm/i915: Shrink pipe config checker
https://patchwork.freedesktop.org/api/1.0/series/16359/revisions/2/mbox/
Test drv_module_reload:
Subgroup basic-reload-inject:
dmesg-warn -> PASS (fi-skl-6770hq)fi-bdw-5557u total:247 pass:232 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:247 pass:207 dwarn:0 dfail:0 fail:0 skip:40 fi-byt-j1900 total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:247 pass:194 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7500u total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:247 pass:223 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32 fi-snb-2600 total:247 pass:214 dwarn:0 dfail:0 fail:0 skip:33
9448ba081ec5f0b9a94d4c4e6206240097ec035e drm-tip: 2016y-12m-06d-09h-23m-53s UTC integration manifest 52c3d7b drm/i915: Shrink pipe config checker
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3201/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.BAT: success for drm/i915: Shrink pipe config checker (rev2)
Quoted 32 lines · Patchwork
== Series Details ==
Series: drm/i915: Shrink pipe config checker (rev2)
URL : https://patchwork.freedesktop.org/series/16359/
State : success== Summary ==
Series 16359v2 drm/i915: Shrink pipe config checker
https://patchwork.freedesktop.org/api/1.0/series/16359/revisions/2/mbox/Test
drv_module_reload:Subgroup basic-reload-inject: dmesg-warn -> PASS (fi-skl-6770hq)fi-bdw-5557u total:247 pass:232 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:247 pass:207 dwarn:0 dfail:0 fail:0 skip:40 fi-byt-j1900 total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:247 pass:194 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7500u total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:247 pass:223 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32 fi-snb-2600 total:247 pass:214 dwarn:0 dfail:0 fail:0 skip:33
Quoted 2 lines
9448ba081ec5f0b9a94d4c4e6206240097ec035edrm-tip: 2016y-12m-06d-09h-23m-53s UTC integration manifest 52c3d7b drm/i915: Shrink pipe config checker
(r-b carried over to v2 on IRC)
Pushed, thanks for the review!
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx