From: Laurent Pinchart Date: Wed, 25 Feb 2015 16:38:25 +0000 (+0200) Subject: drm: rcar-du: Fix hardware plane allocation X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3053460482af5f43d6967f34c8497a615969e604;p=linux-beck.git drm: rcar-du: Fix hardware plane allocation The hardware plane allocator loops over all planes to find free candidates. However, instead of looping over the number of hardware planes, it loops over the number of software planes, which happens to be larger by one unit. This has no effect in practise as the extra plane is always cleared in the mask of free planes, but it should still be fixed for correctness. Signed-off-by: Laurent Pinchart --- diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c index 242db1e1a1e4..4a0669fd8176 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c @@ -54,7 +54,7 @@ int rcar_du_plane_reserve(struct rcar_du_plane *plane, mutex_lock(&rgrp->planes.lock); - for (i = 0; i < ARRAY_SIZE(rgrp->planes.planes); ++i) { + for (i = 0; i < RCAR_DU_NUM_HW_PLANES; ++i) { if (!(rgrp->planes.free & (1 << i))) continue; @@ -63,7 +63,7 @@ int rcar_du_plane_reserve(struct rcar_du_plane *plane, break; } - if (i == ARRAY_SIZE(rgrp->planes.planes)) + if (i == RCAR_DU_NUM_HW_PLANES) goto done; rgrp->planes.free &= ~(1 << i);