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

Commit 05c960e7 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/rockchip: Disarm vop->is_enabled 



With atomic helpers there's no need to track the enabled state of a pipe
any more, because atomic helpers track this accurately already.

Just disable the early returns, since the debug checks might be useful.

v2: Don't call drm_helper_disable_unused_functions, it blows up
without this check. At least explains why rockchip still needed this
old legacy-style state tracing - to work around issues from calling
other legacy style functions!

Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Mark yao <mark.yao@rock-chips.com>
Tested-by: default avatarTomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: default avatarTomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465388359-8070-18-git-send-email-daniel.vetter@ffwll.ch
parent 2bd6cc8c

drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c

+0 −3
Original line number Diff line number Diff line
@@ -156,9 +156,6 @@ int rockchip_drm_fbdev_init(struct drm_device *dev) 
		goto err_drm_fb_helper_fini;

	}



	/* disable all the possible outputs/crtcs before entering KMS mode */

	drm_helper_disable_unused_functions(dev);



	ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP);

	if (ret < 0) {

		dev_err(dev->dev, "Failed to set initial hw config - %d.\n",

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+0 −6
Original line number Diff line number Diff line
@@ -431,9 +431,6 @@ static void vop_enable(struct drm_crtc *crtc) 
	struct vop *vop = to_vop(crtc);

	int ret;



	if (vop->is_enabled)

		return;



	ret = pm_runtime_get_sync(vop->dev);

	if (ret < 0) {

		dev_err(vop->dev, "failed to get pm runtime: %d\n", ret);
@@ -501,9 +498,6 @@ static void vop_crtc_disable(struct drm_crtc *crtc) 
	struct vop *vop = to_vop(crtc);

	int i;



	if (!vop->is_enabled)

		return;



	/*

	 * We need to make sure that all windows are disabled before we

	 * disable that crtc. Otherwise we might try to scan from a destroyed