]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915/dsb: fix cmd_buf being wrongly set
authorLucas De Marchi <lucas.demarchi@intel.com>
Wed, 27 Nov 2019 22:11:21 +0000 (14:11 -0800)
committerLucas De Marchi <lucas.demarchi@intel.com>
Mon, 2 Dec 2019 18:06:25 +0000 (10:06 -0800)
commit872363f3945f1e7ebee79ceac26445e27bf9fbba
treeb5f87cb9bca2889d2b407be8fd57e56e780aeea1
parent02259d40a0b44b496eb630c130c2db87d8b90570
drm/i915/dsb: fix cmd_buf being wrongly set

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 1f00b28b920e ("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 successful. While at it, rename the label so this confusion
doesn't happen again.

Fixes: 1f00b28b920e ("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>
Reviewed-by: Animesh Manna <animesh.manna@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191127221119.384754-1-lucas.demarchi@intel.com
drivers/gpu/drm/i915/display/intel_dsb.c