* [Intel-gfx] [PATCH] drm/i915/display: Fix early deref of 'dsb'
@ 2020-05-24 23:39 Chris Wilson
2020-05-25 0:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Chris Wilson @ 2020-05-24 23:39 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
drivers/gpu/drm/i915/display/intel_dsb.c:177 intel_dsb_reg_write() warn: variable dereferenced before check 'dsb' (see line 175)
Fixes: afeda4f3b1c8 ("drm/i915/dsb: Pre allocate and late cleanup of cmd buffer")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Animesh Manna <animesh.manna@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/display/intel_dsb.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c
index 475106e91fa7..24e6d63e2d47 100644
--- a/drivers/gpu/drm/i915/display/intel_dsb.c
+++ b/drivers/gpu/drm/i915/display/intel_dsb.c
@@ -169,15 +169,17 @@ void intel_dsb_indexed_reg_write(const struct intel_crtc_state *crtc_state,
void intel_dsb_reg_write(const struct intel_crtc_state *crtc_state,
i915_reg_t reg, u32 val)
{
- struct intel_dsb *dsb = crtc_state->dsb;
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
- u32 *buf = dsb->cmd_buf;
+ struct intel_dsb *dsb;
+ u32 *buf;
+ dsb = crtc_state->dsb;
if (!dsb) {
intel_de_write(dev_priv, reg, val);
return;
}
+
buf = dsb->cmd_buf;
if (drm_WARN_ON(&dev_priv->drm, dsb->free_pos >= DSB_BUF_SIZE)) {
drm_dbg_kms(&dev_priv->drm, "DSB buffer overflow\n");
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: Fix early deref of 'dsb'
2020-05-24 23:39 [Intel-gfx] [PATCH] drm/i915/display: Fix early deref of 'dsb' Chris Wilson
@ 2020-05-25 0:10 ` Patchwork
2020-05-25 1:11 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-05-25 0:10 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/display: Fix early deref of 'dsb'
URL : https://patchwork.freedesktop.org/series/77617/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8529 -> Patchwork_17766
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/index.html
Known issues
------------
Here are the changes found in Patchwork_17766 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@i915_selftest@live@coherency:
- fi-bwr-2160: [INCOMPLETE][1] ([i915#489]) -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/fi-bwr-2160/igt@i915_selftest@live@coherency.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/fi-bwr-2160/igt@i915_selftest@live@coherency.html
[i915#489]: https://gitlab.freedesktop.org/drm/intel/issues/489
Participating hosts (45 -> 37)
------------------------------
Additional (1): fi-kbl-7560u
Missing (9): fi-bxt-dsi fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-cfl-8700k fi-bsw-kefka fi-skl-lmem fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_8529 -> Patchwork_17766
CI-20190529: 20190529
CI_DRM_8529: 9ae23ae1b437ee0d75ed2153eca05ecbd8c417bd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5676: ff03d458f708583c8f9296f97c38df312055651a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17766: f046624e9912889fb7d4f82c86dd0e29745f5ba9 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f046624e9912 drm/i915/display: Fix early deref of 'dsb'
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/display: Fix early deref of 'dsb'
2020-05-24 23:39 [Intel-gfx] [PATCH] drm/i915/display: Fix early deref of 'dsb' Chris Wilson
2020-05-25 0:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2020-05-25 1:11 ` Patchwork
2020-05-26 5:57 ` [Intel-gfx] [PATCH] " Manna, Animesh
2020-05-27 8:52 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-05-25 1:11 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/display: Fix early deref of 'dsb'
URL : https://patchwork.freedesktop.org/series/77617/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8529_full -> Patchwork_17766_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_17766_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_17766_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_17766_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_cursor_legacy@cursorb-vs-flipa-toggle:
- shard-glk: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-glk9/igt@kms_cursor_legacy@cursorb-vs-flipa-toggle.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-glk6/igt@kms_cursor_legacy@cursorb-vs-flipa-toggle.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* {igt@kms_flip@plain-flip-fb-recreate@a-hdmi-a1}:
- shard-glk: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-glk2/igt@kms_flip@plain-flip-fb-recreate@a-hdmi-a1.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-glk2/igt@kms_flip@plain-flip-fb-recreate@a-hdmi-a1.html
* {igt@kms_flip@wf_vblank-ts-check-interruptible@a-edp1}:
- shard-skl: [PASS][5] -> [FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl8/igt@kms_flip@wf_vblank-ts-check-interruptible@a-edp1.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl4/igt@kms_flip@wf_vblank-ts-check-interruptible@a-edp1.html
Known issues
------------
Here are the changes found in Patchwork_17766_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_big_fb@x-tiled-64bpp-rotate-0:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#1119] / [i915#118] / [i915#95])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-glk1/igt@kms_big_fb@x-tiled-64bpp-rotate-0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-glk8/igt@kms_big_fb@x-tiled-64bpp-rotate-0.html
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [PASS][9] -> [DMESG-WARN][10] ([i915#180]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-kbl2/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-kbl3/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
* igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-untiled:
- shard-skl: [PASS][11] -> [FAIL][12] ([i915#52] / [i915#54])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl3/igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-untiled.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl2/igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-untiled.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [PASS][13] -> [DMESG-WARN][14] ([i915#165])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-kbl1/igt@kms_fbcon_fbt@fbc-suspend.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-kbl3/igt@kms_fbcon_fbt@fbc-suspend.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][15] -> [FAIL][16] ([i915#1188])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl2/igt@kms_hdr@bpc-switch-dpms.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl10/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- shard-kbl: [PASS][17] -> [INCOMPLETE][18] ([i915#155])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-kbl6/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-kbl1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][19] -> [FAIL][20] ([fdo#108145] / [i915#265])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl3/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441]) +2 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-iclb4/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_vblank@pipe-b-ts-continuation-suspend:
- shard-apl: [PASS][23] -> [DMESG-WARN][24] ([i915#180]) +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl2/igt@kms_vblank@pipe-b-ts-continuation-suspend.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl1/igt@kms_vblank@pipe-b-ts-continuation-suspend.html
#### Possible fixes ####
* {igt@gem_ctx_isolation@preservation-s3@bcs0}:
- shard-kbl: [DMESG-WARN][25] ([i915#180]) -> [PASS][26] +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-kbl7/igt@gem_ctx_isolation@preservation-s3@bcs0.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-kbl1/igt@gem_ctx_isolation@preservation-s3@bcs0.html
* igt@gem_ctx_persistence@processes:
- shard-skl: [FAIL][27] ([i915#1528]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl8/igt@gem_ctx_persistence@processes.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl10/igt@gem_ctx_persistence@processes.html
* igt@kms_cursor_legacy@cursora-vs-flipb-toggle:
- shard-glk: [DMESG-WARN][29] -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-glk9/igt@kms_cursor_legacy@cursora-vs-flipb-toggle.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-glk9/igt@kms_cursor_legacy@cursora-vs-flipb-toggle.html
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][31] ([fdo#109349]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-iclb6/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
* {igt@kms_flip@flip-vs-suspend-interruptible@c-dp1}:
- shard-apl: [DMESG-WARN][33] ([i915#180]) -> [PASS][34] +3 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl3/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl7/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][35] ([fdo#108145] / [i915#265]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][37] ([fdo#109642] / [fdo#111068]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-iclb1/igt@kms_psr2_su@frontbuffer.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_primary_mmap_gtt:
- shard-iclb: [SKIP][39] ([fdo#109441]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-iclb6/igt@kms_psr@psr2_primary_mmap_gtt.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-iclb2/igt@kms_psr@psr2_primary_mmap_gtt.html
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-skl: [SKIP][41] ([fdo#109271]) -> [SKIP][42] ([fdo#109271] / [i915#658])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl7/igt@i915_pm_dc@dc3co-vpb-simulation.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl3/igt@i915_pm_dc@dc3co-vpb-simulation.html
- shard-glk: [SKIP][43] ([fdo#109271]) -> [SKIP][44] ([fdo#109271] / [i915#658])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-glk5/igt@i915_pm_dc@dc3co-vpb-simulation.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-glk4/igt@i915_pm_dc@dc3co-vpb-simulation.html
- shard-apl: [SKIP][45] ([fdo#109271]) -> [SKIP][46] ([fdo#109271] / [i915#658])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl1/igt@i915_pm_dc@dc3co-vpb-simulation.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl1/igt@i915_pm_dc@dc3co-vpb-simulation.html
- shard-kbl: [SKIP][47] ([fdo#109271]) -> [SKIP][48] ([fdo#109271] / [i915#658])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-kbl3/igt@i915_pm_dc@dc3co-vpb-simulation.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-kbl6/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@kms_content_protection@lic:
- shard-apl: [FAIL][49] ([fdo#110321]) -> [DMESG-FAIL][50] ([fdo#110321])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl1/igt@kms_content_protection@lic.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl8/igt@kms_content_protection@lic.html
* igt@kms_content_protection@srm:
- shard-apl: [FAIL][51] ([fdo#110321]) -> [TIMEOUT][52] ([i915#1319])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl4/igt@kms_content_protection@srm.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl8/igt@kms_content_protection@srm.html
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
- shard-apl: [FAIL][53] ([fdo#108145] / [i915#265]) -> [FAIL][54] ([fdo#108145] / [i915#265] / [i915#95])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl8/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl1/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max.html
{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#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#1119]: https://gitlab.freedesktop.org/drm/intel/issues/1119
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1528]: https://gitlab.freedesktop.org/drm/intel/issues/1528
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_8529 -> Patchwork_17766
CI-20190529: 20190529
CI_DRM_8529: 9ae23ae1b437ee0d75ed2153eca05ecbd8c417bd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5676: ff03d458f708583c8f9296f97c38df312055651a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17766: f046624e9912889fb7d4f82c86dd0e29745f5ba9 @ 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_17766/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/display: Fix early deref of 'dsb'
2020-05-24 23:39 [Intel-gfx] [PATCH] drm/i915/display: Fix early deref of 'dsb' Chris Wilson
2020-05-25 0:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-05-25 1:11 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
@ 2020-05-26 5:57 ` Manna, Animesh
2020-05-27 8:52 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Manna, Animesh @ 2020-05-26 5:57 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 25-05-2020 05:09, Chris Wilson wrote:
> drivers/gpu/drm/i915/display/intel_dsb.c:177 intel_dsb_reg_write() warn: variable dereferenced before check 'dsb' (see line 175)
>
> Fixes: afeda4f3b1c8 ("drm/i915/dsb: Pre allocate and late cleanup of cmd buffer")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Animesh Manna <animesh.manna@intel.com>
> Cc: Uma Shankar <uma.shankar@intel.com>
Thanks Chris for catching.
Reviewed-by: Animesh Manna <animesh.manna@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dsb.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c
> index 475106e91fa7..24e6d63e2d47 100644
> --- a/drivers/gpu/drm/i915/display/intel_dsb.c
> +++ b/drivers/gpu/drm/i915/display/intel_dsb.c
> @@ -169,15 +169,17 @@ void intel_dsb_indexed_reg_write(const struct intel_crtc_state *crtc_state,
> void intel_dsb_reg_write(const struct intel_crtc_state *crtc_state,
> i915_reg_t reg, u32 val)
> {
> - struct intel_dsb *dsb = crtc_state->dsb;
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> - u32 *buf = dsb->cmd_buf;
> + struct intel_dsb *dsb;
> + u32 *buf;
>
> + dsb = crtc_state->dsb;
> if (!dsb) {
> intel_de_write(dev_priv, reg, val);
> return;
> }
> +
> buf = dsb->cmd_buf;
> if (drm_WARN_ON(&dev_priv->drm, dsb->free_pos >= DSB_BUF_SIZE)) {
> drm_dbg_kms(&dev_priv->drm, "DSB buffer overflow\n");
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/display: Fix early deref of 'dsb'
2020-05-24 23:39 [Intel-gfx] [PATCH] drm/i915/display: Fix early deref of 'dsb' Chris Wilson
` (2 preceding siblings ...)
2020-05-26 5:57 ` [Intel-gfx] [PATCH] " Manna, Animesh
@ 2020-05-27 8:52 ` Patchwork
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-05-27 8:52 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/display: Fix early deref of 'dsb'
URL : https://patchwork.freedesktop.org/series/77617/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8529_full -> Patchwork_17766_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_17766_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_big_fb@x-tiled-64bpp-rotate-0:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#1119] / [i915#118] / [i915#95])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-glk1/igt@kms_big_fb@x-tiled-64bpp-rotate-0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-glk8/igt@kms_big_fb@x-tiled-64bpp-rotate-0.html
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [PASS][3] -> [DMESG-WARN][4] ([i915#180]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-kbl2/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-kbl3/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
* igt@kms_cursor_legacy@cursorb-vs-flipa-toggle:
- shard-glk: [PASS][5] -> [DMESG-WARN][6] ([i915#1926])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-glk9/igt@kms_cursor_legacy@cursorb-vs-flipa-toggle.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-glk6/igt@kms_cursor_legacy@cursorb-vs-flipa-toggle.html
* igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-untiled:
- shard-skl: [PASS][7] -> [FAIL][8] ([i915#52] / [i915#54])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl3/igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-untiled.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl2/igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-untiled.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [PASS][9] -> [DMESG-WARN][10] ([i915#165])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-kbl1/igt@kms_fbcon_fbt@fbc-suspend.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-kbl3/igt@kms_fbcon_fbt@fbc-suspend.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][11] -> [FAIL][12] ([i915#1188])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl2/igt@kms_hdr@bpc-switch-dpms.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl10/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- shard-kbl: [PASS][13] -> [INCOMPLETE][14] ([i915#155])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-kbl6/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-kbl1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][15] -> [FAIL][16] ([fdo#108145] / [i915#265])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl3/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [PASS][17] -> [SKIP][18] ([fdo#109441]) +2 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-iclb4/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_vblank@pipe-b-ts-continuation-suspend:
- shard-apl: [PASS][19] -> [DMESG-WARN][20] ([i915#180]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl2/igt@kms_vblank@pipe-b-ts-continuation-suspend.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl1/igt@kms_vblank@pipe-b-ts-continuation-suspend.html
#### Possible fixes ####
* {igt@gem_ctx_isolation@preservation-s3@bcs0}:
- shard-kbl: [DMESG-WARN][21] ([i915#180]) -> [PASS][22] +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-kbl7/igt@gem_ctx_isolation@preservation-s3@bcs0.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-kbl1/igt@gem_ctx_isolation@preservation-s3@bcs0.html
* igt@gem_ctx_persistence@processes:
- shard-skl: [FAIL][23] ([i915#1528]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl8/igt@gem_ctx_persistence@processes.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl10/igt@gem_ctx_persistence@processes.html
* igt@kms_cursor_legacy@cursora-vs-flipb-toggle:
- shard-glk: [DMESG-WARN][25] ([i915#1926]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-glk9/igt@kms_cursor_legacy@cursora-vs-flipb-toggle.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-glk9/igt@kms_cursor_legacy@cursora-vs-flipb-toggle.html
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][27] ([fdo#109349]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-iclb6/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
* {igt@kms_flip@flip-vs-suspend-interruptible@c-dp1}:
- shard-apl: [DMESG-WARN][29] ([i915#180]) -> [PASS][30] +3 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl3/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl7/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][31] ([fdo#108145] / [i915#265]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][33] ([fdo#109642] / [fdo#111068]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-iclb1/igt@kms_psr2_su@frontbuffer.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_primary_mmap_gtt:
- shard-iclb: [SKIP][35] ([fdo#109441]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-iclb6/igt@kms_psr@psr2_primary_mmap_gtt.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-iclb2/igt@kms_psr@psr2_primary_mmap_gtt.html
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-skl: [SKIP][37] ([fdo#109271]) -> [SKIP][38] ([fdo#109271] / [i915#658])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-skl7/igt@i915_pm_dc@dc3co-vpb-simulation.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-skl3/igt@i915_pm_dc@dc3co-vpb-simulation.html
- shard-glk: [SKIP][39] ([fdo#109271]) -> [SKIP][40] ([fdo#109271] / [i915#658])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-glk5/igt@i915_pm_dc@dc3co-vpb-simulation.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-glk4/igt@i915_pm_dc@dc3co-vpb-simulation.html
- shard-apl: [SKIP][41] ([fdo#109271]) -> [SKIP][42] ([fdo#109271] / [i915#658])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl1/igt@i915_pm_dc@dc3co-vpb-simulation.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl1/igt@i915_pm_dc@dc3co-vpb-simulation.html
- shard-kbl: [SKIP][43] ([fdo#109271]) -> [SKIP][44] ([fdo#109271] / [i915#658])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-kbl3/igt@i915_pm_dc@dc3co-vpb-simulation.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-kbl6/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@kms_content_protection@lic:
- shard-apl: [FAIL][45] ([fdo#110321]) -> [DMESG-FAIL][46] ([fdo#110321])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl1/igt@kms_content_protection@lic.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl8/igt@kms_content_protection@lic.html
* igt@kms_content_protection@srm:
- shard-apl: [FAIL][47] ([fdo#110321]) -> [TIMEOUT][48] ([i915#1319])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl4/igt@kms_content_protection@srm.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl8/igt@kms_content_protection@srm.html
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
- shard-apl: [FAIL][49] ([fdo#108145] / [i915#265]) -> [FAIL][50] ([fdo#108145] / [i915#265] / [i915#95])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8529/shard-apl8/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17766/shard-apl1/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max.html
{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#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#1119]: https://gitlab.freedesktop.org/drm/intel/issues/1119
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1528]: https://gitlab.freedesktop.org/drm/intel/issues/1528
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1926]: https://gitlab.freedesktop.org/drm/intel/issues/1926
[i915#1928]: https://gitlab.freedesktop.org/drm/intel/issues/1928
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_8529 -> Patchwork_17766
CI-20190529: 20190529
CI_DRM_8529: 9ae23ae1b437ee0d75ed2153eca05ecbd8c417bd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5676: ff03d458f708583c8f9296f97c38df312055651a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17766: f046624e9912889fb7d4f82c86dd0e29745f5ba9 @ 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_17766/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-05-27 8:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-24 23:39 [Intel-gfx] [PATCH] drm/i915/display: Fix early deref of 'dsb' Chris Wilson
2020-05-25 0:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-05-25 1:11 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-05-26 5:57 ` [Intel-gfx] [PATCH] " Manna, Animesh
2020-05-27 8:52 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).