Message ID | 20181116184238.170034-21-sean@poorly.run (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
Series | drm/msm: Various dpu locking and legacy cleanups | expand |
On 2018-11-16 10:42, Sean Paul wrote: > From: Sean Paul <seanpaul@chromium.org> > > Matches dpu_crtc_enable and we'll need the old state in a future patch > > Changes in v2: > - None > > Signed-off-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Jeykumar Sankaran <jsanka@codeaurora.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index 4d7f9ff1e9f4..9efb41c7973b 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -815,7 +815,8 @@ static struct drm_crtc_state > *dpu_crtc_duplicate_state(struct drm_crtc *crtc) > return &cstate->base; > } > > -static void dpu_crtc_disable(struct drm_crtc *crtc) > +static void dpu_crtc_disable(struct drm_crtc *crtc, > + struct drm_crtc_state *old_crtc_state) > { > struct dpu_crtc *dpu_crtc; > struct dpu_crtc_state *cstate; > @@ -1407,7 +1408,7 @@ static const struct drm_crtc_funcs dpu_crtc_funcs > = > { > }; > > static const struct drm_crtc_helper_funcs dpu_crtc_helper_funcs = { > - .disable = dpu_crtc_disable, > + .atomic_disable = dpu_crtc_disable, > .atomic_enable = dpu_crtc_enable, > .atomic_check = dpu_crtc_atomic_check, > .atomic_begin = dpu_crtc_atomic_begin,
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index 4d7f9ff1e9f4..9efb41c7973b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -815,7 +815,8 @@ static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc *crtc) return &cstate->base; } -static void dpu_crtc_disable(struct drm_crtc *crtc) +static void dpu_crtc_disable(struct drm_crtc *crtc, + struct drm_crtc_state *old_crtc_state) { struct dpu_crtc *dpu_crtc; struct dpu_crtc_state *cstate; @@ -1407,7 +1408,7 @@ static const struct drm_crtc_funcs dpu_crtc_funcs = { }; static const struct drm_crtc_helper_funcs dpu_crtc_helper_funcs = { - .disable = dpu_crtc_disable, + .atomic_disable = dpu_crtc_disable, .atomic_enable = dpu_crtc_enable, .atomic_check = dpu_crtc_atomic_check, .atomic_begin = dpu_crtc_atomic_begin,