drm/msm: dpu: Don't reset dpu_enc->cur_master on .disable()
authorSean Paul <seanpaul@chromium.org>
Mon, 17 Sep 2018 20:49:32 +0000 (16:49 -0400)
committerRob Clark <robdclark@gmail.com>
Thu, 4 Oct 2018 00:24:54 +0000 (20:24 -0400)
commit9027b8719bd4f46b09c6b9d082715209c17971e2
tree02ac319a4bd88999e99a20ffd794dad2b77b1a42
parent8527b2d836571c20c9ed0934668595f9bba8175e
drm/msm: dpu: Don't reset dpu_enc->cur_master on .disable()

cur_master in dpu_encoder is assigned at modeset and cleared on
.disable(). Unfortunately dpms (or enable/disable) does not guarantee a
modeset, so cur_master is NULL when we try to re-enable it.

This patch moves the NULL assignment to setup_display where it will be
re-assigned later in the function.

Tested-by: Bruce Wang <bzwang@chromium.org>
Reviewed-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c