| Message ID | 20180405154449.23038-10-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 05, 2018 at 05:44:49PM +0200, Daniel Vetter wrote: > Again same justification as for drm_gem_fb_prepare_fb(). > > Definitely needs some testing because Rob doesn't remember why he did > this, and Google/git.fd.o or anything also doesn't shed some light on > it. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Rob Clark <robdclark@gmail.com> > Cc: linux-arm-msm@vger.kernel.org > Cc: freedreno@lists.freedesktop.org Just rebased this and noticed it's supreseeded by Sean Paul's work. I'd appreciate some more official msm group maintainership so I have more people to nag, since this not going anywhere has held up the entire patch series. -Daniel > --- > drivers/gpu/drm/msm/msm_atomic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c > index bf5f8c39f34d..0dcdc922fc61 100644 > --- a/drivers/gpu/drm/msm/msm_atomic.c > +++ b/drivers/gpu/drm/msm/msm_atomic.c > @@ -201,7 +201,7 @@ int msm_atomic_commit(struct drm_device *dev, > * Figure out what fence to wait for: > */ > for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) { > - if ((new_plane_state->fb != old_plane_state->fb) && new_plane_state->fb) { > + if (new_plane_state->fb) { > struct drm_gem_object *obj = msm_framebuffer_bo(new_plane_state->fb, 0); > struct msm_gem_object *msm_obj = to_msm_bo(obj); > struct dma_fence *fence = reservation_object_get_excl_rcu(msm_obj->resv); > -- > 2.16.2 >
diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index bf5f8c39f34d..0dcdc922fc61 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -201,7 +201,7 @@ int msm_atomic_commit(struct drm_device *dev, * Figure out what fence to wait for: */ for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) { - if ((new_plane_state->fb != old_plane_state->fb) && new_plane_state->fb) { + if (new_plane_state->fb) { struct drm_gem_object *obj = msm_framebuffer_bo(new_plane_state->fb, 0); struct msm_gem_object *msm_obj = to_msm_bo(obj); struct dma_fence *fence = reservation_object_get_excl_rcu(msm_obj->resv);
Again same justification as for drm_gem_fb_prepare_fb(). Definitely needs some testing because Rob doesn't remember why he did this, and Google/git.fd.o or anything also doesn't shed some light on it. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Rob Clark <robdclark@gmail.com> Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org --- drivers/gpu/drm/msm/msm_atomic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)