From: Sean Paul Date: Wed, 29 Oct 2014 19:33:35 +0000 (-0400) Subject: drm/tegra: DPMS off/on in encoder prepare/commit X-Git-Tag: v3.19-rc1~73^2~61^2~31 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0bfad396715a24e28d12d35f4a6ce87f65194609;p=karo-tx-linux.git drm/tegra: DPMS off/on in encoder prepare/commit Previously the panel and output were only enabled on encoder->dpms(). If userspace called dpms on before doing a modeset, the driver would get into a state where the connector had a dpms state of ON, but the encoder and output were not enabled (because the encoder is not yet attached to the connector). Subsequent dpms ON calls are ignored b/c the connector's state already matches the desired state. This patch enables/disables the panel and output on modeset as well, so we can catch the above case. Signed-off-by: Sean Paul Signed-off-by: Thierry Reding --- diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c index 6b393cfbb5e7..e6cfbde36f97 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -157,10 +157,12 @@ static bool tegra_encoder_mode_fixup(struct drm_encoder *encoder, static void tegra_encoder_prepare(struct drm_encoder *encoder) { + tegra_encoder_dpms(encoder, DRM_MODE_DPMS_OFF); } static void tegra_encoder_commit(struct drm_encoder *encoder) { + tegra_encoder_dpms(encoder, DRM_MODE_DPMS_ON); } static void tegra_encoder_mode_set(struct drm_encoder *encoder,