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

Commit d136dfee authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Dave Airlie
Browse files

drm: Pass in new and old plane state to prepare_fb and cleanup_fb 



Use cases like rotation require these hooks to have some context so they
know how to prepare and cleanup the frame buffer correctly.

For i915 specifically, object backing pages need to be mapped differently
for different rotation modes and the driver needs to know which mapping to
instantiate and which to tear down when transitioning between them.

v2: Made passed in states const. (Daniel Vetter)

[airlied: add mdp5 and atmel fixups]
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7547af91

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

+2 −1
Original line number Diff line number Diff line
@@ -712,7 +712,8 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p, 
}



static int atmel_hlcdc_plane_prepare_fb(struct drm_plane *p,

					struct drm_framebuffer *fb)

					struct drm_framebuffer *fb,

					const struct drm_plane_state *new_state)

{

	struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p);

drivers/gpu/drm/drm_atomic_helper.c

+8 −5
Original line number Diff line number Diff line
@@ -1116,6 +1116,7 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev, 
	for (i = 0; i < nplanes; i++) {

		struct drm_plane_helper_funcs *funcs;

		struct drm_plane *plane = state->planes[i];

		struct drm_plane_state *plane_state = state->plane_states[i];

		struct drm_framebuffer *fb;



		if (!plane)
@@ -1123,10 +1124,10 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev, 


		funcs = plane->helper_private;



		fb = state->plane_states[i]->fb;

		fb = plane_state->fb;



		if (fb && funcs->prepare_fb) {

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

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

			if (ret)

				goto fail;

		}
@@ -1138,6 +1139,7 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev, 
	for (i--; i >= 0; i--) {

		struct drm_plane_helper_funcs *funcs;

		struct drm_plane *plane = state->planes[i];

		struct drm_plane_state *plane_state = state->plane_states[i];

		struct drm_framebuffer *fb;



		if (!plane)
@@ -1148,7 +1150,7 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev, 
		fb = state->plane_states[i]->fb;



		if (fb && funcs->cleanup_fb)

			funcs->cleanup_fb(plane, fb);

			funcs->cleanup_fb(plane, fb, plane_state);



	}
@@ -1254,6 +1256,7 @@ void drm_atomic_helper_cleanup_planes(struct drm_device *dev, 
	for (i = 0; i < nplanes; i++) {

		struct drm_plane_helper_funcs *funcs;

		struct drm_plane *plane = old_state->planes[i];

		struct drm_plane_state *plane_state = old_state->plane_states[i];

		struct drm_framebuffer *old_fb;



		if (!plane)
@@ -1261,10 +1264,10 @@ void drm_atomic_helper_cleanup_planes(struct drm_device *dev, 


		funcs = plane->helper_private;



		old_fb = old_state->plane_states[i]->fb;

		old_fb = plane_state->fb;



		if (old_fb && funcs->cleanup_fb)

			funcs->cleanup_fb(plane, old_fb);

			funcs->cleanup_fb(plane, old_fb, plane_state);

	}

}

EXPORT_SYMBOL(drm_atomic_helper_cleanup_planes);

drivers/gpu/drm/drm_plane_helper.c

+3 −2
Original line number Diff line number Diff line
@@ -437,7 +437,8 @@ int drm_plane_helper_commit(struct drm_plane *plane, 


	if (plane_funcs->prepare_fb && plane_state->fb &&

	    plane_state->fb != old_fb) {

		ret = plane_funcs->prepare_fb(plane, plane_state->fb);

		ret = plane_funcs->prepare_fb(plane, plane_state->fb,

					      plane_state);

		if (ret)

			goto out;

	}
@@ -487,7 +488,7 @@ int drm_plane_helper_commit(struct drm_plane *plane, 
	}



	if (plane_funcs->cleanup_fb && old_fb)

		plane_funcs->cleanup_fb(plane, old_fb);

		plane_funcs->cleanup_fb(plane, old_fb, plane_state);

out:

	if (plane_state) {

		if (plane->funcs->atomic_destroy_state)

drivers/gpu/drm/i915/intel_display.c

+4 −2
Original line number Diff line number Diff line
@@ -11776,7 +11776,8 @@ static void intel_shared_dpll_init(struct drm_device *dev) 
 */

int

intel_prepare_plane_fb(struct drm_plane *plane,

		       struct drm_framebuffer *fb)

		       struct drm_framebuffer *fb,

		       const struct drm_plane_state *new_state)

{

	struct drm_device *dev = plane->dev;

	struct intel_plane *intel_plane = to_intel_plane(plane);
@@ -11830,7 +11831,8 @@ intel_prepare_plane_fb(struct drm_plane *plane, 
 */

void

intel_cleanup_plane_fb(struct drm_plane *plane,

		       struct drm_framebuffer *fb)

		       struct drm_framebuffer *fb,

		       const struct drm_plane_state *old_state)

{

	struct drm_device *dev = plane->dev;

	struct drm_i915_gem_object *obj = intel_fb_obj(fb);

drivers/gpu/drm/i915/intel_drv.h

+4 −2
Original line number Diff line number Diff line
@@ -943,9 +943,11 @@ void intel_finish_page_flip(struct drm_device *dev, int pipe); 
void intel_finish_page_flip_plane(struct drm_device *dev, int plane);

void intel_check_page_flip(struct drm_device *dev, int pipe);

int intel_prepare_plane_fb(struct drm_plane *plane,

			   struct drm_framebuffer *fb);

			   struct drm_framebuffer *fb,

			   const struct drm_plane_state *new_state);

void intel_cleanup_plane_fb(struct drm_plane *plane,

			    struct drm_framebuffer *fb);

			    struct drm_framebuffer *fb,

			    const struct drm_plane_state *old_state);

int intel_plane_atomic_get_property(struct drm_plane *plane,

				    const struct drm_plane_state *state,

				    struct drm_property *property,