From 44ef7ed5ac94ac823c0efce4c2fb6ab809c8a838 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 20 Feb 2015 14:59:58 +0200 Subject: drm: rcar-du: Replace LVDS encoder DPMS by enable/disable The LVDS encoder doesn't support DPMS states, replace the DPMS operation by enable/disable to avoid propagating DPMS states down to the encoder code. Signed-off-by: Laurent Pinchart --- drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c') diff --git a/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c b/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c index 221f0a17fd6a..89a7c0ecc935 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c @@ -44,13 +44,15 @@ static void rcar_du_hdmienc_dpms(struct drm_encoder *encoder, int mode) return; if (mode == DRM_MODE_DPMS_ON && hdmienc->renc->lvds) - rcar_du_lvdsenc_dpms(hdmienc->renc->lvds, encoder->crtc, mode); + rcar_du_lvdsenc_enable(hdmienc->renc->lvds, encoder->crtc, + true); if (sfuncs->dpms) sfuncs->dpms(encoder, mode); if (mode != DRM_MODE_DPMS_ON && hdmienc->renc->lvds) - rcar_du_lvdsenc_dpms(hdmienc->renc->lvds, encoder->crtc, mode); + rcar_du_lvdsenc_enable(hdmienc->renc->lvds, encoder->crtc, + false); hdmienc->dpms = mode; } -- cgit