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

Commit 63ebb9fa authored by Mark Yao's avatar Mark Yao
Browse files

drm/rockchip: Convert to support atomic API 



Rockchip vop not support hw vblank counter, needed check the committed
register if it's really take effect.

Signed-off-by: default avatarMark Yao <mark.yao@rock-chips.com>
parent 0ad3675d

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -213,6 +213,8 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags) 
	 */

	drm_dev->vblank_disable_allowed = true;



	drm_mode_config_reset(drm_dev);



	ret = rockchip_drm_fbdev_init(drm_dev);

	if (ret)

		goto err_vblank_cleanup;
@@ -276,7 +278,8 @@ const struct vm_operations_struct rockchip_drm_vm_ops = { 
};



static struct drm_driver rockchip_drm_driver = {

	.driver_features	= DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,

	.driver_features	= DRIVER_MODESET | DRIVER_GEM |

				  DRIVER_PRIME | DRIVER_ATOMIC,

	.load			= rockchip_drm_load,

	.unload			= rockchip_drm_unload,

	.lastclose		= rockchip_drm_lastclose,

drivers/gpu/drm/rockchip/rockchip_drm_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define _ROCKCHIP_DRM_DRV_H



#include <drm/drm_fb_helper.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_gem.h>



#include <linux/module.h>
@@ -38,6 +39,7 @@ struct drm_connector; 
struct rockchip_crtc_funcs {

	int (*enable_vblank)(struct drm_crtc *crtc);

	void (*disable_vblank)(struct drm_crtc *crtc);

	void (*wait_for_update)(struct drm_crtc *crtc);

};



/*
@@ -63,5 +65,4 @@ int rockchip_drm_dma_attach_device(struct drm_device *drm_dev, 
				   struct device *dev);

void rockchip_drm_dma_detach_device(struct drm_device *drm_dev,

				    struct device *dev);



#endif /* _ROCKCHIP_DRM_DRV_H_ */

drivers/gpu/drm/rockchip/rockchip_drm_fb.c

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

#include <drm/drm.h>

#include <drm/drmP.h>

#include <drm/drm_atomic.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_crtc_helper.h>
@@ -166,9 +167,103 @@ static void rockchip_drm_output_poll_changed(struct drm_device *dev) 
		drm_fb_helper_hotplug_event(fb_helper);

}



static void rockchip_crtc_wait_for_update(struct drm_crtc *crtc)

{

	struct rockchip_drm_private *priv = crtc->dev->dev_private;

	int pipe = drm_crtc_index(crtc);

	const struct rockchip_crtc_funcs *crtc_funcs = priv->crtc_funcs[pipe];



	if (crtc_funcs && crtc_funcs->wait_for_update)

		crtc_funcs->wait_for_update(crtc);

}



static void

rockchip_atomic_wait_for_complete(struct drm_atomic_state *old_state)

{

	struct drm_crtc_state *old_crtc_state;

	struct drm_crtc *crtc;

	int i, ret;



	for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) {

		/* No one cares about the old state, so abuse it for tracking

		 * and store whether we hold a vblank reference (and should do a

		 * vblank wait) in the ->enable boolean.

		 */

		old_crtc_state->enable = false;



		if (!crtc->state->active)

			continue;



		ret = drm_crtc_vblank_get(crtc);

		if (ret != 0)

			continue;



		old_crtc_state->enable = true;

	}



	for_each_crtc_in_state(old_state, crtc, old_crtc_state, i) {

		if (!old_crtc_state->enable)

			continue;



		rockchip_crtc_wait_for_update(crtc);

		drm_crtc_vblank_put(crtc);

	}

}



int rockchip_drm_atomic_commit(struct drm_device *dev,

			       struct drm_atomic_state *state,

			       bool async)

{

	int ret;



	if (async)

		return -EBUSY;



	ret = drm_atomic_helper_prepare_planes(dev, state);

	if (ret)

		return ret;



	drm_atomic_helper_swap_state(dev, state);



	/*

	 * TODO: do fence wait here.

	 */



	/*

	 * Rockchip crtc support runtime PM, can't update display planes

	 * when crtc is disabled.

	 *

	 * drm_atomic_helper_commit comments detail that:

	 *     For drivers supporting runtime PM the recommended sequence is

	 *

	 *     drm_atomic_helper_commit_modeset_disables(dev, state);

	 *

	 *     drm_atomic_helper_commit_modeset_enables(dev, state);

	 *

	 *     drm_atomic_helper_commit_planes(dev, state, true);

	 *

	 * See the kerneldoc entries for these three functions for more details.

	 */

	drm_atomic_helper_commit_modeset_disables(dev, state);



	drm_atomic_helper_commit_modeset_enables(dev, state);



	drm_atomic_helper_commit_planes(dev, state, true);



	rockchip_atomic_wait_for_complete(state);



	drm_atomic_helper_cleanup_planes(dev, state);



	drm_atomic_state_free(state);



	return 0;

}



static const struct drm_mode_config_funcs rockchip_drm_mode_config_funcs = {

	.fb_create = rockchip_user_fb_create,

	.output_poll_changed = rockchip_drm_output_poll_changed,

	.atomic_check = drm_atomic_helper_check,

	.atomic_commit = rockchip_drm_atomic_commit,

};



struct drm_framebuffer *

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+262 −395

File changed.

Preview size limit exceeded, changes collapsed.