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)
commit13caf7bea4432e8d192d412eae9ee8efb2f47fe8
treeb5f87cb9bca2889d2b407be8fd57e56e780aeea1
parentca851c224853fb0eb6e4f45c92896f89e6013a44
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 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 successful. 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>
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