Commit ac92028e authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Sean Paul

drm/rockchip: Use drm_plane_state.{src, dst}

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarMark Yao <mark.yao@rock-chips.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1469549224-1860-7-git-send-email-ville.syrjala@linux.intel.com
parent f8856a44
...@@ -87,8 +87,6 @@ ...@@ -87,8 +87,6 @@
struct vop_plane_state { struct vop_plane_state {
struct drm_plane_state base; struct drm_plane_state base;
int format; int format;
struct drm_rect src;
struct drm_rect dest;
dma_addr_t yrgb_mst; dma_addr_t yrgb_mst;
bool enable; bool enable;
}; };
...@@ -595,8 +593,8 @@ static int vop_plane_atomic_check(struct drm_plane *plane, ...@@ -595,8 +593,8 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
const struct vop_win_data *win = vop_win->data; const struct vop_win_data *win = vop_win->data;
bool visible; bool visible;
int ret; int ret;
struct drm_rect *dest = &vop_plane_state->dest; struct drm_rect *dest = &state->dst;
struct drm_rect *src = &vop_plane_state->src; struct drm_rect *src = &state->src;
struct drm_rect clip; struct drm_rect clip;
int min_scale = win->phy->scl ? FRAC_16_16(1, 8) : int min_scale = win->phy->scl ? FRAC_16_16(1, 8) :
DRM_PLANE_HELPER_NO_SCALING; DRM_PLANE_HELPER_NO_SCALING;
...@@ -694,8 +692,8 @@ static void vop_plane_atomic_update(struct drm_plane *plane, ...@@ -694,8 +692,8 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
unsigned int actual_w, actual_h; unsigned int actual_w, actual_h;
unsigned int dsp_stx, dsp_sty; unsigned int dsp_stx, dsp_sty;
uint32_t act_info, dsp_info, dsp_st; uint32_t act_info, dsp_info, dsp_st;
struct drm_rect *src = &vop_plane_state->src; struct drm_rect *src = &state->src;
struct drm_rect *dest = &vop_plane_state->dest; struct drm_rect *dest = &state->dst;
struct drm_gem_object *obj, *uv_obj; struct drm_gem_object *obj, *uv_obj;
struct rockchip_gem_object *rk_obj, *rk_uv_obj; struct rockchip_gem_object *rk_obj, *rk_uv_obj;
unsigned long offset; unsigned long offset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment