Skip to content

Commit 425da33

Browse files
vldlylumag
authored andcommitted
drm/msm/dpu: Disable scaling for unsupported scaler types
Scaling is not implemented for some type of scalers (QSEED2 and RGB) but it was unintentionally re-enabled with change below. The remaining condition in dpu_plane_atomic_check_pipe is not enough because it only checks for length of scaler block (which is present). This patch adds a additional check for setup_scaler operation. Fixes: 8f15005 ("drm/msm/dpu: move scaling limitations out of the hw_catalog") Signed-off-by: Vladimir Lypak <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/681918/ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent 23ab0d6 commit 425da33

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ static int dpu_plane_atomic_check_pipe(struct dpu_plane *pdpu,
740740
* We already have verified scaling against platform limitations.
741741
* Now check if the SSPP supports scaling at all.
742742
*/
743-
if (!sblk->scaler_blk.len &&
743+
if (!(sblk->scaler_blk.len && pipe->sspp->ops.setup_scaler) &&
744744
((drm_rect_width(&new_plane_state->src) >> 16 !=
745745
drm_rect_width(&new_plane_state->dst)) ||
746746
(drm_rect_height(&new_plane_state->src) >> 16 !=

0 commit comments

Comments
 (0)