diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-05-27 16:09:25 +0200 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-06-21 14:15:11 +0200 |
| commit | 1b7e38b92b0bbd363369f5160f13f4d26140972d (patch) | |
| tree | 5ba8b7ab83751ce74c0fa6d0e1359c92acbaae2b /drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | |
| parent | 58a2ab3af722550b2e4e8155eb08660e16c20ee6 (diff) | |
| download | op-kernel-dev-1b7e38b92b0bbd363369f5160f13f4d26140972d.zip op-kernel-dev-1b7e38b92b0bbd363369f5160f13f4d26140972d.tar.gz | |
drm: atmel-hlcdc: actually disable scaling when no scaling is required
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 <boris.brezillon@free-electrons.com>
Reported-by: Alex Vazquez <avazquez.dev@gmail.com>
Reviewed-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Fixes: 1a396789f65a ("drm: add Atmel HLCDC Display Controller support")
Cc: <stable@vger.kernel.org>
Diffstat (limited to 'drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c')
| -rw-r--r-- | drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c index aef3ca8..016c191 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c @@ -339,6 +339,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); } } |
