| Message ID | 20190625204208.5614-3-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | gem_bo.resv prime unification, leftovers | expand |
On Tue, Jun 25, 2019 at 1:42 PM Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > msm has switched over to drm_fb->obj[] a while ago already, so we can > just use the helper. > > v2: Make it compile ... oops. > > Cc: Eric Anholt <eric@anholt.net> > Cc: Emil Velikov <emil.velikov@collabora.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Rob Clark <robdclark@gmail.com> > Cc: Sean Paul <sean@poorly.run> > Cc: Jeykumar Sankaran <jsanka@codeaurora.org> > Cc: Jordan Crouse <jcrouse@codeaurora.org> > Cc: Bruce Wang <bzwang@chromium.org> > Cc: Fritz Koenig <frkoenig@google.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: linux-arm-msm@vger.kernel.org > Cc: freedreno@lists.freedesktop.org with 1/7 this is: Reviewed-by: Rob Clark <robdclark@gmail.com> (and 1/7 is r-b w/ commit msg fixup) BR, -R > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 8 ++------ > drivers/gpu/drm/msm/msm_atomic.c | 8 ++------ > 2 files changed, 4 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > index 44a72da71482..cc08f4366bdd 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > @@ -11,6 +11,7 @@ > #include <linux/dma-buf.h> > > #include <drm/drm_atomic_uapi.h> > +#include <drm/drm_gem_framebuffer_helper.h> > > #include "msm_drv.h" > #include "dpu_kms.h" > @@ -763,8 +764,6 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane, > struct dpu_plane *pdpu = to_dpu_plane(plane); > struct dpu_plane_state *pstate = to_dpu_plane_state(new_state); > struct dpu_hw_fmt_layout layout; > - struct drm_gem_object *obj; > - struct dma_fence *fence; > struct dpu_kms *kms = _dpu_plane_get_kms(&pdpu->base); > int ret; > > @@ -781,10 +780,7 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane, > * we can use msm_atomic_prepare_fb() instead of doing the > * implicit fence and fb prepare by hand here. > */ > - obj = msm_framebuffer_bo(new_state->fb, 0); > - fence = reservation_object_get_excl_rcu(obj->resv); > - if (fence) > - drm_atomic_set_fence_for_plane(new_state, fence); > + drm_gem_fb_prepare_fb(plane, new_state); > > if (pstate->aspace) { > ret = msm_framebuffer_prepare(new_state->fb, > diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c > index dd16babdd8c0..169d5f915e68 100644 > --- a/drivers/gpu/drm/msm/msm_atomic.c > +++ b/drivers/gpu/drm/msm/msm_atomic.c > @@ -5,6 +5,7 @@ > */ > > #include <drm/drm_atomic_uapi.h> > +#include <drm/drm_gem_framebuffer_helper.h> > > #include "msm_drv.h" > #include "msm_gem.h" > @@ -37,16 +38,11 @@ int msm_atomic_prepare_fb(struct drm_plane *plane, > { > struct msm_drm_private *priv = plane->dev->dev_private; > struct msm_kms *kms = priv->kms; > - struct drm_gem_object *obj; > - struct dma_fence *fence; > > if (!new_state->fb) > return 0; > > - obj = msm_framebuffer_bo(new_state->fb, 0); > - fence = reservation_object_get_excl_rcu(obj->resv); > - > - drm_atomic_set_fence_for_plane(new_state, fence); > + drm_gem_fb_prepare_fb(plane, new_state); > > return msm_framebuffer_prepare(new_state->fb, kms->aspace); > } > -- > 2.20.1 >
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index 44a72da71482..cc08f4366bdd 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -11,6 +11,7 @@ #include <linux/dma-buf.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_gem_framebuffer_helper.h> #include "msm_drv.h" #include "dpu_kms.h" @@ -763,8 +764,6 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane, struct dpu_plane *pdpu = to_dpu_plane(plane); struct dpu_plane_state *pstate = to_dpu_plane_state(new_state); struct dpu_hw_fmt_layout layout; - struct drm_gem_object *obj; - struct dma_fence *fence; struct dpu_kms *kms = _dpu_plane_get_kms(&pdpu->base); int ret; @@ -781,10 +780,7 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane, * we can use msm_atomic_prepare_fb() instead of doing the * implicit fence and fb prepare by hand here. */ - obj = msm_framebuffer_bo(new_state->fb, 0); - fence = reservation_object_get_excl_rcu(obj->resv); - if (fence) - drm_atomic_set_fence_for_plane(new_state, fence); + drm_gem_fb_prepare_fb(plane, new_state); if (pstate->aspace) { ret = msm_framebuffer_prepare(new_state->fb, diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index dd16babdd8c0..169d5f915e68 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -5,6 +5,7 @@ */ #include <drm/drm_atomic_uapi.h> +#include <drm/drm_gem_framebuffer_helper.h> #include "msm_drv.h" #include "msm_gem.h" @@ -37,16 +38,11 @@ int msm_atomic_prepare_fb(struct drm_plane *plane, { struct msm_drm_private *priv = plane->dev->dev_private; struct msm_kms *kms = priv->kms; - struct drm_gem_object *obj; - struct dma_fence *fence; if (!new_state->fb) return 0; - obj = msm_framebuffer_bo(new_state->fb, 0); - fence = reservation_object_get_excl_rcu(obj->resv); - - drm_atomic_set_fence_for_plane(new_state, fence); + drm_gem_fb_prepare_fb(plane, new_state); return msm_framebuffer_prepare(new_state->fb, kms->aspace); }
msm has switched over to drm_fb->obj[] a while ago already, so we can just use the helper. v2: Make it compile ... oops. Cc: Eric Anholt <eric@anholt.net> Cc: Emil Velikov <emil.velikov@collabora.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Sean Paul <sean@poorly.run> Cc: Jeykumar Sankaran <jsanka@codeaurora.org> Cc: Jordan Crouse <jcrouse@codeaurora.org> Cc: Bruce Wang <bzwang@chromium.org> Cc: Fritz Koenig <frkoenig@google.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org --- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 8 ++------ drivers/gpu/drm/msm/msm_atomic.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-)