| Message ID | 20180405195035.24722-5-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
This makes sense once we got rid of plane->fb Will this go to drm-next? Could you please CC me so that I can do some testing myself. Thanks. Reviewed-by: Deepak Rawat <drawat@vmware.com> > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > We want to get rid of plane->fb on atomic drivers. Stop setting it. > > Cc: Thomas Hellstrom <thellstrom@vmware.com> > Cc: Sinclair Yeh <syeh@vmware.com> > Cc: VMware Graphics <linux-graphics-maintainer@vmware.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 -- > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 -- > 2 files changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > index 648f8127f65a..bbd3f19b1a0b 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > @@ -525,8 +525,6 @@ vmw_sou_primary_plane_atomic_update(struct > drm_plane *plane, > */ > if (ret != 0) > DRM_ERROR("Failed to update screen.\n"); > - > - crtc->primary->fb = plane->state->fb; > } else { > /* > * When disabling a plane, CRTC and FB should always be > NULL > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > index 67331f01ef32..90445bc590cb 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > @@ -1285,8 +1285,6 @@ vmw_stdu_primary_plane_atomic_update(struct > drm_plane *plane, > 1, 1, NULL, crtc); > if (ret) > DRM_ERROR("Failed to update STDU.\n"); > - > - crtc->primary->fb = plane->state->fb; > } else { > crtc = old_state->crtc; > stdu = vmw_crtc_to_stdu(crtc); > -- > 2.16.1
On Fri, Apr 06, 2018 at 07:14:51PM +0000, Deepak Singh Rawat wrote: > This makes sense once we got rid of plane->fb > > Will this go to drm-next? The plan is to push to drm-misc-next once we get all the ducks in a row. > Could you please CC > me so that I can do some testing myself. Thanks. Here's a branch if you want a head start: git://github.com/vsyrjala/linux.git plane_fb_crtc_nuke_2 I'd definitely appreciate some testing of this stuff. Wouldn't want to break you stuff accidentally. > > Reviewed-by: Deepak Rawat <drawat@vmware.com> > > > > > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > We want to get rid of plane->fb on atomic drivers. Stop setting it. > > > > Cc: Thomas Hellstrom <thellstrom@vmware.com> > > Cc: Sinclair Yeh <syeh@vmware.com> > > Cc: VMware Graphics <linux-graphics-maintainer@vmware.com> > > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > --- > > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 -- > > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 -- > > 2 files changed, 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > index 648f8127f65a..bbd3f19b1a0b 100644 > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > @@ -525,8 +525,6 @@ vmw_sou_primary_plane_atomic_update(struct > > drm_plane *plane, > > */ > > if (ret != 0) > > DRM_ERROR("Failed to update screen.\n"); > > - > > - crtc->primary->fb = plane->state->fb; > > } else { > > /* > > * When disabling a plane, CRTC and FB should always be > > NULL > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > index 67331f01ef32..90445bc590cb 100644 > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > @@ -1285,8 +1285,6 @@ vmw_stdu_primary_plane_atomic_update(struct > > drm_plane *plane, > > 1, 1, NULL, crtc); > > if (ret) > > DRM_ERROR("Failed to update STDU.\n"); > > - > > - crtc->primary->fb = plane->state->fb; > > } else { > > crtc = old_state->crtc; > > stdu = vmw_crtc_to_stdu(crtc); > > -- > > 2.16.1
On Fri, Apr 06, 2018 at 10:35:00PM +0300, Ville Syrjälä wrote: > On Fri, Apr 06, 2018 at 07:14:51PM +0000, Deepak Singh Rawat wrote: > > This makes sense once we got rid of plane->fb > > > > Will this go to drm-next? > > The plan is to push to drm-misc-next once we get all > the ducks in a row. > > > Could you please CC > > me so that I can do some testing myself. Thanks. > > Here's a branch if you want a head start: > git://github.com/vsyrjala/linux.git plane_fb_crtc_nuke_2 > > I'd definitely appreciate some testing of this stuff. Wouldn't > want to break you stuff accidentally. Did we get anywhere with testing this? I'd like to land the remaining bits, but I'd feel much safer doing that if it was tested. > > > > > Reviewed-by: Deepak Rawat <drawat@vmware.com> > > > > > > > > > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > > > We want to get rid of plane->fb on atomic drivers. Stop setting it. > > > > > > Cc: Thomas Hellstrom <thellstrom@vmware.com> > > > Cc: Sinclair Yeh <syeh@vmware.com> > > > Cc: VMware Graphics <linux-graphics-maintainer@vmware.com> > > > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > --- > > > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 -- > > > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 -- > > > 2 files changed, 4 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > > b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > > index 648f8127f65a..bbd3f19b1a0b 100644 > > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > > @@ -525,8 +525,6 @@ vmw_sou_primary_plane_atomic_update(struct > > > drm_plane *plane, > > > */ > > > if (ret != 0) > > > DRM_ERROR("Failed to update screen.\n"); > > > - > > > - crtc->primary->fb = plane->state->fb; > > > } else { > > > /* > > > * When disabling a plane, CRTC and FB should always be > > > NULL > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > > b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > > index 67331f01ef32..90445bc590cb 100644 > > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > > @@ -1285,8 +1285,6 @@ vmw_stdu_primary_plane_atomic_update(struct > > > drm_plane *plane, > > > 1, 1, NULL, crtc); > > > if (ret) > > > DRM_ERROR("Failed to update STDU.\n"); > > > - > > > - crtc->primary->fb = plane->state->fb; > > > } else { > > > crtc = old_state->crtc; > > > stdu = vmw_crtc_to_stdu(crtc); > > > -- > > > 2.16.1 > > -- > Ville Syrjälä > Intel OTC > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> > On Fri, Apr 06, 2018 at 10:35:00PM +0300, Ville Syrjälä wrote: > > On Fri, Apr 06, 2018 at 07:14:51PM +0000, Deepak Singh Rawat wrote: > > > This makes sense once we got rid of plane->fb > > > > > > Will this go to drm-next? > > > > The plan is to push to drm-misc-next once we get all > > the ducks in a row. > > > > > Could you please CC > > > me so that I can do some testing myself. Thanks. > > > > Here's a branch if you want a head start: > > git://github.com/vsyrjala/linux.git plane_fb_crtc_nuke_2 > > > > I'd definitely appreciate some testing of this stuff. Wouldn't > > want to break you stuff accidentally. > > Did we get anywhere with testing this? I'd like to land the remaining > bits, but I'd feel much safer doing that if it was tested. Hi Ville, I did some basic mode-setting testing by taking your patches to vmwgfx private branch and things seems to work fine. Thanks, Deepak > > > > > > > > > Reviewed-by: Deepak Rawat <drawat@vmware.com> > > > > > > > > > > > > > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > > > > > We want to get rid of plane->fb on atomic drivers. Stop setting it. > > > > > > > > Cc: Thomas Hellstrom <thellstrom@vmware.com> > > > > Cc: Sinclair Yeh <syeh@vmware.com> > > > > Cc: VMware Graphics <linux-graphics-maintainer@vmware.com> > > > > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > --- > > > > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 -- > > > > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 -- > > > > 2 files changed, 4 deletions(-) > > > > > > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > > > b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > > > index 648f8127f65a..bbd3f19b1a0b 100644 > > > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > > > > @@ -525,8 +525,6 @@ > vmw_sou_primary_plane_atomic_update(struct > > > > drm_plane *plane, > > > > */ > > > > if (ret != 0) > > > > DRM_ERROR("Failed to update screen.\n"); > > > > - > > > > - crtc->primary->fb = plane->state->fb; > > > > } else { > > > > /* > > > > * When disabling a plane, CRTC and FB should always be > > > > NULL > > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > > > b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > > > index 67331f01ef32..90445bc590cb 100644 > > > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > > > @@ -1285,8 +1285,6 @@ > vmw_stdu_primary_plane_atomic_update(struct > > > > drm_plane *plane, > > > > 1, 1, NULL, crtc); > > > > if (ret) > > > > DRM_ERROR("Failed to update STDU.\n"); > > > > - > > > > - crtc->primary->fb = plane->state->fb; > > > > } else { > > > > crtc = old_state->crtc; > > > > stdu = vmw_crtc_to_stdu(crtc); > > > > -- > > > > 2.16.1 > > > > -- > > Ville Syrjälä > > Intel OTC > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://urldefense.proofpoint.com/v2/url?u=https- > 3A__lists.freedesktop.org_mailman_listinfo_intel- > 2Dgfx&d=DwIDAw&c=uilaK90D4TOVoH58JNXRgQ&r=zOOG28inJK0762SxAf- > cyZdStnd2NQpRu98lJP2iYGw&m=3J7W8_yE3JhMDcN3FfZN8bWZON61wueSY > YfSGxPNHVE&s=TqYFqV1NCzCnakZHMWVyJ9k42n0CUm5Kcl9xW2Cdvz4&e= > > -- > Ville Syrjälä > Intel
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c index 648f8127f65a..bbd3f19b1a0b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c @@ -525,8 +525,6 @@ vmw_sou_primary_plane_atomic_update(struct drm_plane *plane, */ if (ret != 0) DRM_ERROR("Failed to update screen.\n"); - - crtc->primary->fb = plane->state->fb; } else { /* * When disabling a plane, CRTC and FB should always be NULL diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c index 67331f01ef32..90445bc590cb 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c @@ -1285,8 +1285,6 @@ vmw_stdu_primary_plane_atomic_update(struct drm_plane *plane, 1, 1, NULL, crtc); if (ret) DRM_ERROR("Failed to update STDU.\n"); - - crtc->primary->fb = plane->state->fb; } else { crtc = old_state->crtc; stdu = vmw_crtc_to_stdu(crtc);