drm/i915/audio: fix compressed_bpp check
Subsystems (3)
PATCH 1/1 drm/i915/audio: fix compressed_bpp check
The early check for compressed_bpp being zero is too early, as it is hit also when DSC is not enabled. Move the checks down to where the values are actually needed. This is a paranoid check for a situation that should not happen, so we don't really care about handling it gracefully apart from not oopsing.
--- drivers/gpu/drm/i915/display/intel_audio.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/intel_audio.c +5 -10
@@ -542,6 +542,10 @@ static unsigned int get_hblank_early_enable_config(struct intel_encoder *encoder h_active, crtc_state->port_clock, crtc_state->lane_count, vdsc_bpp, cdclk); +if (WARN_ON (!crtc_state->port_clock || !crtc_state->lane_count || + !crtc_state->dsc.compressed_bpp || !i915->cdclk.hw.cdclk)) +return 0 ; + link_clks_available = ((((h_total - h_active) * ((crtc_state->port_clock *ROUNDING_FACTOR ) / pixel_clk)) /ROUNDING_FACTOR ) -28 );
@@ -597,21 +601,12 @@ static void enable_audio_dsc_wa(struct intel_encoder *encoder,struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe; -unsigned int hblank_early_prog, samples_room, h_active; +unsigned int hblank_early_prog, samples_room;unsigned int val;if (INTEL_GEN (i915) <11 )return ; - h_active = crtc_state->hw.adjusted_mode.hdisplay; - -if (!(h_active && crtc_state->port_clock && crtc_state->lane_count && - crtc_state->dsc.compressed_bpp && i915->cdclk.hw.cdclk)) { -drm_err (&i915->drm,"Null Params rcvd for hblank early enabling\n" ); -WARN_ON (1 ); -return ; - } - val =intel_de_read (i915,AUD_CONFIG_BE );if (INTEL_GEN (i915) ==11 )
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines
-----Original Message-----
From: Jani Nikula <[email protected]>
Sent: Monday, April 20, 2020 6:47 PM
To: [email protected]
Cc: Nikula, Jani <[email protected]>; Gupta, Anshuman <[email protected]>; Shankar, Uma <[email protected]>
Subject: [PATCH] drm/i915/audio: fixcompressed_bppcheck
Quoted 4 lines
The early check for
compressed_bppbeing zero is too early, as it is hit also when DSC is not enabled. Move the checks down to where the values are actually needed. This is a paranoid check for a situation that should not happen, so we don't really care about handling it gracefully apart from not oopsing.
Looks Good to me. Thanks Jani.
Quoted 52 lines
Fixes 48b8b04c791d ("drm/i915/display: Enable DP Display Audio WA")Cc Anshuman Gupta <[email protected]>Cc Uma Shankar <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_audio.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/intel_audio.c +0
-0@@ -542,6 +542,10 @@ static unsigned int get_hblank_early_enable_config(struct
intel_encoder*encoderdrivers/gpu/drm/i915/display/intel_audio.c +4
-0h_active, crtc_state->port_clock, crtc_state->lane_count, vdsc_bpp, cdclk); +if (WARN_ON (!crtc_state->port_clock || !crtc_state->lane_count || + !crtc_state->dsc.compressed_bpp || !i915->cdclk.hw.cdclk)) +return 0 ; + link_clks_available = ((((h_total - h_active) * ((crtc_state->port_clock *ROUNDING_FACTOR ) / pixel_clk)) / ROUNDING_FACTOR) - 28); @@ -597,21 +601,12 @@ static void enable_audio_dsc_wa(struct
intel_encoder*encoder,drivers/gpu/drm/i915/display/intel_audio.c +1
-6struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe; -unsigned int hblank_early_prog, samples_room, h_active; +unsigned int hblank_early_prog, samples_room;unsigned int val;if (INTEL_GEN (i915) <11 )return ; - h_active = crtc_state->hw.adjusted_mode.hdisplay; - -if (!(h_active && crtc_state->port_clock && crtc_state->lane_count && - crtc_state->dsc.compressed_bpp && i915->cdclk.hw.cdclk)) { - drm_err(&i915->drm, "Null Params rcvd for hblank earlyenabling\n");
drivers/gpu/drm/i915/display/intel_audio.c +0
-5-WARN_ON (1 ); -return ; - } - val =intel_de_read (i915,AUD_CONFIG_BE );if (INTEL_GEN (i915) ==11 ) --
Quoted 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/audio: fix compressed_bpp check
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/audio: fix compressed_bpp check
URL : https://patchwork.freedesktop.org/series/76196/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8329 -> Patchwork_17384
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/index.html
Known issues
------------
Here are the changes found in Patchwork_17384 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@i915_selftest@live@sanitycheck:
- fi-bwr-2160: [INCOMPLETE][1] ([i915#489]) -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/fi-bwr-2160/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/fi-bwr-2160/igt@i915_selftest@[email protected]
[i915#489]: https://gitlab.freedesktop.org/drm/intel/issues/489
Participating hosts (51 -> 43)
------------------------------
Missing (8): fi-cml-u2 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-kbl-7560u fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8329 -> Patchwork_17384
CI-20190529: 20190529
CI_DRM_8329: 4865c68b0072e9a8846b6ca08d651e7e10278036 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5602: a8fcccd15dcc2dd409edd23785a2d6f6e85fb682 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17384: 89c4b02254dc077060045181b54f37afe207e092 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
89c4b02254dc drm/i915/audio: fix compressed_bpp check
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/audio: fix compressed_bpp check
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/audio: fix compressed_bpp check
URL : https://patchwork.freedesktop.org/series/76196/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8329_full -> Patchwork_17384_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_17384_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_params@invalid-bsd-ring:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#109276])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-iclb4/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-iclb8/igt@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [PASS][3] -> [DMESG-WARN][4] ([i915#716])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-skl10/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-skl10/igt@[email protected]
* igt@i915_selftest@live@requests:
- shard-tglb: [PASS][5] -> [INCOMPLETE][6] ([i915#1531] / [i915#1658])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-tglb1/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-tglb8/igt@i915_selftest@[email protected]
* igt@i915_suspend@forcewake:
- shard-kbl: [PASS][7] -> [DMESG-WARN][8] ([i915#180])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-kbl7/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-kbl1/igt@[email protected]
* igt@kms_big_fb@linear-32bpp-rotate-0:
- shard-kbl: [PASS][9] -> [FAIL][10] ([i915#1119] / [i915#93] / [i915#95])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-kbl1/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-kbl1/igt@[email protected]
- shard-apl: [PASS][11] -> [FAIL][12] ([i915#1119] / [i915#95])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-apl8/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-apl1/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-apl: [PASS][13] -> [DMESG-WARN][14] ([i915#180])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-apl3/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-apl4/igt@[email protected]
* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- shard-hsw: [PASS][15] -> [FAIL][16] ([i915#57])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-hsw2/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-hsw6/igt@[email protected]
* igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-untiled:
- shard-glk: [PASS][17] -> [FAIL][18] ([i915#52] / [i915#54])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-glk8/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-glk1/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-cpu:
- shard-tglb: [PASS][19] -> [SKIP][20] ([i915#668]) +8 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-tglb1/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-cpu.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-tglb6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-cpu.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][21] -> [FAIL][22] ([i915#1188])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-skl2/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-skl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: [PASS][23] -> [FAIL][24] ([fdo#108145] / [i915#265])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-skl3/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-skl1/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_gtt:
- shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#109441])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_gtt.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-iclb3/igt@kms_psr@psr2_cursor_mmap_gtt.html
#### Possible fixes ####
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-snb: [FAIL][27] ([i915#1066]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-snb2/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-snb2/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [DMESG-WARN][29] ([i915#180]) -> [PASS][30] +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-kbl6/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-kbl1/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [FAIL][31] ([i915#96]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-hsw8/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-hsw1/igt@[email protected]
* igt@kms_draw_crc@draw-method-rgb565-pwrite-xtiled:
- shard-glk: [FAIL][33] ([i915#52] / [i915#54]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-glk5/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-glk5/igt@[email protected]
* {igt@kms_flip@2x-flip-vs-suspend-interruptible@bc-vga1-hdmi-a1}:
- shard-hsw: [INCOMPLETE][35] ([i915#61]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-hsw8/igt@kms_flip@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-hsw1/igt@kms_flip@[email protected]
* {igt@kms_flip@flip-vs-suspend-interruptible@c-dp1}:
- shard-apl: [DMESG-WARN][37] ([i915#180]) -> [PASS][38] +4 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-apl2/igt@kms_flip@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-apl6/igt@kms_flip@[email protected]
* {igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1}:
- shard-skl: [FAIL][39] ([i915#34]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-skl8/igt@kms_flip@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-skl2/igt@kms_flip@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [FAIL][41] ([i915#1188]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-skl6/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-skl10/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-apl: [DMESG-WARN][43] ([i915#180] / [i915#95]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-apl8/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-apl1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][45] ([fdo#108145] / [i915#265]) -> [PASS][46] +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-skl1/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-skl1/igt@[email protected]
* igt@kms_psr@psr2_sprite_render:
- shard-iclb: [SKIP][47] ([fdo#109441]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-iclb7/igt@kms_psr@psr2_sprite_render.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-iclb2/igt@kms_psr@psr2_sprite_render.html
* igt@kms_setmode@basic:
- shard-kbl: [FAIL][49] ([i915#31]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-kbl4/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-kbl6/igt@[email protected]
* {igt@perf@blocking-parameterized}:
- shard-tglb: [FAIL][51] ([i915#1542]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-tglb1/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-tglb8/igt@[email protected]
#### Warnings ####
* igt@i915_pm_dc@dc6-dpms:
- shard-tglb: [SKIP][53] ([i915#468]) -> [FAIL][54] ([i915#454])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8329/shard-tglb2/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17384/shard-tglb7/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#1066]: https://gitlab.freedesktop.org/drm/intel/issues/1066
[i915#1119]: https://gitlab.freedesktop.org/drm/intel/issues/1119
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1531]: https://gitlab.freedesktop.org/drm/intel/issues/1531
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1658]: https://gitlab.freedesktop.org/drm/intel/issues/1658
[i915#1731]: https://gitlab.freedesktop.org/drm/intel/issues/1731
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#57]: https://gitlab.freedesktop.org/drm/intel/issues/57
[i915#61]: https://gitlab.freedesktop.org/drm/intel/issues/61
[i915#668]: https://gitlab.freedesktop.org/drm/intel/issues/668
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8329 -> Patchwork_17384
CI-20190529: 20190529
CI_DRM_8329: 4865c68b0072e9a8846b6ca08d651e7e10278036 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5602: a8fcccd15dcc2dd409edd23785a2d6f6e85fb682 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17384: 89c4b02254dc077060045181b54f37afe207e092 @ 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_17384/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · Uma
Quoted 8 lines
-----Original Message-----
From: Jani Nikula <[email protected]>
Sent: Monday, April 20, 2020 6:47 PM
To: [email protected]
Cc: Nikula, Jani <[email protected]>; Gupta, Anshuman <[email protected]>; Shankar, Uma <[email protected]>
Subject: [PATCH] drm/i915/audio: fixcompressed_bppcheck
Quoted 7 lines
Quoted 4 lines
The early check for
compressed_bppbeing zero is too early, as it is hit also when DSC is not enabled. Move the checks down to where the values are actually needed. This is a paranoid check for a situation that should not happen, so we don't really care about handling it gracefully apart from not oopsing.Looks Good to me. Thanks Jani.
Reviewed-by Uma Shankar <[email protected]>
Thanks for the review, pushed to dinq.
BR,
Jani.
Quoted 55 lines
Quoted 54 lines
Fixes 48b8b04c791d ("drm/i915/display: Enable DP Display Audio WA")Cc Anshuman Gupta <[email protected]>Cc Uma Shankar <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_audio.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/intel_audio.c +0
-0@@ -542,6 +542,10 @@ static unsigned int get_hblank_early_enable_config(struct
intel_encoder*encoderdrivers/gpu/drm/i915/display/intel_audio.c +4
-0h_active, crtc_state->port_clock, crtc_state->lane_count, vdsc_bpp, cdclk); +if (WARN_ON (!crtc_state->port_clock || !crtc_state->lane_count || + !crtc_state->dsc.compressed_bpp || !i915->cdclk.hw.cdclk)) +return 0 ; + link_clks_available = ((((h_total - h_active) * ((crtc_state->port_clock *ROUNDING_FACTOR ) / pixel_clk)) / ROUNDING_FACTOR) - 28); @@ -597,21 +601,12 @@ static void enable_audio_dsc_wa(struct
intel_encoder*encoder,drivers/gpu/drm/i915/display/intel_audio.c +1
-6struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe; -unsigned int hblank_early_prog, samples_room, h_active; +unsigned int hblank_early_prog, samples_room;unsigned int val;if (INTEL_GEN (i915) <11 )return ; - h_active = crtc_state->hw.adjusted_mode.hdisplay; - -if (!(h_active && crtc_state->port_clock && crtc_state->lane_count && - crtc_state->dsc.compressed_bpp && i915->cdclk.hw.cdclk)) { - drm_err(&i915->drm, "Null Params rcvd for hblank earlyenabling\n");
drivers/gpu/drm/i915/display/intel_audio.c +0
-5-WARN_ON (1 ); -return ; - } - val =intel_de_read (i915,AUD_CONFIG_BE );if (INTEL_GEN (i915) ==11 ) --2.20.1
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx