Commit 0ad3675d authored by Mark Yao's avatar Mark Yao

drm/rockchip: vop: replace dpms with enable/disable

For vop, power by enable/disable is more suitable then legacy dpms
function, and enable/disable more closely to the new atomic API.
Signed-off-by: default avatarMark Yao <mark.yao@rock-chips.com>
parent b5f7b755
...@@ -632,7 +632,7 @@ static void vop_dsp_hold_valid_irq_disable(struct vop *vop) ...@@ -632,7 +632,7 @@ static void vop_dsp_hold_valid_irq_disable(struct vop *vop)
spin_unlock_irqrestore(&vop->irq_lock, flags); spin_unlock_irqrestore(&vop->irq_lock, flags);
} }
static void vop_enable(struct drm_crtc *crtc) static void vop_crtc_enable(struct drm_crtc *crtc)
{ {
struct vop *vop = to_vop(crtc); struct vop *vop = to_vop(crtc);
int ret; int ret;
...@@ -702,7 +702,7 @@ static void vop_enable(struct drm_crtc *crtc) ...@@ -702,7 +702,7 @@ static void vop_enable(struct drm_crtc *crtc)
clk_disable(vop->hclk); clk_disable(vop->hclk);
} }
static void vop_disable(struct drm_crtc *crtc) static void vop_crtc_disable(struct drm_crtc *crtc)
{ {
struct vop *vop = to_vop(crtc); struct vop *vop = to_vop(crtc);
...@@ -1107,30 +1107,6 @@ static const struct rockchip_crtc_funcs private_crtc_funcs = { ...@@ -1107,30 +1107,6 @@ static const struct rockchip_crtc_funcs private_crtc_funcs = {
.disable_vblank = vop_crtc_disable_vblank, .disable_vblank = vop_crtc_disable_vblank,
}; };
static void vop_crtc_dpms(struct drm_crtc *crtc, int mode)
{
DRM_DEBUG_KMS("crtc[%d] mode[%d]\n", crtc->base.id, mode);
switch (mode) {
case DRM_MODE_DPMS_ON:
vop_enable(crtc);
break;
case DRM_MODE_DPMS_STANDBY:
case DRM_MODE_DPMS_SUSPEND:
case DRM_MODE_DPMS_OFF:
vop_disable(crtc);
break;
default:
DRM_DEBUG_KMS("unspecified mode %d\n", mode);
break;
}
}
static void vop_crtc_prepare(struct drm_crtc *crtc)
{
vop_crtc_dpms(crtc, DRM_MODE_DPMS_ON);
}
static bool vop_crtc_mode_fixup(struct drm_crtc *crtc, static bool vop_crtc_mode_fixup(struct drm_crtc *crtc,
const struct drm_display_mode *mode, const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode) struct drm_display_mode *adjusted_mode)
...@@ -1241,17 +1217,12 @@ static int vop_crtc_mode_set(struct drm_crtc *crtc, ...@@ -1241,17 +1217,12 @@ static int vop_crtc_mode_set(struct drm_crtc *crtc,
return ret; return ret;
} }
static void vop_crtc_commit(struct drm_crtc *crtc)
{
}
static const struct drm_crtc_helper_funcs vop_crtc_helper_funcs = { static const struct drm_crtc_helper_funcs vop_crtc_helper_funcs = {
.dpms = vop_crtc_dpms, .enable = vop_crtc_enable,
.prepare = vop_crtc_prepare, .disable = vop_crtc_disable,
.mode_fixup = vop_crtc_mode_fixup, .mode_fixup = vop_crtc_mode_fixup,
.mode_set = vop_crtc_mode_set, .mode_set = vop_crtc_mode_set,
.mode_set_base = vop_crtc_mode_set_base, .mode_set_base = vop_crtc_mode_set_base,
.commit = vop_crtc_commit,
}; };
static int vop_crtc_page_flip(struct drm_crtc *crtc, static int vop_crtc_page_flip(struct drm_crtc *crtc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment