| Message ID | 20181016155245.112102-1-sean@poorly.run (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm: dpu: Don't set legacy plane->crtc pointer | expand |
On Tue, Oct 16, 2018 at 11:52:45AM -0400, Sean Paul wrote: > From: Sean Paul <seanpaul@chromium.org> > > It causes a WARN in drm_atomic_get_plane_state(), and is not used by > atomic (or dpu). > > Signed-off-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> I guess leftover from refactoring and upstreaming in parallel? -Daniel > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index ae63590ad2d3..ed84cf44a222 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -1517,7 +1517,6 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane, > NULL); > > drm_crtc_helper_add(crtc, &dpu_crtc_helper_funcs); > - plane->crtc = crtc; > > /* save user friendly CRTC name for later */ > snprintf(dpu_crtc->name, DPU_CRTC_NAME_SIZE, "crtc%u", crtc->base.id); > -- > Sean Paul, Software Engineer, Google / Chromium OS > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Tue, Oct 16, 2018 at 12:44 PM Daniel Vetter <daniel@ffwll.ch> wrote: > > On Tue, Oct 16, 2018 at 11:52:45AM -0400, Sean Paul wrote: > > From: Sean Paul <seanpaul@chromium.org> > > > > It causes a WARN in drm_atomic_get_plane_state(), and is not used by > > atomic (or dpu). > > > > Signed-off-by: Sean Paul <seanpaul@chromium.org> > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > I guess leftover from refactoring and upstreaming in parallel? Yep, we're still working out some kinks :( The bring-up and validation was using 4.14 kernel with as many drm core/msm backports as we could fit, but this one slipped through. Fortunately we've got CrOS on 4.19 with all dpu patches upstream (or on list), so this won't be a reoccurring issue. Sean > -Daniel > > > --- > > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > > index ae63590ad2d3..ed84cf44a222 100644 > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > > @@ -1517,7 +1517,6 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane, > > NULL); > > > > drm_crtc_helper_add(crtc, &dpu_crtc_helper_funcs); > > - plane->crtc = crtc; > > > > /* save user friendly CRTC name for later */ > > snprintf(dpu_crtc->name, DPU_CRTC_NAME_SIZE, "crtc%u", crtc->base.id); > > -- > > Sean Paul, Software Engineer, Google / Chromium OS > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index ae63590ad2d3..ed84cf44a222 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -1517,7 +1517,6 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane, NULL); drm_crtc_helper_add(crtc, &dpu_crtc_helper_funcs); - plane->crtc = crtc; /* save user friendly CRTC name for later */ snprintf(dpu_crtc->name, DPU_CRTC_NAME_SIZE, "crtc%u", crtc->base.id);