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

Commit 31e980c5 authored by Mark Yao's avatar Mark Yao
Browse files

drm/rockchip: vop use is_enabled instead of dpms mode 



drm dpms have many power modes: ON,OFF,SUSPEND,STANDBY, etc.
but vop only have enable/disable mode, maybe case such bug:
 --> DRM_DPMS_ON: power on vop
 --> DRM_DPMS_SUSPEND: power off vop
 --> DRM_DPMS_OFF: already power off at SUSPEND, crash
so use a bool val is more suitable.

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

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+18 −16
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ struct vop { 
	struct drm_crtc crtc;

	struct drm_crtc crtc;

	struct device *dev;

	struct device *dev;

	struct drm_device *drm_dev;

	struct drm_device *drm_dev;

	unsigned int dpms;

	bool is_enabled;





	int connector_type;

	int connector_type;

	int connector_out_mode;

	int connector_out_mode;
@@ -387,6 +387,9 @@ static void vop_enable(struct drm_crtc *crtc) 
	struct vop *vop = to_vop(crtc);

	struct vop *vop = to_vop(crtc);

	int ret;

	int ret;





	if (vop->is_enabled)

		return;



	ret = clk_enable(vop->hclk);

	ret = clk_enable(vop->hclk);

	if (ret < 0) {

	if (ret < 0) {

		dev_err(vop->dev, "failed to enable hclk - %d\n", ret);

		dev_err(vop->dev, "failed to enable hclk - %d\n", ret);
@@ -427,6 +430,8 @@ static void vop_enable(struct drm_crtc *crtc) 




	drm_vblank_on(vop->drm_dev, vop->pipe);

	drm_vblank_on(vop->drm_dev, vop->pipe);





	vop->is_enabled = true;



	return;

	return;





err_disable_aclk:

err_disable_aclk:
@@ -441,6 +446,9 @@ static void vop_disable(struct drm_crtc *crtc) 
{

{

	struct vop *vop = to_vop(crtc);

	struct vop *vop = to_vop(crtc);





	if (!vop->is_enabled)

		return;



	drm_vblank_off(crtc->dev, vop->pipe);

	drm_vblank_off(crtc->dev, vop->pipe);





	disable_irq(vop->irq);

	disable_irq(vop->irq);
@@ -463,6 +471,8 @@ static void vop_disable(struct drm_crtc *crtc) 




	clk_disable(vop->aclk);

	clk_disable(vop->aclk);

	clk_disable(vop->hclk);

	clk_disable(vop->hclk);



	vop->is_enabled = false;

}

}





/*

/*
@@ -742,7 +752,7 @@ static int vop_crtc_enable_vblank(struct drm_crtc *crtc) 
	struct vop *vop = to_vop(crtc);

	struct vop *vop = to_vop(crtc);

	unsigned long flags;

	unsigned long flags;





	if (vop->dpms != DRM_MODE_DPMS_ON)

	if (!vop->is_enabled)

		return -EPERM;

		return -EPERM;





	spin_lock_irqsave(&vop->irq_lock, flags);

	spin_lock_irqsave(&vop->irq_lock, flags);
@@ -759,8 +769,9 @@ static void vop_crtc_disable_vblank(struct drm_crtc *crtc) 
	struct vop *vop = to_vop(crtc);

	struct vop *vop = to_vop(crtc);

	unsigned long flags;

	unsigned long flags;





	if (vop->dpms != DRM_MODE_DPMS_ON)

	if (!vop->is_enabled)

		return;

		return;



	spin_lock_irqsave(&vop->irq_lock, flags);

	spin_lock_irqsave(&vop->irq_lock, flags);

	vop_mask_write(vop, INTR_CTRL0, FS_INTR_MASK, FS_INTR_EN(0));

	vop_mask_write(vop, INTR_CTRL0, FS_INTR_MASK, FS_INTR_EN(0));

	spin_unlock_irqrestore(&vop->irq_lock, flags);

	spin_unlock_irqrestore(&vop->irq_lock, flags);
@@ -773,15 +784,8 @@ static const struct rockchip_crtc_funcs private_crtc_funcs = { 




static void vop_crtc_dpms(struct drm_crtc *crtc, int mode)

static void vop_crtc_dpms(struct drm_crtc *crtc, int mode)

{

{

	struct vop *vop = to_vop(crtc);



	DRM_DEBUG_KMS("crtc[%d] mode[%d]\n", crtc->base.id, mode);

	DRM_DEBUG_KMS("crtc[%d] mode[%d]\n", crtc->base.id, mode);





	if (vop->dpms == mode) {

		DRM_DEBUG_KMS("desired dpms mode is same as previous one.\n");

		return;

	}



	switch (mode) {

	switch (mode) {

	case DRM_MODE_DPMS_ON:

	case DRM_MODE_DPMS_ON:

		vop_enable(crtc);

		vop_enable(crtc);
@@ -795,8 +799,6 @@ static void vop_crtc_dpms(struct drm_crtc *crtc, int mode) 
		DRM_DEBUG_KMS("unspecified mode %d\n", mode);

		DRM_DEBUG_KMS("unspecified mode %d\n", mode);

		break;

		break;

	}

	}



	vop->dpms = mode;

}

}





static void vop_crtc_prepare(struct drm_crtc *crtc)

static void vop_crtc_prepare(struct drm_crtc *crtc)
@@ -934,9 +936,9 @@ static int vop_crtc_page_flip(struct drm_crtc *crtc, 
	struct drm_framebuffer *old_fb = crtc->primary->fb;

	struct drm_framebuffer *old_fb = crtc->primary->fb;

	int ret;

	int ret;





	/* when the page flip is requested, crtc's dpms should be on */

	/* when the page flip is requested, crtc should be on */

	if (vop->dpms > DRM_MODE_DPMS_ON) {

	if (!vop->is_enabled) {

		DRM_DEBUG("failed page flip request at dpms[%d].\n", vop->dpms);

		DRM_DEBUG("page flip request rejected because crtc is off.\n");

		return 0;

		return 0;

	}

	}
@@ -1302,7 +1304,7 @@ static int vop_initial(struct vop *vop) 




	clk_disable(vop->hclk);

	clk_disable(vop->hclk);





	vop->dpms = DRM_MODE_DPMS_OFF;

	vop->is_enabled = false;





	return 0;

	return 0;