Skip to content

Commit

Permalink
drm: Pass in new and old plane state to prepare_fb and cleanup_fb
Browse files Browse the repository at this point in the history 
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: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Tvrtko Ursulin authored and Dave Airlie committed Mar 4, 2015
1 parent 7547af9 commit d136dfe
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 20 deletions.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
13 changes: 8 additions & 5 deletions drivers/gpu/drm/drm_atomic_helper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1116,17 +1116,18 @@ 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)
continue;

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;
}
Expand All @@ -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)
Expand All @@ -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);

}

Expand Down Expand Up @@ -1254,17 +1256,18 @@ 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)
continue;

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);
Expand Down
5 changes: 3 additions & 2 deletions drivers/gpu/drm/drm_plane_helper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions drivers/gpu/drm/i915/intel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 4 additions & 2 deletions drivers/gpu/drm/i915/intel_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 4 additions & 2 deletions drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ static const struct drm_plane_funcs mdp4_plane_funcs = {
};

static int mdp4_plane_prepare_fb(struct drm_plane *plane,
struct drm_framebuffer *fb)
struct drm_framebuffer *fb,
const struct drm_plane_state *new_state)
{
struct mdp4_plane *mdp4_plane = to_mdp4_plane(plane);
struct mdp4_kms *mdp4_kms = get_kms(plane);
Expand All @@ -93,7 +94,8 @@ static int mdp4_plane_prepare_fb(struct drm_plane *plane,
}

static void mdp4_plane_cleanup_fb(struct drm_plane *plane,
struct drm_framebuffer *fb)
struct drm_framebuffer *fb,
const struct drm_plane_state *old_state)
{
struct mdp4_plane *mdp4_plane = to_mdp4_plane(plane);
struct mdp4_kms *mdp4_kms = get_kms(plane);
Expand Down
6 changes: 4 additions & 2 deletions drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ static const struct drm_plane_funcs mdp5_plane_funcs = {
};

static int mdp5_plane_prepare_fb(struct drm_plane *plane,
struct drm_framebuffer *fb)
struct drm_framebuffer *fb,
const struct drm_plane_state *new_state)
{
struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane);
struct mdp5_kms *mdp5_kms = get_kms(plane);
Expand All @@ -166,7 +167,8 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane,
}

static void mdp5_plane_cleanup_fb(struct drm_plane *plane,
struct drm_framebuffer *fb)
struct drm_framebuffer *fb,
const struct drm_plane_state *old_state)
{
struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane);
struct mdp5_kms *mdp5_kms = get_kms(plane);
Expand Down
6 changes: 4 additions & 2 deletions drivers/gpu/drm/tegra/dc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,13 +472,15 @@ static const struct drm_plane_funcs tegra_primary_plane_funcs = {
};

static int tegra_plane_prepare_fb(struct drm_plane *plane,
struct drm_framebuffer *fb)
struct drm_framebuffer *fb,
const struct drm_plane_state *new_state)
{
return 0;
}

static void tegra_plane_cleanup_fb(struct drm_plane *plane,
struct drm_framebuffer *fb)
struct drm_framebuffer *fb,
const struct drm_plane_state *old_fb)
{
}

Expand Down
6 changes: 4 additions & 2 deletions include/drm/drm_plane_helper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,11 @@ extern int drm_crtc_init(struct drm_device *dev,
*/
struct drm_plane_helper_funcs {
int (*prepare_fb)(struct drm_plane *plane,
struct drm_framebuffer *fb);
struct drm_framebuffer *fb,
const struct drm_plane_state *new_state);
void (*cleanup_fb)(struct drm_plane *plane,
struct drm_framebuffer *fb);
struct drm_framebuffer *fb,
const struct drm_plane_state *old_state);

int (*atomic_check)(struct drm_plane *plane,
struct drm_plane_state *state);
Expand Down

0 comments on commit d136dfe

Please sign in to comment.