Commit 15609559 authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra Committed by Heiko Stuebner
Browse files

drm/rockchip: update cursors asynchronously through atomic. 



Add support to async updates of cursors by using the new atomic
interface for that.

Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
[updated for upstream]
Signed-off-by: default avatarHelen Koike <helen.koike@collabora.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20181205123310.7965-1-helen.koike@collabora.com
parent 7510a9c6

drivers/gpu/drm/rockchip/rockchip_drm_fb.c

+0 −36
Original line number Diff line number Diff line
@@ -127,42 +127,6 @@ err_gem_object_unreference: 
	return ERR_PTR(ret);

}



static void

rockchip_drm_psr_inhibit_get_state(struct drm_atomic_state *state)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *crtc_state;

	struct drm_encoder *encoder;

	u32 encoder_mask = 0;

	int i;



	for_each_old_crtc_in_state(state, crtc, crtc_state, i) {

		encoder_mask |= crtc_state->encoder_mask;

		encoder_mask |= crtc->state->encoder_mask;

	}



	drm_for_each_encoder_mask(encoder, state->dev, encoder_mask)

		rockchip_drm_psr_inhibit_get(encoder);

}



static void

rockchip_drm_psr_inhibit_put_state(struct drm_atomic_state *state)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *crtc_state;

	struct drm_encoder *encoder;

	u32 encoder_mask = 0;

	int i;



	for_each_old_crtc_in_state(state, crtc, crtc_state, i) {

		encoder_mask |= crtc_state->encoder_mask;

		encoder_mask |= crtc->state->encoder_mask;

	}



	drm_for_each_encoder_mask(encoder, state->dev, encoder_mask)

		rockchip_drm_psr_inhibit_put(encoder);

}



static void

rockchip_atomic_helper_commit_tail_rpm(struct drm_atomic_state *old_state)

{

drivers/gpu/drm/rockchip/rockchip_drm_psr.c

+37 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 */



#include <drm/drmP.h>

#include <drm/drm_atomic.h>

#include <drm/drm_crtc_helper.h>



#include "rockchip_drm_drv.h"
@@ -109,6 +110,42 @@ int rockchip_drm_psr_inhibit_put(struct drm_encoder *encoder) 
}

EXPORT_SYMBOL(rockchip_drm_psr_inhibit_put);



void rockchip_drm_psr_inhibit_get_state(struct drm_atomic_state *state)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *crtc_state;

	struct drm_encoder *encoder;

	u32 encoder_mask = 0;

	int i;



	for_each_old_crtc_in_state(state, crtc, crtc_state, i) {

		encoder_mask |= crtc_state->encoder_mask;

		encoder_mask |= crtc->state->encoder_mask;

	}



	drm_for_each_encoder_mask(encoder, state->dev, encoder_mask)

		rockchip_drm_psr_inhibit_get(encoder);

}

EXPORT_SYMBOL(rockchip_drm_psr_inhibit_get_state);



void rockchip_drm_psr_inhibit_put_state(struct drm_atomic_state *state)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *crtc_state;

	struct drm_encoder *encoder;

	u32 encoder_mask = 0;

	int i;



	for_each_old_crtc_in_state(state, crtc, crtc_state, i) {

		encoder_mask |= crtc_state->encoder_mask;

		encoder_mask |= crtc->state->encoder_mask;

	}



	drm_for_each_encoder_mask(encoder, state->dev, encoder_mask)

		rockchip_drm_psr_inhibit_put(encoder);

}

EXPORT_SYMBOL(rockchip_drm_psr_inhibit_put_state);



