diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-05-27 16:09:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-27 09:47:35 -0700 |
| commit | c6a2cb3a3b2431f2f8ebbac9b8fcc75f24e2e814 (patch) | |
| tree | 5d9d205e5587f3ad1d5aaae157873f55bd0b43cb | |
| parent | f956468c5b6ca1e4a1048564706b06b8fc4a79b2 (diff) | |
| download | lwn-c6a2cb3a3b2431f2f8ebbac9b8fcc75f24e2e814.tar.gz lwn-c6a2cb3a3b2431f2f8ebbac9b8fcc75f24e2e814.zip | |
drm: atmel-hlcdc: actually disable scaling when no scaling is required
commit 1b7e38b92b0bbd363369f5160f13f4d26140972d upstream.
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")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 d0299aed517e..59d1269626b1 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); } } |