[added to the 4.1 stable tree] drm: atmel-hlcdc: actually disable scaling when no scaling is required
From: Sasha Levin <hidden>
Date: 2016-07-12 02:57:10
Subsystem:
drm drivers, drm drivers and misc gpu patches, drm drivers for atmel hlcdc, the rest · Maintainers:
David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Manikandan Muralidharan, Dharma Balasubiramani, Linus Torvalds
From: Boris Brezillon <redacted>
This patch has been added to the 4.1 stable tree. If you have any
objections, please let us know.
===============
[ Upstream commit 1b7e38b92b0bbd363369f5160f13f4d26140972d ]
The driver is only enabling scaling, but never disabling it, thus, if you
enable the scaling feature once it stays enabled forever.
Signed-off-by: Boris Brezillon <redacted>
Reported-by: Alex Vazquez <redacted>
Reviewed-by: Nicolas Ferre <redacted>
Fixes: 1a396789f65a ("drm: add Atmel HLCDC Display Controller support")
Cc: <redacted>
Signed-off-by: Sasha Levin <redacted>
---
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index be9fa82..767d0ea 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c@@ -335,6 +335,8 @@ atmel_hlcdc_plane_update_pos_and_size(struct atmel_hlcdc_plane *plane, atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff, factor_reg); + } else { + atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff, 0); } }
--
2.5.0