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

Commit 2d847d45 authored by Rodrigo Vivi's avatar Rodrigo Vivi Committed by Daniel Vetter
Browse files

drm/i915: Return the frontbuffer flip to enable intel_crtc_enable_planes. 



Without this frontbuffer flip when enabling planes PSR got compromised
and wasn't being enabled waiting forever on the flush that never
arrived.

Another solution would to create a enable_cursor function and split this
frontbuffer flip among the different plane enable and disable functions.
But if necessary this can be done in a follow up work. For now let's
just fix the regression.

It was removed by:

commit 87d4300a
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date:   Tue Apr 21 17:12:54 2015 +0300

    drm/i915: Move intel_(pre_disable/post_enable)_primary to intel_display.c, and use it there.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4373f0f2

drivers/gpu/drm/i915/intel_display.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -4828,11 +4828,22 @@ intel_pre_disable_primary(struct drm_crtc *crtc) 




static void intel_crtc_enable_planes(struct drm_crtc *crtc)

static void intel_crtc_enable_planes(struct drm_crtc *crtc)

{

{

	struct drm_device *dev = crtc->dev;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	int pipe = intel_crtc->pipe;



	intel_enable_primary_hw_plane(crtc->primary, crtc);

	intel_enable_primary_hw_plane(crtc->primary, crtc);

	intel_enable_sprite_planes(crtc);

	intel_enable_sprite_planes(crtc);

	intel_crtc_update_cursor(crtc, true);

	intel_crtc_update_cursor(crtc, true);





	intel_post_enable_primary(crtc);

	intel_post_enable_primary(crtc);



	/*

	 * FIXME: Once we grow proper nuclear flip support out of this we need

	 * to compute the mask of flip planes precisely. For the time being

	 * consider this a flip to a NULL plane.

	 */

	intel_frontbuffer_flip(dev, INTEL_FRONTBUFFER_ALL_MASK(pipe));

}

}





static void intel_crtc_disable_planes(struct drm_crtc *crtc)

static void intel_crtc_disable_planes(struct drm_crtc *crtc)