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

Commit eeee74a4 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Jani Nikula
Browse files

drm/atomic: Unconditionally call prepare_fb. 



Atomic drivers may set properties like rotation on the same fb, which
may require a call to prepare_fb even when framebuffer stays identical.

Instead of handling all the special cases in the core, let the driver
decide when prepare_fb and cleanup_fb are noops.

This is a revert of:

commit fcc60b41
Author: Keith Packard <keithp@keithp.com>
Date:   Sat Jun 4 01:16:22 2016 -0700

    drm: Don't prepare or cleanup unchanging frame buffers [v3]

The original commit mentions that this prevents waiting in i915 on all
previous rendering during cursor updates, but there are better ways to
fix this.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/6d82f9b6-9d16-91d1-d176-4a37b09afc44@linux.intel.com


(cherry picked from commit 0532be07)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1485854491-27389-2-git-send-email-maarten.lankhorst@linux.intel.com
parent 566cf877

drivers/gpu/drm/drm_atomic_helper.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -1666,9 +1666,6 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev, 




		funcs = plane->helper_private;

		funcs = plane->helper_private;





		if (!drm_atomic_helper_framebuffer_changed(dev, state, plane_state->crtc))

			continue;



		if (funcs->prepare_fb) {

		if (funcs->prepare_fb) {

			ret = funcs->prepare_fb(plane, plane_state);

			ret = funcs->prepare_fb(plane, plane_state);

			if (ret)

			if (ret)
@@ -1685,9 +1682,6 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev, 
		if (j >= i)

		if (j >= i)

			continue;

			continue;





		if (!drm_atomic_helper_framebuffer_changed(dev, state, plane_state->crtc))

			continue;



		funcs = plane->helper_private;

		funcs = plane->helper_private;





		if (funcs->cleanup_fb)

		if (funcs->cleanup_fb)
@@ -1954,9 +1948,6 @@ void drm_atomic_helper_cleanup_planes(struct drm_device *dev, 
	for_each_plane_in_state(old_state, plane, plane_state, i) {

	for_each_plane_in_state(old_state, plane, plane_state, i) {

		const struct drm_plane_helper_funcs *funcs;

		const struct drm_plane_helper_funcs *funcs;





		if (!drm_atomic_helper_framebuffer_changed(dev, old_state, plane_state->crtc))

			continue;



		funcs = plane->helper_private;

		funcs = plane->helper_private;





		if (funcs->cleanup_fb)

		if (funcs->cleanup_fb)