Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 791d54fa authored by Alexandru Gheorghe's avatar Alexandru Gheorghe Committed by Liviu Dudau
Browse files

drm/malidp: Fix smart layer when doing pm_suspend/resume 



Smart layer enable rectangles is set to 1 when the driver is probed,
however when doing pm_suspend the value is lost and it's not set again
making the SMART_LAYER unusable, fix that by initializing the number
of rectangles everytime we do a plane update.

Signed-off-by: default avatarAlexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com>
Acked-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Signed-off-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
parent b1150781

drivers/gpu/drm/arm/malidp_planes.c

+8 −7
Original line number Diff line number Diff line
@@ -366,10 +366,17 @@ static void malidp_de_plane_update(struct drm_plane *plane, 
			LAYER_V_VAL(plane->state->crtc_y),

			mp->layer->base + MALIDP_LAYER_OFFSET);



	if (mp->layer->id == DE_SMART)

	if (mp->layer->id == DE_SMART) {

		/*

		 * Enable the first rectangle in the SMART layer to be

		 * able to use it as a drm plane.

		 */

		malidp_hw_write(mp->hwdev, 1,

				mp->layer->base + MALIDP550_LS_ENABLE);

		malidp_hw_write(mp->hwdev,

				LAYER_H_VAL(src_w) | LAYER_V_VAL(src_h),

				mp->layer->base + MALIDP550_LS_R1_IN_SIZE);

	}



	/* first clear the rotation bits */

	val = malidp_hw_read(mp->hwdev, mp->layer->base + MALIDP_LAYER_CONTROL);
@@ -484,12 +491,6 @@ int malidp_de_planes_init(struct drm_device *drm) 
		plane->layer = &map->layers[i];



		if (id == DE_SMART) {

			/*

			 * Enable the first rectangle in the SMART layer to be

			 * able to use it as a drm plane.

			 */

			malidp_hw_write(malidp->dev, 1,

					plane->layer->base + MALIDP550_LS_ENABLE);

			/* Skip the features which the SMART layer doesn't have. */

			continue;

		}