Commit b220176f authored by Dave Stevenson's avatar Dave Stevenson Committed by popcornmix
Browse files

drm/vc4: In FKMS look at the modifiers correctly for SAND 



Incorrect masking was used in the switch for the modifier,
therefore for SAND (which puts the column pitch in the
modifier) it didn't match.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
parent 34c5488a

drivers/gpu/drm/vc4/vc4_firmware_kms.c

+4 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static void vc4_plane_atomic_update(struct drm_plane *plane, 
	}

	mb->plane.planes[3] = 0;



	switch (fb->modifier) {

	switch (fourcc_mod_broadcom_mod(fb->modifier)) {

	case DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED:

		switch (mb->plane.vc_image_type) {

		case VC_IMAGE_XRGB8888:
@@ -476,6 +476,9 @@ static void vc4_plane_atomic_update(struct drm_plane *plane, 
		break;

	case DRM_FORMAT_MOD_BROADCOM_SAND128:

		mb->plane.vc_image_type = VC_IMAGE_YUV_UV;

		/* Note that the column pitch is passed across in lines, not

		 * bytes.

		 */

		mb->plane.pitch = fourcc_mod_broadcom_param(fb->modifier);

		break;

	}