drm/rockchip: vop: replace dpms with enable/disable (0ad3675d) · Commits · 戴 / test

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+4 −33

Original line number	Diff line number	Diff line
		@@ -632,7 +632,7 @@ static void vop_dsp_hold_valid_irq_disable(struct vop *vop)
		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);
		int ret;
		@@ -702,7 +702,7 @@ err_disable_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);

		@@ -1107,30 +1107,6 @@ static const struct rockchip_crtc_funcs private_crtc_funcs = {
		.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,
		const struct drm_display_mode *mode,
		struct drm_display_mode *adjusted_mode)
		@@ -1241,17 +1217,12 @@ out:
		return ret;
		}

		static void vop_crtc_commit(struct drm_crtc *crtc)
		{
		}

		static const struct drm_crtc_helper_funcs vop_crtc_helper_funcs = {
		.dpms = vop_crtc_dpms,
		.prepare = vop_crtc_prepare,
		.enable = vop_crtc_enable,
		.disable = vop_crtc_disable,
		.mode_fixup = vop_crtc_mode_fixup,
		.mode_set = vop_crtc_mode_set,
		.mode_set_base = vop_crtc_mode_set_base,
		.commit = vop_crtc_commit,
		};

		static int vop_crtc_page_flip(struct drm_crtc *crtc,

Admin message