* [Intel-gfx] [PATCH] drm/i915: simplify switch to if-elseif
@ 2023-05-23 12:51 Tom Rix
2023-05-23 13:26 ` Jani Nikula
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Tom Rix @ 2023-05-23 12:51 UTC (permalink / raw)
To: jani.nikula, joonas.lahtinen, rodrigo.vivi, tvrtko.ursulin,
airlied, daniel, nathan, ndesaulniers, ville.syrjala, imre.deak,
arun.r.murthy, lucas.demarchi
Cc: Tom Rix, intel-gfx, llvm, linux-kernel, dri-devel
clang with W=1 reports
drivers/gpu/drm/i915/display/intel_display.c:6012:3: error: unannotated
fall-through between switch labels [-Werror,-Wimplicit-fallthrough]
case I915_FORMAT_MOD_X_TILED:
^
Only one case and the default does anything in this switch, so it should
be changed to an if-elseif.
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 0490c6412ab5..1f852e49fc20 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5994,8 +5994,7 @@ static int intel_async_flip_check_hw(struct intel_atomic_state *state, struct in
* Need to verify this for all gen9 platforms to enable
* this selectively if required.
*/
- switch (new_plane_state->hw.fb->modifier) {
- case DRM_FORMAT_MOD_LINEAR:
+ if (new_plane_state->hw.fb->modifier == DRM_FORMAT_MOD_LINEAR) {
/*
* FIXME: Async on Linear buffer is supported on ICL as
* but with additional alignment and fbc restrictions
@@ -6008,13 +6007,10 @@ static int intel_async_flip_check_hw(struct intel_atomic_state *state, struct in
plane->base.base.id, plane->base.name);
return -EINVAL;
}
-
- case I915_FORMAT_MOD_X_TILED:
- case I915_FORMAT_MOD_Y_TILED:
- case I915_FORMAT_MOD_Yf_TILED:
- case I915_FORMAT_MOD_4_TILED:
- break;
- default:
+ } else if (!(new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_X_TILED ||
+ new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_Y_TILED ||
+ new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_Yf_TILED ||
+ new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_4_TILED)) {
drm_dbg_kms(&i915->drm,
"[PLANE:%d:%s] Modifier does not support async flips\n",
plane->base.base.id, plane->base.name);
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: simplify switch to if-elseif
2023-05-23 12:51 [Intel-gfx] [PATCH] drm/i915: simplify switch to if-elseif Tom Rix
@ 2023-05-23 13:26 ` Jani Nikula
2023-05-26 9:27 ` Jani Nikula
2023-05-23 21:43 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2023-05-24 4:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2023-05-23 13:26 UTC (permalink / raw)
To: Tom Rix, joonas.lahtinen, rodrigo.vivi, tvrtko.ursulin, airlied,
daniel, nathan, ndesaulniers, ville.syrjala, imre.deak,
arun.r.murthy, lucas.demarchi
Cc: Tom Rix, intel-gfx, llvm, linux-kernel, dri-devel
On Tue, 23 May 2023, Tom Rix <trix@redhat.com> wrote:
> clang with W=1 reports
> drivers/gpu/drm/i915/display/intel_display.c:6012:3: error: unannotated
> fall-through between switch labels [-Werror,-Wimplicit-fallthrough]
> case I915_FORMAT_MOD_X_TILED:
> ^
>
> Only one case and the default does anything in this switch, so it should
> be changed to an if-elseif.
Thanks for the patch.
If I wanted to fix this quickly, I'd just add the break in there.
If I wanted to fix this properly, I'd add a function
modifier_supports_async_flips() or something, and replace the switch
with:
if (!modifier_supports_async_flips(i915, new_plane_state->hw.fb->modifier)) {
drm_dbg_kms(&i915->drm, "[PLANE:%d:%s] Modifier does not support async flips\n",
plane->base.base.id, plane->base.name);
return -EINVAL;
}
But I wouldn't just replace the switch with if-elseif. It doesn't help
with the overall feeling that intel_async_flip_check_hw() is too long.
BR,
Jani.
>
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 0490c6412ab5..1f852e49fc20 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -5994,8 +5994,7 @@ static int intel_async_flip_check_hw(struct intel_atomic_state *state, struct in
> * Need to verify this for all gen9 platforms to enable
> * this selectively if required.
> */
> - switch (new_plane_state->hw.fb->modifier) {
> - case DRM_FORMAT_MOD_LINEAR:
> + if (new_plane_state->hw.fb->modifier == DRM_FORMAT_MOD_LINEAR) {
> /*
> * FIXME: Async on Linear buffer is supported on ICL as
> * but with additional alignment and fbc restrictions
> @@ -6008,13 +6007,10 @@ static int intel_async_flip_check_hw(struct intel_atomic_state *state, struct in
> plane->base.base.id, plane->base.name);
> return -EINVAL;
> }
> -
> - case I915_FORMAT_MOD_X_TILED:
> - case I915_FORMAT_MOD_Y_TILED:
> - case I915_FORMAT_MOD_Yf_TILED:
> - case I915_FORMAT_MOD_4_TILED:
> - break;
> - default:
> + } else if (!(new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_X_TILED ||
> + new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_Y_TILED ||
> + new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_Yf_TILED ||
> + new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_4_TILED)) {
> drm_dbg_kms(&i915->drm,
> "[PLANE:%d:%s] Modifier does not support async flips\n",
> plane->base.base.id, plane->base.name);
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: simplify switch to if-elseif
2023-05-23 12:51 [Intel-gfx] [PATCH] drm/i915: simplify switch to if-elseif Tom Rix
2023-05-23 13:26 ` Jani Nikula
@ 2023-05-23 21:43 ` Patchwork
2023-05-24 4:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2023-05-23 21:43 UTC (permalink / raw)
To: Tom Rix; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 3438 bytes --]
== Series Details ==
Series: drm/i915: simplify switch to if-elseif
URL : https://patchwork.freedesktop.org/series/118216/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13177 -> Patchwork_118216v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/index.html
Participating hosts (39 -> 37)
------------------------------
Missing (2): bat-rpls-2 fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_118216v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@slpc:
- bat-rpls-1: NOTRUN -> [DMESG-WARN][1] ([i915#6367])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/bat-rpls-1/igt@i915_selftest@live@slpc.html
* igt@i915_suspend@basic-s3-without-i915:
- bat-rpls-1: NOTRUN -> [ABORT][2] ([i915#6687] / [i915#7978])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/bat-rpls-1/igt@i915_suspend@basic-s3-without-i915.html
#### Possible fixes ####
* igt@i915_selftest@live@reset:
- bat-rpls-1: [ABORT][3] ([i915#4983] / [i915#7461] / [i915#8347] / [i915#8384]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/bat-rpls-1/igt@i915_selftest@live@reset.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/bat-rpls-1/igt@i915_selftest@live@reset.html
#### Warnings ####
* igt@kms_setmode@basic-clone-single-crtc:
- bat-rplp-1: [SKIP][5] ([i915#3555] / [i915#4579]) -> [ABORT][6] ([i915#4579] / [i915#8260])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/bat-rplp-1/igt@kms_setmode@basic-clone-single-crtc.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/bat-rplp-1/igt@kms_setmode@basic-clone-single-crtc.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7059]: https://gitlab.freedesktop.org/drm/intel/issues/7059
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
[i915#8260]: https://gitlab.freedesktop.org/drm/intel/issues/8260
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
[i915#8384]: https://gitlab.freedesktop.org/drm/intel/issues/8384
Build changes
-------------
* Linux: CI_DRM_13177 -> Patchwork_118216v1
CI-20190529: 20190529
CI_DRM_13177: 073f9eab1a2a1e53428907d3b26503ed17516be5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7301: 4b388fa87e1281587e723ef864e466fe396c3381 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_118216v1: 073f9eab1a2a1e53428907d3b26503ed17516be5 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
19caa65e6e33 drm/i915: simplify switch to if-elseif
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/index.html
[-- Attachment #2: Type: text/html, Size: 4110 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: simplify switch to if-elseif
2023-05-23 12:51 [Intel-gfx] [PATCH] drm/i915: simplify switch to if-elseif Tom Rix
2023-05-23 13:26 ` Jani Nikula
2023-05-23 21:43 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2023-05-24 4:58 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2023-05-24 4:58 UTC (permalink / raw)
To: Tom Rix; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 12906 bytes --]
== Series Details ==
Series: drm/i915: simplify switch to if-elseif
URL : https://patchwork.freedesktop.org/series/118216/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13177_full -> Patchwork_118216v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (7 -> 9)
------------------------------
Additional (2): shard-rkl0 shard-tglu0
Known issues
------------
Here are the changes found in Patchwork_118216v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@drm_mm@all-tests:
- shard-glk: NOTRUN -> [SKIP][1] ([fdo#109271] / [i915#4579])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk5/igt@drm_mm@all-tests.html
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-glk: [PASS][2] -> [FAIL][3] ([i915#2842]) +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-glk8/igt@gem_exec_fair@basic-pace@rcs0.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk5/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a:
- shard-glk: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#1937] / [i915#4579])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk5/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a.html
* igt@kms_async_flips@alternate-sync-async-flip@pipe-a-hdmi-a-2:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#2521])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-glk4/igt@kms_async_flips@alternate-sync-async-flip@pipe-a-hdmi-a-2.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk1/igt@kms_async_flips@alternate-sync-async-flip@pipe-a-hdmi-a-2.html
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip:
- shard-glk: NOTRUN -> [SKIP][7] ([fdo#109271]) +14 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk5/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip.html
* igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#3886])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk5/igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_color@ctm-red-to-blue@pipe-b-vga-1:
- shard-snb: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4579]) +16 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-snb5/igt@kms_color@ctm-red-to-blue@pipe-b-vga-1.html
* igt@kms_cursor_crc@cursor-sliding-256x256@pipe-a-hdmi-a-1:
- shard-glk: [PASS][10] -> [DMESG-FAIL][11] ([i915#118])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-glk1/igt@kms_cursor_crc@cursor-sliding-256x256@pipe-a-hdmi-a-1.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk3/igt@kms_cursor_crc@cursor-sliding-256x256@pipe-a-hdmi-a-1.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-apl: [PASS][12] -> [FAIL][13] ([IGT#6] / [i915#2346])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-apl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-apl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-draw-mmap-wc:
- shard-glk: NOTRUN -> [SKIP][14] ([IGT#6] / [fdo#109271]) +12 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk5/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-draw-mmap-wc.html
* igt@kms_plane_scaling@planes-downscale-factor-0-75@pipe-a-hdmi-a-1:
- shard-snb: NOTRUN -> [SKIP][15] ([fdo#109271]) +21 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-snb1/igt@kms_plane_scaling@planes-downscale-factor-0-75@pipe-a-hdmi-a-1.html
* igt@kms_psr2_sf@overlay-plane-update-continuous-sf:
- shard-glk: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#658])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk5/igt@kms_psr2_sf@overlay-plane-update-continuous-sf.html
#### Possible fixes ####
* igt@gem_barrier_race@remote-request@rcs0:
- shard-glk: [ABORT][17] ([i915#7461] / [i915#8211]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-glk7/igt@gem_barrier_race@remote-request@rcs0.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk5/igt@gem_barrier_race@remote-request@rcs0.html
* igt@gem_eio@kms:
- {shard-dg1}: [FAIL][19] ([i915#5784]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-dg1-18/igt@gem_eio@kms.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-dg1-16/igt@gem_eio@kms.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [FAIL][21] ([i915#2842]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-glk7/igt@gem_exec_fair@basic-pace-share@rcs0.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk3/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- {shard-rkl}: [FAIL][23] ([i915#2842]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-rkl-1/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-rkl-6/igt@gem_exec_fair@basic-pace-solo@rcs0.html
* igt@gem_ppgtt@blt-vs-render-ctx0:
- shard-snb: [FAIL][25] ([i915#8295]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-snb6/igt@gem_ppgtt@blt-vs-render-ctx0.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-snb5/igt@gem_ppgtt@blt-vs-render-ctx0.html
* igt@i915_pm_rc6_residency@rc6-idle@bcs0:
- {shard-dg1}: [FAIL][27] ([i915#3591]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-dg1-13/igt@i915_pm_rc6_residency@rc6-idle@bcs0.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-dg1-18/igt@i915_pm_rc6_residency@rc6-idle@bcs0.html
* igt@i915_pm_rpm@dpms-non-lpsp:
- {shard-rkl}: [SKIP][29] ([i915#1397]) -> [PASS][30] +3 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-rkl-7/igt@i915_pm_rpm@dpms-non-lpsp.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-rkl-2/igt@i915_pm_rpm@dpms-non-lpsp.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-glk: [FAIL][31] ([IGT#6] / [i915#2346]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-glk6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
* igt@kms_cursor_legacy@forked-bo@pipe-b:
- {shard-rkl}: [INCOMPLETE][33] ([i915#8011]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-rkl-7/igt@kms_cursor_legacy@forked-bo@pipe-b.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-rkl-2/igt@kms_cursor_legacy@forked-bo@pipe-b.html
* igt@kms_flip@2x-flip-vs-expired-vblank@ac-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][35] ([i915#79]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13177/shard-glk8/igt@kms_flip@2x-flip-vs-expired-vblank@ac-hdmi-a1-hdmi-a2.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/shard-glk7/igt@kms_flip@2x-flip-vs-expired-vblank@ac-hdmi-a1-hdmi-a2.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[IGT#6]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/6
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4816]: https://gitlab.freedesktop.org/drm/intel/issues/4816
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5493]: https://gitlab.freedesktop.org/drm/intel/issues/5493
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6755]: https://gitlab.freedesktop.org/drm/intel/issues/6755
[i915#7392]: https://gitlab.freedesktop.org/drm/intel/issues/7392
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211
[i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292
[i915#8295]: https://gitlab.freedesktop.org/drm/intel/issues/8295
[i915#8411]: https://gitlab.freedesktop.org/drm/intel/issues/8411
[i915#8414]: https://gitlab.freedesktop.org/drm/intel/issues/8414
Build changes
-------------
* Linux: CI_DRM_13177 -> Patchwork_118216v1
* Piglit: None -> piglit_4509
CI-20190529: 20190529
CI_DRM_13177: 073f9eab1a2a1e53428907d3b26503ed17516be5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7301: 4b388fa87e1281587e723ef864e466fe396c3381 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_118216v1: 073f9eab1a2a1e53428907d3b26503ed17516be5 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118216v1/index.html
[-- Attachment #2: Type: text/html, Size: 12148 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: simplify switch to if-elseif
2023-05-23 13:26 ` Jani Nikula
@ 2023-05-26 9:27 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2023-05-26 9:27 UTC (permalink / raw)
To: Tom Rix, joonas.lahtinen, rodrigo.vivi, tvrtko.ursulin, airlied,
daniel, nathan, ndesaulniers, ville.syrjala, imre.deak,
arun.r.murthy, lucas.demarchi
Cc: Tom Rix, intel-gfx, llvm, linux-kernel, dri-devel
On Tue, 23 May 2023, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Tue, 23 May 2023, Tom Rix <trix@redhat.com> wrote:
>> clang with W=1 reports
>> drivers/gpu/drm/i915/display/intel_display.c:6012:3: error: unannotated
>> fall-through between switch labels [-Werror,-Wimplicit-fallthrough]
>> case I915_FORMAT_MOD_X_TILED:
>> ^
>>
>> Only one case and the default does anything in this switch, so it should
>> be changed to an if-elseif.
>
> Thanks for the patch.
>
> If I wanted to fix this quickly, I'd just add the break in there.
I've just applied [1] doing this.
I'm still open to the cleanup suggested below, if you're up for it.
BR,
Jani.
[1] https://patchwork.freedesktop.org/patch/msgid/20230524-intel_async_flip_check_hw-implicit-fallthrough-v1-1-83de89e376a1@kernel.org
>
> If I wanted to fix this properly, I'd add a function
> modifier_supports_async_flips() or something, and replace the switch
> with:
>
> if (!modifier_supports_async_flips(i915, new_plane_state->hw.fb->modifier)) {
> drm_dbg_kms(&i915->drm, "[PLANE:%d:%s] Modifier does not support async flips\n",
> plane->base.base.id, plane->base.name);
> return -EINVAL;
> }
>
> But I wouldn't just replace the switch with if-elseif. It doesn't help
> with the overall feeling that intel_async_flip_check_hw() is too long.
>
> BR,
> Jani.
>
>
>>
>> Signed-off-by: Tom Rix <trix@redhat.com>
>> ---
>> drivers/gpu/drm/i915/display/intel_display.c | 14 +++++---------
>> 1 file changed, 5 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>> index 0490c6412ab5..1f852e49fc20 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -5994,8 +5994,7 @@ static int intel_async_flip_check_hw(struct intel_atomic_state *state, struct in
>> * Need to verify this for all gen9 platforms to enable
>> * this selectively if required.
>> */
>> - switch (new_plane_state->hw.fb->modifier) {
>> - case DRM_FORMAT_MOD_LINEAR:
>> + if (new_plane_state->hw.fb->modifier == DRM_FORMAT_MOD_LINEAR) {
>> /*
>> * FIXME: Async on Linear buffer is supported on ICL as
>> * but with additional alignment and fbc restrictions
>> @@ -6008,13 +6007,10 @@ static int intel_async_flip_check_hw(struct intel_atomic_state *state, struct in
>> plane->base.base.id, plane->base.name);
>> return -EINVAL;
>> }
>> -
>> - case I915_FORMAT_MOD_X_TILED:
>> - case I915_FORMAT_MOD_Y_TILED:
>> - case I915_FORMAT_MOD_Yf_TILED:
>> - case I915_FORMAT_MOD_4_TILED:
>> - break;
>> - default:
>> + } else if (!(new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_X_TILED ||
>> + new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_Y_TILED ||
>> + new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_Yf_TILED ||
>> + new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_4_TILED)) {
>> drm_dbg_kms(&i915->drm,
>> "[PLANE:%d:%s] Modifier does not support async flips\n",
>> plane->base.base.id, plane->base.name);
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-26 9:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-23 12:51 [Intel-gfx] [PATCH] drm/i915: simplify switch to if-elseif Tom Rix
2023-05-23 13:26 ` Jani Nikula
2023-05-26 9:27 ` Jani Nikula
2023-05-23 21:43 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2023-05-24 4:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox