drm/i915/dsb: fix cmd_buf being wrongly set
diff mbox series

Message ID 20191127221119.384754-1-lucas.demarchi@intel.com
State New
Headers show
Series
  • drm/i915/dsb: fix cmd_buf being wrongly set
Related show

Commit Message

Lucas De Marchi Nov. 27, 2019, 10:11 p.m. UTC
The "err" label is not really "err", but rather "out" since the return
path is shared between error condition and normal path. This broke when
commit 03cea61076f0 ("drm/i915/dsb: fix extra warning on error path
handling") added a "dsb->cmd_buf = NULL;" there, making DSB to stop
working since now all writes would pass-through via mmio.

Remove the set to NULL since it's actually not needed: we only set it if
all steps are succesful. While at it, rename the label so this confusion
doesn't happen again.

Fixes: 03cea61076f0 ("drm/i915/dsb: fix extra warning on error path handling"
Resolves: https://gitlab.freedesktop.org/drm/intel/issues/8
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---

Right now I don't have access to the hw to reproduce it, so this is
build-tested only.

 drivers/gpu/drm/i915/display/intel_dsb.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Manna, Animesh Nov. 28, 2019, 4:52 p.m. UTC | #1
On 11/28/2019 3:41 AM, Lucas De Marchi wrote:
> The "err" label is not really "err", but rather "out" since the return
> path is shared between error condition and normal path. This broke when
> commit 03cea61076f0 ("drm/i915/dsb: fix extra warning on error path
> handling") added a "dsb->cmd_buf = NULL;" there, making DSB to stop
> working since now all writes would pass-through via mmio.
>
> Remove the set to NULL since it's actually not needed: we only set it if
> all steps are succesful. While at it, rename the label so this confusion
Typo above, otherwise looks good.
Reviewed-by: Animesh Manna <animesh.manna@intel.com>

Quick merge will help in validation.

Regards,
Animesh
> doesn't happen again.
>
> Fixes: 03cea61076f0 ("drm/i915/dsb: fix extra warning on error path handling"
> Resolves: https://gitlab.freedesktop.org/drm/intel/issues/8
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>
> Right now I don't have access to the hw to reproduce it, so this is
> build-tested only.
>
>   drivers/gpu/drm/i915/display/intel_dsb.c | 18 +++++++++---------
>   1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c
> index 5bf67bdc8182..ada006a690df 100644
> --- a/drivers/gpu/drm/i915/display/intel_dsb.c
> +++ b/drivers/gpu/drm/i915/display/intel_dsb.c
> @@ -116,34 +116,34 @@ intel_dsb_get(struct intel_crtc *crtc)
>   	obj = i915_gem_object_create_internal(i915, DSB_BUF_SIZE);
>   	if (IS_ERR(obj)) {
>   		DRM_ERROR("Gem object creation failed\n");
> -		goto err;
> +		goto out;
>   	}
>   
>   	vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, 0);
>   	if (IS_ERR(vma)) {
>   		DRM_ERROR("Vma creation failed\n");
>   		i915_gem_object_put(obj);
> -		goto err;
> +		goto out;
>   	}
>   
>   	buf = i915_gem_object_pin_map(vma->obj, I915_MAP_WC);
>   	if (IS_ERR(buf)) {
>   		DRM_ERROR("Command buffer creation failed\n");
> -		goto err;
> +		goto out;
>   	}
>   
>   	dsb->id = DSB1;
>   	dsb->vma = vma;
>   	dsb->cmd_buf = buf;
>   
> -err:
> +out:
>   	/*
> -	 * Set cmd_buf to NULL so the writes pass-through, but leave the
> -	 * dangling refcount to be removed later by the corresponding
> -	 * intel_dsb_put(): the important error message will already be
> -	 * logged above.
> +	 * On error dsb->cmd_buf will continue to be NULL, making the writes
> +	 * pass-through. Leave the dangling ref to be removed later by the
> +	 * corresponding intel_dsb_put(): the important error message will
> +	 * already be logged above.
>   	 */
> -	dsb->cmd_buf = NULL;
> +
>   	intel_runtime_pm_put(&i915->runtime_pm, wakeref);
>   
>   	return dsb;
Lucas De Marchi Dec. 2, 2019, 6:04 p.m. UTC | #2
On Thu, Nov 28, 2019 at 7:22 PM Patchwork
<patchwork@emeril.freedesktop.org> wrote:
>
> == Series Details ==
>
> Series: drm/i915/dsb: fix cmd_buf being wrongly set
> URL   : https://patchwork.freedesktop.org/series/70129/
> State : failure
>
> == Summary ==
>
> CI Bug Log - changes from CI_DRM_7434_full -> Patchwork_15475_full
> ====================================================
>
> Summary
> -------
>
>   **FAILURE**
>
>   Serious unknown changes coming with Patchwork_15475_full absolutely need to be
>   verified manually.
>
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_15475_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_15475_full:
>
> ### IGT changes ###
>
> #### Possible regressions ####
>
>   * igt@gem_ctx_shared@exec-shared-gtt-bsd1:
>     - shard-kbl:          [PASS][1] -> [FAIL][2]
>    [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-kbl4/igt@gem_ctx_shared@exec-shared-gtt-bsd1.html
>    [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-kbl7/igt@gem_ctx_shared@exec-shared-gtt-bsd1.html

https://gitlab.freedesktop.org/drm/intel/issues/616 /
https://gitlab.freedesktop.org/drm/intel/issues/607

>
>   * igt@kms_plane@pixel-format-pipe-a-planes:
>     - shard-skl:          NOTRUN -> [INCOMPLETE][3]
>    [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-skl2/igt@kms_plane@pixel-format-pipe-a-planes.html

unrelated, too. DSB is only available on TGL+ and used to load the gamma lut.

Lucas De Marchi

>
>
> #### Suppressed ####
>
>   The following results come from untrusted machines, tests, or statuses.
>   They do not affect the overall result.
>
>   * {igt@gem_exec_balancer@bonded-chain}:
>     - shard-tglb:         NOTRUN -> [FAIL][4]
>    [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb2/igt@gem_exec_balancer@bonded-chain.html
>
>
> Known issues
> ------------
>
>   Here are the changes found in Patchwork_15475_full that come from known issues:
>
> ### IGT changes ###
>
> #### Issues hit ####
>
>   * igt@gem_busy@busy-vcs1:
>     - shard-iclb:         [PASS][5] -> [SKIP][6] ([fdo#112080]) +6 similar issues
>    [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb2/igt@gem_busy@busy-vcs1.html
>    [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-iclb5/igt@gem_busy@busy-vcs1.html
>
>   * igt@gem_ctx_isolation@bcs0-s3:
>     - shard-tglb:         [PASS][7] -> [INCOMPLETE][8] ([fdo#111832])
>    [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb9/igt@gem_ctx_isolation@bcs0-s3.html
>    [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb1/igt@gem_ctx_isolation@bcs0-s3.html
>
>   * igt@gem_ctx_isolation@vcs1-s3:
>     - shard-iclb:         [PASS][9] -> [SKIP][10] ([fdo#109276] / [fdo#112080]) +1 similar issue
>    [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb2/igt@gem_ctx_isolation@vcs1-s3.html
>    [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-iclb5/igt@gem_ctx_isolation@vcs1-s3.html
>
>   * igt@gem_ctx_shared@q-smoketest-bsd2:
>     - shard-tglb:         [PASS][11] -> [INCOMPLETE][12] ([fdo# 111852 ])
>    [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb2/igt@gem_ctx_shared@q-smoketest-bsd2.html
>    [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb4/igt@gem_ctx_shared@q-smoketest-bsd2.html
>
>   * igt@gem_ctx_switch@queue-light:
>     - shard-tglb:         [PASS][13] -> [INCOMPLETE][14] ([fdo#111672])
>    [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb5/igt@gem_ctx_switch@queue-light.html
>    [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb3/igt@gem_ctx_switch@queue-light.html
>
>   * igt@gem_eio@in-flight-suspend:
>     - shard-tglb:         [PASS][15] -> [INCOMPLETE][16] ([fdo#111832] / [fdo#111850] / [fdo#112081])
>    [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb6/igt@gem_eio@in-flight-suspend.html
>    [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb4/igt@gem_eio@in-flight-suspend.html
>
>   * igt@gem_eio@suspend:
>     - shard-tglb:         [PASS][17] -> [INCOMPLETE][18] ([fdo#111850])
>    [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb2/igt@gem_eio@suspend.html
>    [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb5/igt@gem_eio@suspend.html
>
>   * igt@gem_eio@unwedge-stress:
>     - shard-snb:          [PASS][19] -> [FAIL][20] ([fdo#109661])
>    [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-snb6/igt@gem_eio@unwedge-stress.html
>    [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-snb6/igt@gem_eio@unwedge-stress.html
>
>   * igt@gem_exec_parallel@vecs0:
>     - shard-tglb:         [PASS][21] -> [INCOMPLETE][22] ([fdo#111736])
>    [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb1/igt@gem_exec_parallel@vecs0.html
>    [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb4/igt@gem_exec_parallel@vecs0.html
>
>   * igt@gem_exec_schedule@pi-ringfull-bsd2:
>     - shard-iclb:         [PASS][23] -> [SKIP][24] ([fdo#109276]) +4 similar issues
>    [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb2/igt@gem_exec_schedule@pi-ringfull-bsd2.html
>    [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-iclb5/igt@gem_exec_schedule@pi-ringfull-bsd2.html
>
>   * igt@gem_persistent_relocs@forked-interruptible-thrashing:
>     - shard-hsw:          [PASS][25] -> [FAIL][26] ([fdo#112037])
>    [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-hsw1/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
>    [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-hsw2/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
>
>   * igt@gem_ppgtt@flink-and-close-vma-leak:
>     - shard-glk:          [PASS][27] -> [FAIL][28] ([fdo#112392])
>    [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-glk1/igt@gem_ppgtt@flink-and-close-vma-leak.html
>    [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-glk1/igt@gem_ppgtt@flink-and-close-vma-leak.html
>     - shard-skl:          [PASS][29] -> [FAIL][30] ([fdo#112392])
>    [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl8/igt@gem_ppgtt@flink-and-close-vma-leak.html
>    [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-skl5/igt@gem_ppgtt@flink-and-close-vma-leak.html
>
>   * igt@gem_softpin@noreloc-s3:
>     - shard-apl:          [PASS][31] -> [DMESG-WARN][32] ([fdo#108566]) +1 similar issue
>    [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-apl7/igt@gem_softpin@noreloc-s3.html
>    [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-apl3/igt@gem_softpin@noreloc-s3.html
>
>   * igt@gem_userptr_blits@map-fixed-invalidate-busy:
>     - shard-hsw:          [PASS][33] -> [DMESG-WARN][34] ([fdo#111870])
>    [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-hsw8/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
>    [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-hsw6/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
>
>   * igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy:
>     - shard-snb:          [PASS][35] -> [DMESG-WARN][36] ([fdo#111870])
>    [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-snb4/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
>    [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-snb6/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
>
>   * igt@kms_big_fb@x-tiled-8bpp-rotate-0:
>     - shard-kbl:          [PASS][37] -> [INCOMPLETE][38] ([fdo#103665])
>    [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-kbl7/igt@kms_big_fb@x-tiled-8bpp-rotate-0.html
>    [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-kbl6/igt@kms_big_fb@x-tiled-8bpp-rotate-0.html
>
>   * igt@kms_big_fb@y-tiled-8bpp-rotate-0:
>     - shard-glk:          [PASS][39] -> [INCOMPLETE][40] ([fdo#103359] / [k.org#198133])
>    [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-glk3/igt@kms_big_fb@y-tiled-8bpp-rotate-0.html
>    [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-glk9/igt@kms_big_fb@y-tiled-8bpp-rotate-0.html
>
>   * igt@kms_color@pipe-b-ctm-negative:
>     - shard-skl:          [PASS][41] -> [DMESG-WARN][42] ([fdo#106107]) +1 similar issue
>    [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl1/igt@kms_color@pipe-b-ctm-negative.html
>    [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-skl9/igt@kms_color@pipe-b-ctm-negative.html
>
>   * igt@kms_cursor_legacy@flip-vs-cursor-atomic:
>     - shard-skl:          [PASS][43] -> [FAIL][44] ([fdo#5])
>    [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl9/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
>    [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-skl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
>
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw:
>     - shard-tglb:         [PASS][45] -> [FAIL][46] ([fdo#103167])
>    [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw.html
>    [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw.html
>
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-cpu:
>     - shard-tglb:         [PASS][47] -> [INCOMPLETE][48] ([fdo#111884])
>    [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-cpu.html
>    [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-cpu.html
>
>   * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
>     - shard-tglb:         [PASS][49] -> [INCOMPLETE][50] ([fdo#111832] / [fdo#111850]) +2 similar issues
>    [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb6/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
>    [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb3/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
>
>   * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
>     - shard-kbl:          [PASS][51] -> [DMESG-WARN][52] ([fdo#108566]) +2 similar issues
>    [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
>    [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
>
>   * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
>     - shard-skl:          [PASS][53] -> [FAIL][54] ([fdo#108145] / [fdo#110403])
>    [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl4/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
>    [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-skl2/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
>
>   * igt@kms_setmode@basic:
>     - shard-hsw:          [PASS][55] -> [FAIL][56] ([fdo#99912])
>    [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-hsw1/igt@kms_setmode@basic.html
>    [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-hsw7/igt@kms_setmode@basic.html
>
>
> #### Possible fixes ####
>
>   * igt@gem_ctx_persistence@smoketest:
>     - shard-glk:          [TIMEOUT][57] ([fdo#112404]) -> [PASS][58]
>    [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-glk8/igt@gem_ctx_persistence@smoketest.html
>    [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-glk1/igt@gem_ctx_persistence@smoketest.html
>
>   * igt@gem_eio@in-flight-suspend:
>     - shard-skl:          [INCOMPLETE][59] ([fdo#104108]) -> [PASS][60] +1 similar issue
>    [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl8/igt@gem_eio@in-flight-suspend.html
>    [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-skl4/igt@gem_eio@in-flight-suspend.html
>
>   * igt@gem_eio@unwedge-stress:
>     - shard-hsw:          [INCOMPLETE][61] ([fdo#103540]) -> [PASS][62]
>    [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-hsw4/igt@gem_eio@unwedge-stress.html
>    [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-hsw4/igt@gem_eio@unwedge-stress.html
>
>   * igt@gem_exec_schedule@preempt-queue-bsd:
>     - shard-iclb:         [SKIP][63] ([fdo#112146]) -> [PASS][64] +1 similar issue
>    [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb4/igt@gem_exec_schedule@preempt-queue-bsd.html
>    [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-iclb3/igt@gem_exec_schedule@preempt-queue-bsd.html
>
>   * igt@gem_exec_schedule@preempt-queue-chain-vebox:
>     - shard-tglb:         [INCOMPLETE][65] ([fdo#111677]) -> [PASS][66]
>    [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb6/igt@gem_exec_schedule@preempt-queue-chain-vebox.html
>    [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb2/igt@gem_exec_schedule@preempt-queue-chain-vebox.html
>
>   * igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy:
>     - shard-hsw:          [DMESG-WARN][67] ([fdo#111870]) -> [PASS][68]
>    [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-hsw1/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
>    [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-hsw5/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
>
>   * igt@gem_userptr_blits@sync-unmap:
>     - shard-snb:          [DMESG-WARN][69] ([fdo#111870]) -> [PASS][70] +1 similar issue
>    [69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-snb4/igt@gem_userptr_blits@sync-unmap.html
>    [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-snb4/igt@gem_userptr_blits@sync-unmap.html
>
>   * igt@gem_userptr_blits@sync-unmap-after-close:
>     - shard-kbl:          [INCOMPLETE][71] ([fdo#103665]) -> [PASS][72]
>    [71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-kbl6/igt@gem_userptr_blits@sync-unmap-after-close.html
>    [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-kbl3/igt@gem_userptr_blits@sync-unmap-after-close.html
>
>   * igt@kms_big_fb@y-tiled-32bpp-rotate-270:
>     - shard-glk:          [INCOMPLETE][73] ([fdo#103359] / [k.org#198133]) -> [PASS][74]
>    [73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-glk7/igt@kms_big_fb@y-tiled-32bpp-rotate-270.html
>    [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-glk7/igt@kms_big_fb@y-tiled-32bpp-rotate-270.html
>
>   * igt@kms_cursor_crc@pipe-c-cursor-suspend:
>     - shard-kbl:          [DMESG-WARN][75] ([fdo#108566]) -> [PASS][76] +4 similar issues
>    [75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-kbl4/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
>    [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-kbl7/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
>
>   * igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
>     - shard-glk:          [FAIL][77] ([fdo#107409]) -> [PASS][78]
>    [77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-glk9/igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic.html
>    [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-glk6/igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic.html
>
>   * igt@kms_flip@flip-vs-suspend-interruptible:
>     - shard-iclb:         [INCOMPLETE][79] ([fdo#107713] / [fdo#109507]) -> [PASS][80]
>    [79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb3/igt@kms_flip@flip-vs-suspend-interruptible.html
>    [80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-iclb8/igt@kms_flip@flip-vs-suspend-interruptible.html
>
>   * igt@kms_flip@plain-flip-ts-check-interruptible:
>     - shard-skl:          [FAIL][81] ([fdo#100368]) -> [PASS][82] +1 similar issue
>    [81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl2/igt@kms_flip@plain-flip-ts-check-interruptible.html
>    [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-skl7/igt@kms_flip@plain-flip-ts-check-interruptible.html
>
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt:
>     - shard-tglb:         [INCOMPLETE][83] ([fdo#111884]) -> [PASS][84]
>    [83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt.html
>    [84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt.html
>
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-mmap-wc:
>     - shard-tglb:         [FAIL][85] ([fdo#103167]) -> [PASS][86]
>    [85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-mmap-wc.html
>    [86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-mmap-wc.html
>
>   * igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu:
>     - shard-iclb:         [INCOMPLETE][87] ([fdo#106978] / [fdo#107713]) -> [PASS][88]
>    [87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-iclb3/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu.html
>    [88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-iclb3/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu.html
>     - shard-skl:          [INCOMPLETE][89] ([fdo#106978]) -> [PASS][90]
>    [89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl8/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu.html
>    [90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-skl8/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-cpu.html
>
>   * igt@kms_plane@pixel-format-pipe-a-planes-source-clamping:
>     - shard-skl:          [INCOMPLETE][91] ([fdo#112397]) -> [PASS][92]
>    [91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-skl4/igt@kms_plane@pixel-format-pipe-a-planes-source-clamping.html
>    [92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-skl8/igt@kms_plane@pixel-format-pipe-a-planes-source-clamping.html
>
>   * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
>     - shard-apl:          [DMESG-WARN][93] ([fdo#108566]) -> [PASS][94] +1 similar issue
>    [93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-apl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
>    [94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-apl2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
>
>   * igt@kms_vblank@pipe-a-ts-continuation-suspend:
>     - shard-tglb:         [INCOMPLETE][95] ([fdo#111832] / [fdo#111850]) -> [PASS][96] +3 similar issues
>    [95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-tglb5/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
>    [96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-tglb1/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
>
>
> #### Warnings ####
>
>   * igt@gem_eio@kms:
>     - shard-snb:          [INCOMPLETE][97] ([fdo#105411]) -> [DMESG-WARN][98] ([fdo#111781])
>    [97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7434/shard-snb1/igt@gem_eio@kms.html
>    [98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15475/shard-snb2/igt@gem_eio@kms.html
>
>
>   {name}: This element is suppressed. This means it is ignored when computing
>           the status of the difference (SUCCESS, WARNING, or FAILURE).
>
>   [fdo# 111852 ]: https://bugs.freedesktop.org/show_bug.cgi?id= 111852
>   [fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
>   [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
>   [fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
>   [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
>   [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
>   [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
>   [fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
>   [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
>   [fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
>   [fdo#107409]: https://bugs.freedesktop.org/show_bug.cgi?id=107409
>   [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
>   [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#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
>   [fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
>   [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
>   [fdo#111672]: https://bugs.freedesktop.org/show_bug.cgi?id=111672
>   [fdo#111677]: https://bugs.freedesktop.org/show_bug.cgi?id=111677
>   [fdo#111736]: https://bugs.freedesktop.org/show_bug.cgi?id=111736
>   [fdo#111781]: https://bugs.freedesktop.org/show_bug.cgi?id=111781
>   [fdo#111832]: https://bugs.freedesktop.org/show_bug.cgi?id=111832
>   [fdo#111850]: https://bugs.freedesktop.org/show_bug.cgi?id=111850
>   [fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870
>   [fdo#111884]: https://bugs.freedesktop.org/show_bug.cgi?id=111884
>   [fdo#112037]: https://bugs.freedesktop.org/show_bug.cgi?id=112037
>   [fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
>   [fdo#112081]: https://bugs.freedesktop.org/show_bug.cgi?id=112081
>   [fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
>   [fdo#112392]: https://bugs.freedesktop.org/show_bug.cgi?id=112392
>   [fdo#112397]: https://bugs.freedesktop.org/show_bug.cgi?id=112397
>   [fdo#112404]: https://bugs.freedesktop.org/show_bug.cgi?id=112404
>   [fdo#5]: https://bugs.freedesktop.org/show_bug.cgi?id=5
>   [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
>   [k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
>
>
> Participating hosts (11 -> 11)
> ------------------------------
>
>   No changes in participating hosts
>
>
> Build changes
> -------------
>
>   * CI: CI-20190529 -> None
>   * Linux: CI_DRM_7434 -> Patchwork_15475
>
>   CI-20190529: 20190529
>   CI_DRM_7434: 1bbc4d30ca9fd950cbcb73f324e00d0bc357758e @ git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_5312: 851c75531043cd906e028632b64b02b9312e9945 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_15475: e374ea8db851b8dd5fca71a815344f7fe6174089 @ 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_15475/index.html
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c
index 5bf67bdc8182..ada006a690df 100644
--- a/drivers/gpu/drm/i915/display/intel_dsb.c
+++ b/drivers/gpu/drm/i915/display/intel_dsb.c
@@ -116,34 +116,34 @@  intel_dsb_get(struct intel_crtc *crtc)
 	obj = i915_gem_object_create_internal(i915, DSB_BUF_SIZE);
 	if (IS_ERR(obj)) {
 		DRM_ERROR("Gem object creation failed\n");
-		goto err;
+		goto out;
 	}
 
 	vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, 0);
 	if (IS_ERR(vma)) {
 		DRM_ERROR("Vma creation failed\n");
 		i915_gem_object_put(obj);
-		goto err;
+		goto out;
 	}
 
 	buf = i915_gem_object_pin_map(vma->obj, I915_MAP_WC);
 	if (IS_ERR(buf)) {
 		DRM_ERROR("Command buffer creation failed\n");
-		goto err;
+		goto out;
 	}
 
 	dsb->id = DSB1;
 	dsb->vma = vma;
 	dsb->cmd_buf = buf;
 
-err:
+out:
 	/*
-	 * Set cmd_buf to NULL so the writes pass-through, but leave the
-	 * dangling refcount to be removed later by the corresponding
-	 * intel_dsb_put(): the important error message will already be
-	 * logged above.
+	 * On error dsb->cmd_buf will continue to be NULL, making the writes
+	 * pass-through. Leave the dangling ref to be removed later by the
+	 * corresponding intel_dsb_put(): the important error message will
+	 * already be logged above.
 	 */
-	dsb->cmd_buf = NULL;
+
 	intel_runtime_pm_put(&i915->runtime_pm, wakeref);
 
 	return dsb;