| Message ID | 1458045988-25246-1-git-send-email-a.hajda@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 15 Mar 2016 13:46:28 +0100 Andrzej Hajda <a.hajda@samsung.com> wrote: > DRM core provide helper to access crtc state. > > Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > --- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > index 1ffe9c3..d65dcae 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > @@ -558,7 +558,7 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p, > if (!state->base.crtc || !fb) > return 0; > > - crtc_state = s->state->crtc_states[drm_crtc_index(s->crtc)]; > + crtc_state = drm_atomic_get_existing_crtc_state(s->state, s->crtc); > mode = &crtc_state->adjusted_mode; > > state->src_x = s->src_x;
On Tue, Mar 15, 2016 at 01:50:09PM +0100, Boris Brezillon wrote: > On Tue, 15 Mar 2016 13:46:28 +0100 > Andrzej Hajda <a.hajda@samsung.com> wrote: > > > DRM core provide helper to access crtc state. > > > > Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> > > Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Want me to pull this in through drm-misc? -Daniel > > > --- > > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > > index 1ffe9c3..d65dcae 100644 > > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > > @@ -558,7 +558,7 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p, > > if (!state->base.crtc || !fb) > > return 0; > > > > - crtc_state = s->state->crtc_states[drm_crtc_index(s->crtc)]; > > + crtc_state = drm_atomic_get_existing_crtc_state(s->state, s->crtc); > > mode = &crtc_state->adjusted_mode; > > > > state->src_x = s->src_x; > > > > -- > Boris Brezillon, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Tue, 15 Mar 2016 14:07:46 +0100 Daniel Vetter <daniel@ffwll.ch> wrote: > On Tue, Mar 15, 2016 at 01:50:09PM +0100, Boris Brezillon wrote: > > On Tue, 15 Mar 2016 13:46:28 +0100 > > Andrzej Hajda <a.hajda@samsung.com> wrote: > > > > > DRM core provide helper to access crtc state. > > > > > > Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> > > > > Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > > Want me to pull this in through drm-misc? Yes please.
On Tue, Mar 15, 2016 at 02:08:05PM +0100, Boris Brezillon wrote: > On Tue, 15 Mar 2016 14:07:46 +0100 > Daniel Vetter <daniel@ffwll.ch> wrote: > > > On Tue, Mar 15, 2016 at 01:50:09PM +0100, Boris Brezillon wrote: > > > On Tue, 15 Mar 2016 13:46:28 +0100 > > > Andrzej Hajda <a.hajda@samsung.com> wrote: > > > > > > > DRM core provide helper to access crtc state. > > > > > > > > Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> > > > > > > Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > > > > Want me to pull this in through drm-misc? > > Yes please. Both patches from Andrzej applied to drm-misc. -Daniel
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c index 1ffe9c3..d65dcae 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c @@ -558,7 +558,7 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p, if (!state->base.crtc || !fb) return 0; - crtc_state = s->state->crtc_states[drm_crtc_index(s->crtc)]; + crtc_state = drm_atomic_get_existing_crtc_state(s->state, s->crtc); mode = &crtc_state->adjusted_mode; state->src_x = s->src_x;
DRM core provide helper to access crtc state. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)