Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d47a7246 authored by Tomasz Figa's avatar Tomasz Figa Committed by Sean Paul
Browse files

drm/rockchip: Kill vop_plane_state 



After changes introduced by last patches, there is no useful data stored
in vop_plane_state struct.  Let's remove it and make the driver use
generic plane state alone.

Signed-off-by: default avatarTomasz Figa <tfiga@chromium.org>
parent 41ee4367

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+15 −79
Original line number Diff line number Diff line
@@ -88,19 +88,11 @@ 


#define to_vop(x) container_of(x, struct vop, crtc)

#define to_vop_win(x) container_of(x, struct vop_win, base)

#define to_vop_plane_state(x) container_of(x, struct vop_plane_state, base)



enum vop_pending {

	VOP_PENDING_FB_UNREF,

};



struct vop_plane_state {

	struct drm_plane_state base;

	int format;

	dma_addr_t yrgb_mst;

	bool enable;

};



struct vop_win {

	struct drm_plane base;

	const struct vop_win_data *data;
@@ -647,7 +639,6 @@ static int vop_plane_atomic_check(struct drm_plane *plane, 
	struct drm_crtc_state *crtc_state;

	struct drm_framebuffer *fb = state->fb;

	struct vop_win *vop_win = to_vop_win(plane);

	struct vop_plane_state *vop_plane_state = to_vop_plane_state(state);

	const struct vop_win_data *win = vop_win->data;

	int ret;

	struct drm_rect clip;
@@ -657,7 +648,7 @@ static int vop_plane_atomic_check(struct drm_plane *plane, 
					DRM_PLANE_HELPER_NO_SCALING;



	if (!crtc || !fb)

		goto out_disable;

		return 0;



	crtc_state = drm_atomic_get_existing_crtc_state(state->state, crtc);

	if (WARN_ON(!crtc_state))
@@ -675,11 +666,11 @@ static int vop_plane_atomic_check(struct drm_plane *plane, 
		return ret;



	if (!state->visible)

		goto out_disable;

		return 0;



	vop_plane_state->format = vop_convert_format(fb->pixel_format);

	if (vop_plane_state->format < 0)

		return vop_plane_state->format;

	ret = vop_convert_format(fb->pixel_format);

	if (ret < 0)

		return ret;



	/*

	 * Src.x1 can be odd when do clip, but yuv plane start point
@@ -688,19 +679,12 @@ static int vop_plane_atomic_check(struct drm_plane *plane, 
	if (is_yuv_support(fb->pixel_format) && ((state->src.x1 >> 16) % 2))

		return -EINVAL;



	vop_plane_state->enable = true;



	return 0;



out_disable:

	vop_plane_state->enable = false;

	return 0;

}



static void vop_plane_atomic_disable(struct drm_plane *plane,

				     struct drm_plane_state *old_state)

{

	struct vop_plane_state *vop_plane_state = to_vop_plane_state(old_state);

	struct vop_win *vop_win = to_vop_win(plane);

	const struct vop_win_data *win = vop_win->data;

	struct vop *vop = to_vop(old_state->crtc);
@@ -713,8 +697,6 @@ static void vop_plane_atomic_disable(struct drm_plane *plane, 
	VOP_WIN_SET(vop, win, enable, 0);



	spin_unlock(&vop->reg_lock);



	vop_plane_state->enable = false;

}



static void vop_plane_atomic_update(struct drm_plane *plane,
@@ -723,7 +705,6 @@ static void vop_plane_atomic_update(struct drm_plane *plane, 
	struct drm_plane_state *state = plane->state;

	struct drm_crtc *crtc = state->crtc;

	struct vop_win *vop_win = to_vop_win(plane);

	struct vop_plane_state *vop_plane_state = to_vop_plane_state(state);

	const struct vop_win_data *win = vop_win->data;

	struct vop *vop = to_vop(state->crtc);

	struct drm_framebuffer *fb = state->fb;
@@ -738,6 +719,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane, 
	dma_addr_t dma_addr;

	uint32_t val;

	bool rb_swap;

	int format;



	/*

	 * can't update plane when vop is disabled.
@@ -748,7 +730,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane, 
	if (WARN_ON(!vop->is_enabled))

		return;



	if (!vop_plane_state->enable) {

	if (!state->visible) {

		vop_plane_atomic_disable(plane, old_state);

		return;

	}
@@ -769,13 +751,15 @@ static void vop_plane_atomic_update(struct drm_plane *plane, 


	offset = (src->x1 >> 16) * drm_format_plane_cpp(fb->pixel_format, 0);

	offset += (src->y1 >> 16) * fb->pitches[0];

	vop_plane_state->yrgb_mst = rk_obj->dma_addr + offset + fb->offsets[0];

	dma_addr = rk_obj->dma_addr + offset + fb->offsets[0];



	format = vop_convert_format(fb->pixel_format);



	spin_lock(&vop->reg_lock);



	VOP_WIN_SET(vop, win, format, vop_plane_state->format);

	VOP_WIN_SET(vop, win, format, format);

	VOP_WIN_SET(vop, win, yrgb_vir, fb->pitches[0] >> 2);

	VOP_WIN_SET(vop, win, yrgb_mst, vop_plane_state->yrgb_mst);

	VOP_WIN_SET(vop, win, yrgb_mst, dma_addr);

	if (is_yuv_support(fb->pixel_format)) {

		int hsub = drm_format_horz_chroma_subsampling(fb->pixel_format);

		int vsub = drm_format_vert_chroma_subsampling(fb->pixel_format);
@@ -827,61 +811,13 @@ static const struct drm_plane_helper_funcs plane_helper_funcs = { 
	.atomic_disable = vop_plane_atomic_disable,

};



static void vop_atomic_plane_reset(struct drm_plane *plane)

{

	struct vop_plane_state *vop_plane_state =

					to_vop_plane_state(plane->state);



	if (plane->state && plane->state->fb)

		drm_framebuffer_unreference(plane->state->fb);



	kfree(vop_plane_state);

	vop_plane_state = kzalloc(sizeof(*vop_plane_state), GFP_KERNEL);

	if (!vop_plane_state)

		return;



	plane->state = &vop_plane_state->base;

	plane->state->plane = plane;

}



static struct drm_plane_state *

vop_atomic_plane_duplicate_state(struct drm_plane *plane)

{

	struct vop_plane_state *old_vop_plane_state;

	struct vop_plane_state *vop_plane_state;



	if (WARN_ON(!plane->state))

		return NULL;



	old_vop_plane_state = to_vop_plane_state(plane->state);

	vop_plane_state = kmemdup(old_vop_plane_state,

				  sizeof(*vop_plane_state), GFP_KERNEL);

	if (!vop_plane_state)

		return NULL;



	__drm_atomic_helper_plane_duplicate_state(plane,

						  &vop_plane_state->base);



	return &vop_plane_state->base;

}



static void vop_atomic_plane_destroy_state(struct drm_plane *plane,

					   struct drm_plane_state *state)

{

	struct vop_plane_state *vop_state = to_vop_plane_state(state);



	__drm_atomic_helper_plane_destroy_state(state);



	kfree(vop_state);

}



static const struct drm_plane_funcs vop_plane_funcs = {

	.update_plane	= drm_atomic_helper_update_plane,

	.disable_plane	= drm_atomic_helper_disable_plane,

	.destroy = vop_plane_destroy,

	.reset = vop_atomic_plane_reset,

	.atomic_duplicate_state = vop_atomic_plane_duplicate_state,

	.atomic_destroy_state = vop_atomic_plane_destroy_state,

	.reset = drm_atomic_helper_plane_reset,

	.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,

};



static int vop_crtc_enable_vblank(struct drm_crtc *crtc)