| Message ID | 1469549224-1860-7-git-send-email-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2016年07月27日 00:07, ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Replace the private drm_rects in vop_plane_state with > the ones now living in drm_plane_state. > > Cc: Yao <mark.yao@rock-chips.com> > Cc: linux-rockchip@lists.infradead.org > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Good cleanup, Acked-by: Mark Yao <mark.yao@rock-chips.com> > --- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 91305eb7d312..c566c740ab49 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -87,8 +87,6 @@ > struct vop_plane_state { > struct drm_plane_state base; > int format; > - struct drm_rect src; > - struct drm_rect dest; > dma_addr_t yrgb_mst; > bool enable; > }; > @@ -595,8 +593,8 @@ static int vop_plane_atomic_check(struct drm_plane *plane, > const struct vop_win_data *win = vop_win->data; > bool visible; > int ret; > - struct drm_rect *dest = &vop_plane_state->dest; > - struct drm_rect *src = &vop_plane_state->src; > + struct drm_rect *dest = &state->dst; > + struct drm_rect *src = &state->src; > struct drm_rect clip; > int min_scale = win->phy->scl ? FRAC_16_16(1, 8) : > DRM_PLANE_HELPER_NO_SCALING; > @@ -694,8 +692,8 @@ static void vop_plane_atomic_update(struct drm_plane *plane, > unsigned int actual_w, actual_h; > unsigned int dsp_stx, dsp_sty; > uint32_t act_info, dsp_info, dsp_st; > - struct drm_rect *src = &vop_plane_state->src; > - struct drm_rect *dest = &vop_plane_state->dest; > + struct drm_rect *src = &state->src; > + struct drm_rect *dest = &state->dst; > struct drm_gem_object *obj, *uv_obj; > struct rockchip_gem_object *rk_obj, *rk_uv_obj; > unsigned long offset;
On Tue, Jul 26, 2016 at 12:07 PM, <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Replace the private drm_rects in vop_plane_state with > the ones now living in drm_plane_state. > > Cc: Yao <mark.yao@rock-chips.com> > Cc: linux-rockchip@lists.infradead.org > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Sean Paul <seanpaul@chromium.org> > --- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 91305eb7d312..c566c740ab49 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -87,8 +87,6 @@ > struct vop_plane_state { > struct drm_plane_state base; > int format; > - struct drm_rect src; > - struct drm_rect dest; > dma_addr_t yrgb_mst; > bool enable; > }; > @@ -595,8 +593,8 @@ static int vop_plane_atomic_check(struct drm_plane *plane, > const struct vop_win_data *win = vop_win->data; > bool visible; > int ret; > - struct drm_rect *dest = &vop_plane_state->dest; > - struct drm_rect *src = &vop_plane_state->src; > + struct drm_rect *dest = &state->dst; > + struct drm_rect *src = &state->src; > struct drm_rect clip; > int min_scale = win->phy->scl ? FRAC_16_16(1, 8) : > DRM_PLANE_HELPER_NO_SCALING; > @@ -694,8 +692,8 @@ static void vop_plane_atomic_update(struct drm_plane *plane, > unsigned int actual_w, actual_h; > unsigned int dsp_stx, dsp_sty; > uint32_t act_info, dsp_info, dsp_st; > - struct drm_rect *src = &vop_plane_state->src; > - struct drm_rect *dest = &vop_plane_state->dest; > + struct drm_rect *src = &state->src; > + struct drm_rect *dest = &state->dst; > struct drm_gem_object *obj, *uv_obj; > struct rockchip_gem_object *rk_obj, *rk_uv_obj; > unsigned long offset; > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 91305eb7d312..c566c740ab49 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -87,8 +87,6 @@ struct vop_plane_state { struct drm_plane_state base; int format; - struct drm_rect src; - struct drm_rect dest; dma_addr_t yrgb_mst; bool enable; }; @@ -595,8 +593,8 @@ static int vop_plane_atomic_check(struct drm_plane *plane, const struct vop_win_data *win = vop_win->data; bool visible; int ret; - struct drm_rect *dest = &vop_plane_state->dest; - struct drm_rect *src = &vop_plane_state->src; + struct drm_rect *dest = &state->dst; + struct drm_rect *src = &state->src; struct drm_rect clip; int min_scale = win->phy->scl ? FRAC_16_16(1, 8) : DRM_PLANE_HELPER_NO_SCALING; @@ -694,8 +692,8 @@ static void vop_plane_atomic_update(struct drm_plane *plane, unsigned int actual_w, actual_h; unsigned int dsp_stx, dsp_sty; uint32_t act_info, dsp_info, dsp_st; - struct drm_rect *src = &vop_plane_state->src; - struct drm_rect *dest = &vop_plane_state->dest; + struct drm_rect *src = &state->src; + struct drm_rect *dest = &state->dst; struct drm_gem_object *obj, *uv_obj; struct rockchip_gem_object *rk_obj, *rk_uv_obj; unsigned long offset;