Browse Source

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>
Boris Brezillon 9 years ago
parent
commit
1b7e38b92b
1 changed files with 2 additions and 0 deletions
  1. 2 0
      drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

+ 2 - 0
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,
 		atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff,
 					     factor_reg);
 					     factor_reg);
+	} else {
+		atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff, 0);
 	}
 	}
 }
 }