/**

 * rockchip_drm_psr_inhibit_get - acquire PSR inhibit on given encoder

 * @encoder: encoder to obtain the PSR encoder

drivers/gpu/drm/rockchip/rockchip_drm_psr.h

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ void rockchip_drm_psr_flush_all(struct drm_device *dev); 
int rockchip_drm_psr_inhibit_put(struct drm_encoder *encoder);

int rockchip_drm_psr_inhibit_get(struct drm_encoder *encoder);



void rockchip_drm_psr_inhibit_get_state(struct drm_atomic_state *state);

void rockchip_drm_psr_inhibit_put_state(struct drm_atomic_state *state);



int rockchip_drm_psr_register(struct drm_encoder *encoder,

			int (*psr_set)(struct drm_encoder *, bool enable));

void rockchip_drm_psr_unregister(struct drm_encoder *encoder);

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+74 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <drm/drm.h>

#include <drm/drmP.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_uapi.h>

#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_flip_work.h>
@@ -820,10 +821,83 @@ static void vop_plane_atomic_update(struct drm_plane *plane, 
	spin_unlock(&vop->reg_lock);

}



static int vop_plane_atomic_async_check(struct drm_plane *plane,

					struct drm_plane_state *state)

{

	struct vop_win *vop_win = to_vop_win(plane);

	const struct vop_win_data *win = vop_win->data;

	int min_scale = win->phy->scl ? FRAC_16_16(1, 8) :

					DRM_PLANE_HELPER_NO_SCALING;

	int max_scale = win->phy->scl ? FRAC_16_16(8, 1) :

					DRM_PLANE_HELPER_NO_SCALING;

	struct drm_crtc_state *crtc_state;



	if (plane != state->crtc->cursor)

		return -EINVAL;



	if (!plane->state)

		return -EINVAL;



	if (!plane->state->fb)

		return -EINVAL;



	if (state->state)

		crtc_state = drm_atomic_get_existing_crtc_state(state->state,

								state->crtc);

	else /* Special case for asynchronous cursor updates. */

		crtc_state = plane->crtc->state;



	return drm_atomic_helper_check_plane_state(plane->state, crtc_state,

						   min_scale, max_scale,

						   true, true);

}



static void vop_plane_atomic_async_update(struct drm_plane *plane,

					  struct drm_plane_state *new_state)

{

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

	struct drm_plane_state *plane_state;



	plane_state = plane->funcs->atomic_duplicate_state(plane);

	plane_state->crtc_x = new_state->crtc_x;

	plane_state->crtc_y = new_state->crtc_y;

	plane_state->crtc_h = new_state->crtc_h;

	plane_state->crtc_w = new_state->crtc_w;

	plane_state->src_x = new_state->src_x;

	plane_state->src_y = new_state->src_y;

	plane_state->src_h = new_state->src_h;

	plane_state->src_w = new_state->src_w;



	if (plane_state->fb != new_state->fb)

		drm_atomic_set_fb_for_plane(plane_state, new_state->fb);



	swap(plane_state, plane->state);



	if (plane->state->fb && plane->state->fb != new_state->fb) {

		drm_framebuffer_get(plane->state->fb);

		WARN_ON(drm_crtc_vblank_get(plane->state->crtc) != 0);

		drm_flip_work_queue(&vop->fb_unref_work, plane->state->fb);

		set_bit(VOP_PENDING_FB_UNREF, &vop->pending);

	}



	if (vop->is_enabled) {

		rockchip_drm_psr_inhibit_get_state(new_state->state);

		vop_plane_atomic_update(plane, plane->state);

		spin_lock(&vop->reg_lock);

		vop_cfg_done(vop);

		spin_unlock(&vop->reg_lock);

		rockchip_drm_psr_inhibit_put_state(new_state->state);

	}



	plane->funcs->atomic_destroy_state(plane, plane_state);

}



static const struct drm_plane_helper_funcs plane_helper_funcs = {

	.atomic_check = vop_plane_atomic_check,

	.atomic_update = vop_plane_atomic_update,

	.atomic_disable = vop_plane_atomic_disable,

	.atomic_async_check = vop_plane_atomic_async_check,

	.atomic_async_update = vop_plane_atomic_async_update,

	.prepare_fb = drm_gem_fb_prepare_fb,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE