| Message ID | 20190812175405.14479-1-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/tgl: Fix missing parentheses on TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT | expand |
Quoting José Roberto de Souza (2019-08-12 18:54:05) > In this case we want to apply the mask and then shift so the > parentheses is needed. > > SPANK! SPANK! SPANK! Naughty programmer! > > Fixes: 9749a5b6c09f ("drm/i915/tgl: Fix the read of the DDI that transcoder is attached to") > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > drivers/gpu/drm/i915/i915_reg.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 4a947bd0a294..def6dbdc7e2e 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -9433,7 +9433,7 @@ enum skl_power_gate { > #define TRANS_DDI_SELECT_PORT(x) ((x) << TRANS_DDI_PORT_SHIFT) > #define TGL_TRANS_DDI_SELECT_PORT(x) (((x) + 1) << TGL_TRANS_DDI_PORT_SHIFT) > #define TRANS_DDI_FUNC_CTL_VAL_TO_PORT(val) (((val) & TRANS_DDI_PORT_MASK) >> TRANS_DDI_PORT_SHIFT) > -#define TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT(val) (((val) & TGL_TRANS_DDI_PORT_MASK >> TGL_TRANS_DDI_PORT_SHIFT) - 1) > +#define TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT(val) ((((val) & TGL_TRANS_DDI_PORT_MASK) >> TGL_TRANS_DDI_PORT_SHIFT) - 1) That makes the most sense in the possible variations of (:) Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
On Tue, 2019-08-13 at 04:45 +0000, Patchwork wrote: > == Series Details == > > Series: drm/i915/tgl: Fix missing parentheses on > TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT > URL : https://patchwork.freedesktop.org/series/65097/ > State : failure > > == Summary == > > CI Bug Log - changes from CI_DRM_6687_full -> Patchwork_13990_full > ==================================================== > > Summary > ------- > > **FAILURE** > > Serious unknown changes coming with Patchwork_13990_full absolutely > need to be > verified manually. > > If you think the reported changes have nothing to do with the > changes > introduced in Patchwork_13990_full, please notify your bug team to > allow them > to document this new failure mode, which will reduce false > positives in CI. > > > > Possible new issues > ------------------- > > Here are the unknown changes that may have been introduced in > Patchwork_13990_full: > > ### IGT changes ### > > #### Possible regressions #### > > * igt@kms_plane@plane-position-hole-dpms-pipe-b-planes: > - shard-kbl: NOTRUN -> [DMESG-WARN][1] > [1]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-kbl3/igt@kms_plane@plane-position-hole-dpms-pipe-b-planes.html > The warning above is related to hdcp so pushed to dinq, thanks for the reviews and sorry again for this mistake. > > Known issues > ------------ > > Here are the changes found in Patchwork_13990_full that come from > known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@gem_ctx_isolation@vecs0-s3: > - shard-skl: [PASS][2] -> [INCOMPLETE][3] ([fdo#104108]) > +1 similar issue > [2]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-skl4/igt@gem_ctx_isolation@vecs0-s3.html > [3]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-skl10/igt@gem_ctx_isolation@vecs0-s3.html > > * igt@gem_exec_schedule@preempt-other-chain-bsd: > - shard-iclb: [PASS][4] -> [SKIP][5] ([fdo#111325]) +4 > similar issues > [4]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb6/igt@gem_exec_schedule@preempt-other-chain-bsd.html > [5]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb1/igt@gem_exec_schedule@preempt-other-chain-bsd.html > > * igt@kms_cursor_crc@pipe-a-cursor-64x21-offscreen: > - shard-skl: [PASS][6] -> [FAIL][7] ([fdo#103232]) > [6]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-skl8/igt@kms_cursor_crc@pipe-a-cursor-64x21-offscreen.html > [7]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-skl9/igt@kms_cursor_crc@pipe-a-cursor-64x21-offscreen.html > > * igt@kms_flip@2x-flip-vs-expired-vblank-interruptible: > - shard-glk: [PASS][8] -> [FAIL][9] ([fdo#105363]) > [8]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-glk3/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html > [9]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-glk6/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html > > * igt@kms_flip@flip-vs-suspend-interruptible: > - shard-apl: [PASS][10] -> [DMESG-WARN][11] > ([fdo#108566]) +3 similar issues > [10]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-apl3/igt@kms_flip@flip-vs-suspend-interruptible.html > [11]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-apl4/igt@kms_flip@flip-vs-suspend-interruptible.html > > * igt@kms > _frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render: > - shard-iclb: [PASS][12] -> [FAIL][13] ([fdo#103167]) +2 > similar issues > [12]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html > [13]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html > > * igt@kms > _frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-render: > - shard-iclb: [PASS][14] -> [INCOMPLETE][15] > ([fdo#106978] / [fdo#107713]) > [14]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb2/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-render.html > [15]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-render.html > > * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min: > - shard-skl: [PASS][16] -> [FAIL][17] ([fdo#108145]) +1 > similar issue > [16]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-skl8/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html > [17]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-skl9/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html > > * igt@kms_psr@psr2_primary_blt: > - shard-iclb: [PASS][18] -> [SKIP][19] ([fdo#109441]) > [18]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb2/igt@kms_psr@psr2_primary_blt.html > [19]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb5/igt@kms_psr@psr2_primary_blt.html > > * igt@perf@polling: > - shard-skl: [PASS][20] -> [FAIL][21] ([fdo#110728]) > [20]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-skl2/igt@perf@polling.html > [21]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-skl7/igt@perf@polling.html > > * igt@prime_vgem@fence-wait-bsd2: > - shard-iclb: [PASS][22] -> [SKIP][23] ([fdo#109276]) +15 > similar issues > [22]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb1/igt@prime_vgem@fence-wait-bsd2.html > [23]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb7/igt@prime_vgem@fence-wait-bsd2.html > > > #### Possible fixes #### > > * igt@gem_ctx_isolation@rcs0-s3: > - shard-apl: [DMESG-WARN][24] ([fdo#108566]) -> > [PASS][25] +5 similar issues > [24]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-apl7/igt@gem_ctx_isolation@rcs0-s3.html > [25]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-apl3/igt@gem_ctx_isolation@rcs0-s3.html > > * igt@gem_ctx_shared@exec-single-timeline-bsd: > - shard-iclb: [SKIP][26] ([fdo#110841]) -> [PASS][27] > [26]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd.html > [27]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb7/igt@gem_ctx_shared@exec-single-timeline-bsd.html > > * igt@gem_eio@in-flight-internal-1us: > - shard-skl: [DMESG-WARN][28] ([fdo#106107]) -> > [PASS][29] > [28]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-skl7/igt@gem_eio@in-flight-internal-1us.html > [29]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-skl2/igt@gem_eio@in-flight-internal-1us.html > > * igt@gem_eio@reset-stress: > - shard-snb: [FAIL][30] ([fdo#109661]) -> [PASS][31] > [30]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-snb2/igt@gem_eio@reset-stress.html > [31]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-snb5/igt@gem_eio@reset-stress.html > > * igt@gem_exec_balancer@smoke: > - shard-iclb: [SKIP][32] ([fdo#110854]) -> [PASS][33] > [32]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb7/igt@gem_exec_balancer@smoke.html > [33]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb4/igt@gem_exec_balancer@smoke.html > > * igt@gem_exec_schedule@preempt-queue-bsd1: > - shard-iclb: [SKIP][34] ([fdo#109276]) -> [PASS][35] +14 > similar issues > [34]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb5/igt@gem_exec_schedule@preempt-queue-bsd1.html > [35]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb4/igt@gem_exec_schedule@preempt-queue-bsd1.html > > * igt@gem_exec_schedule@reorder-wide-bsd: > - shard-iclb: [SKIP][36] ([fdo#111325]) -> [PASS][37] +5 > similar issues > [36]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb1/igt@gem_exec_schedule@reorder-wide-bsd.html > [37]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb7/igt@gem_exec_schedule@reorder-wide-bsd.html > > * igt@kms_cursor_crc@pipe-c-cursor-suspend: > - shard-skl: [INCOMPLETE][38] ([fdo#110741]) -> > [PASS][39] > [38]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-skl3/igt@kms_cursor_crc@pipe-c-cursor-suspend.html > [39]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-skl2/igt@kms_cursor_crc@pipe-c-cursor-suspend.html > > * igt@kms_flip@flip-vs-expired-vblank: > - shard-glk: [FAIL][40] ([fdo#105363]) -> [PASS][41] +1 > similar issue > [40]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-glk2/igt@kms_flip@flip-vs-expired-vblank.html > [41]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-glk9/igt@kms_flip@flip-vs-expired-vblank.html > > * igt@kms_flip@flip-vs-expired-vblank-interruptible: > - shard-skl: [FAIL][42] ([fdo#105363]) -> [PASS][43] > [42]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-skl9/igt@kms_flip@flip-vs-expired-vblank-interruptible.html > [43]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-skl6/igt@kms_flip@flip-vs-expired-vblank-interruptible.html > > * igt@kms_flip@flip-vs-suspend-interruptible: > - shard-kbl: [INCOMPLETE][44] ([fdo#103665]) -> > [PASS][45] > [44]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-kbl6/igt@kms_flip@flip-vs-suspend-interruptible.html > [45]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-kbl3/igt@kms_flip@flip-vs-suspend-interruptible.html > > * igt@kms > _frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render: > - shard-iclb: [FAIL][46] ([fdo#103167]) -> [PASS][47] +3 > similar issues > [46]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html > [47]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html > > * igt@kms_plane_alpha_blend@pipe-b-coverage-7efc: > - shard-skl: [FAIL][48] ([fdo#108145] / [fdo#110403]) -> > [PASS][49] > [48]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html > [49]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-skl10/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html > > * igt@kms_psr@psr2_cursor_blt: > - shard-iclb: [SKIP][50] ([fdo#109441]) -> [PASS][51] +2 > similar issues > [50]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb4/igt@kms_psr@psr2_cursor_blt.html > [51]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html > > * igt@kms_setmode@basic: > - shard-skl: [FAIL][52] ([fdo#99912]) -> [PASS][53] > [52]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-skl9/igt@kms_setmode@basic.html > [53]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-skl6/igt@kms_setmode@basic.html > > * igt@kms_vblank@pipe-b-wait-busy-hang: > - shard-iclb: [INCOMPLETE][54] ([fdo#107713]) -> > [PASS][55] +1 similar issue > [54]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb7/igt@kms_vblank@pipe-b-wait-busy-hang.html > [55]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb2/igt@kms_vblank@pipe-b-wait-busy-hang.html > > * igt@perf_pmu@busy-accuracy-50-vecs0: > - shard-apl: [INCOMPLETE][56] ([fdo#103927]) -> > [PASS][57] +1 similar issue > [56]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-apl5/igt@perf_pmu@busy-accuracy-50-vecs0.html > [57]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-apl4/igt@perf_pmu@busy-accuracy-50-vecs0.html > > > #### Warnings #### > > * igt@gem_ctx_isolation@vcs1-nonpriv: > - shard-iclb: [SKIP][58] ([fdo#109276]) -> [FAIL][59] > ([fdo#111329]) > [58]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb6/igt@gem_ctx_isolation@vcs1-nonpriv.html > [59]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb1/igt@gem_ctx_isolation@vcs1-nonpriv.html > > * igt@gem_mocs_settings@mocs-isolation-bsd2: > - shard-iclb: [FAIL][60] ([fdo#111330]) -> [SKIP][61] > ([fdo#109276]) > [60]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb2/igt@gem_mocs_settings@mocs-isolation-bsd2.html > [61]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb5/igt@gem_mocs_settings@mocs-isolation-bsd2.html > > * igt@gem_mocs_settings@mocs-reset-bsd2: > - shard-iclb: [SKIP][62] ([fdo#109276]) -> [FAIL][63] > ([fdo#111330]) +1 similar issue > [62]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb7/igt@gem_mocs_settings@mocs-reset-bsd2.html > [63]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb4/igt@gem_mocs_settings@mocs-reset-bsd2.html > > * igt@kms_dp_dsc@basic-dsc-enable-edp: > - shard-iclb: [SKIP][64] ([fdo#109349]) -> [DMESG- > WARN][65] ([fdo#107724]) > [64]: > https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6687/shard-iclb5/igt@kms_dp_dsc@basic-dsc-enable-edp.html > [65]: > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13990/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html > > > [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 > [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232 > [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665 > [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927 > [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108 > [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363 > [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107 > [fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978 > [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713 > [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724 > [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 > [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566 > [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276 > [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349 > [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 > [fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661 > [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403 > [fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728 > [fdo#110741]: https://bugs.freedesktop.org/show_bug.cgi?id=110741 > [fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841 > [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854 > [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325 > [fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329 > [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330 > [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912 > > > Participating hosts (10 -> 10) > ------------------------------ > > No changes in participating hosts > > > Build changes > ------------- > > * CI: CI-20190529 -> None > * Linux: CI_DRM_6687 -> Patchwork_13990 > > CI-20190529: 20190529 > CI_DRM_6687: 36e9b72a9b9150ffca7e5613c0e421570b8e92ce @ > git://anongit.freedesktop.org/gfx-ci/linux > IGT_5128: a49a3a6cdbc4949c0ae8df5f3d8c3e476aefdea1 @ > git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_13990: efdcc43de9ae39ac50928e204b845d1bff1e5194 @ > 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_13990/
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 4a947bd0a294..def6dbdc7e2e 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -9433,7 +9433,7 @@ enum skl_power_gate { #define TRANS_DDI_SELECT_PORT(x) ((x) << TRANS_DDI_PORT_SHIFT) #define TGL_TRANS_DDI_SELECT_PORT(x) (((x) + 1) << TGL_TRANS_DDI_PORT_SHIFT) #define TRANS_DDI_FUNC_CTL_VAL_TO_PORT(val) (((val) & TRANS_DDI_PORT_MASK) >> TRANS_DDI_PORT_SHIFT) -#define TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT(val) (((val) & TGL_TRANS_DDI_PORT_MASK >> TGL_TRANS_DDI_PORT_SHIFT) - 1) +#define TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT(val) ((((val) & TGL_TRANS_DDI_PORT_MASK) >> TGL_TRANS_DDI_PORT_SHIFT) - 1) #define TRANS_DDI_MODE_SELECT_MASK (7 << 24) #define TRANS_DDI_MODE_SELECT_HDMI (0 << 24) #define TRANS_DDI_MODE_SELECT_DVI (1 << 24)
In this case we want to apply the mask and then shift so the parentheses is needed. SPANK! SPANK! SPANK! Naughty programmer! Fixes: 9749a5b6c09f ("drm/i915/tgl: Fix the read of the DDI that transcoder is attached to") Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)