UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 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>
This commit is contained in:
Tvrtko Ursulin 2015-03-03 14:22:31 +00:00 committed by Dave Airlie
parent 7547af9186
commit d136dfeec8
9 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
View File

@ -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, 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); struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p);

13
drivers/gpu/drm/drm_atomic_helper.c
View File

@ -1116,6 +1116,7 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev,
for (i = 0; i < nplanes; i++) { for (i = 0; i < nplanes; i++) {
struct drm_plane_helper_funcs *funcs; struct drm_plane_helper_funcs *funcs;
struct drm_plane *plane = state->planes[i]; struct drm_plane *plane = state->planes[i];
struct drm_plane_state *plane_state = state->plane_states[i];
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
if (!plane) if (!plane)
@ -1123,10 +1124,10 @@ int drm_atomic_helper_prepare_planes(struct drm_device *dev,
funcs = plane->helper_private; funcs = plane->helper_private;
fb = state->plane_states[i]->fb; fb = plane_state->fb;
if (fb && funcs->prepare_fb) { if (fb && funcs->prepare_fb) {
ret = funcs->prepare_fb(plane, fb); ret = funcs->prepare_fb(plane, fb, plane_state);
if (ret) if (ret)
goto fail; goto fail;
} }
@ -1138,6 +1139,7 @@ fail:
for (i--; i >= 0; i--) { for (i--; i >= 0; i--) {
struct drm_plane_helper_funcs *funcs; struct drm_plane_helper_funcs *funcs;
struct drm_plane *plane = state->planes[i]; struct drm_plane *plane = state->planes[i];
struct drm_plane_state *plane_state = state->plane_states[i];
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
if (!plane) if (!plane)
@ -1148,7 +1150,7 @@ fail:
fb = state->plane_states[i]->fb; fb = state->plane_states[i]->fb;
if (fb && funcs->cleanup_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++) { for (i = 0; i < nplanes; i++) {
struct drm_plane_helper_funcs *funcs; struct drm_plane_helper_funcs *funcs;
struct drm_plane *plane = old_state->planes[i]; struct drm_plane *plane = old_state->planes[i];
struct drm_plane_state *plane_state = old_state->plane_states[i];
struct drm_framebuffer *old_fb; struct drm_framebuffer *old_fb;
if (!plane) if (!plane)
@ -1261,10 +1264,10 @@ void drm_atomic_helper_cleanup_planes(struct drm_device *dev,
funcs = plane->helper_private; funcs = plane->helper_private;
old_fb = old_state->plane_states[i]->fb; old_fb = plane_state->fb;
if (old_fb && funcs->cleanup_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); EXPORT_SYMBOL(drm_atomic_helper_cleanup_planes);

5
drivers/gpu/drm/drm_plane_helper.c
View File

@ -437,7 +437,8 @@ int drm_plane_helper_commit(struct drm_plane *plane,
if (plane_funcs->prepare_fb && plane_state->fb && if (plane_funcs->prepare_fb && plane_state->fb &&
plane_state->fb != old_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) if (ret)
goto out; goto out;
} }
@ -487,7 +488,7 @@ int drm_plane_helper_commit(struct drm_plane *plane,
} }
if (plane_funcs->cleanup_fb && old_fb) if (plane_funcs->cleanup_fb && old_fb)
plane_funcs->cleanup_fb(plane, old_fb); plane_funcs->cleanup_fb(plane, old_fb, plane_state);
out: out:
if (plane_state) { if (plane_state) {
if (plane->funcs->atomic_destroy_state) if (plane->funcs->atomic_destroy_state)

6
drivers/gpu/drm/i915/intel_display.c
View File

@ -11776,7 +11776,8 @@ static void intel_shared_dpll_init(struct drm_device *dev)
*/ */
int int
intel_prepare_plane_fb(struct drm_plane *plane, 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 drm_device *dev = plane->dev;
struct intel_plane *intel_plane = to_intel_plane(plane); struct intel_plane *intel_plane = to_intel_plane(plane);
@ -11830,7 +11831,8 @@ intel_prepare_plane_fb(struct drm_plane *plane,
*/ */
void void
intel_cleanup_plane_fb(struct drm_plane *plane, 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_device *dev = plane->dev;
struct drm_i915_gem_object *obj = intel_fb_obj(fb); struct drm_i915_gem_object *obj = intel_fb_obj(fb);

6
drivers/gpu/drm/i915/intel_drv.h
View File

@ -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_finish_page_flip_plane(struct drm_device *dev, int plane);
void intel_check_page_flip(struct drm_device *dev, int pipe); void intel_check_page_flip(struct drm_device *dev, int pipe);
int intel_prepare_plane_fb(struct drm_plane *plane, 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, 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, int intel_plane_atomic_get_property(struct drm_plane *plane,
const struct drm_plane_state *state, const struct drm_plane_state *state,
struct drm_property *property, struct drm_property *property,

6
drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c
View File

@ -83,7 +83,8 @@ static const struct drm_plane_funcs mdp4_plane_funcs = {
}; };
static int mdp4_plane_prepare_fb(struct drm_plane *plane, 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_plane *mdp4_plane = to_mdp4_plane(plane);
struct mdp4_kms *mdp4_kms = get_kms(plane); struct mdp4_kms *mdp4_kms = get_kms(plane);
@ -93,7 +94,8 @@ static int mdp4_plane_prepare_fb(struct drm_plane *plane,
} }
static void mdp4_plane_cleanup_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_plane *mdp4_plane = to_mdp4_plane(plane);
struct mdp4_kms *mdp4_kms = get_kms(plane); struct mdp4_kms *mdp4_kms = get_kms(plane);

6
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
View File

@ -156,7 +156,8 @@ static const struct drm_plane_funcs mdp5_plane_funcs = {
}; };
static int mdp5_plane_prepare_fb(struct drm_plane *plane, 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_plane *mdp5_plane = to_mdp5_plane(plane);
struct mdp5_kms *mdp5_kms = get_kms(plane); struct mdp5_kms *mdp5_kms = get_kms(plane);
@ -166,7 +167,8 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane,
} }
static void mdp5_plane_cleanup_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_plane *mdp5_plane = to_mdp5_plane(plane);
struct mdp5_kms *mdp5_kms = get_kms(plane); struct mdp5_kms *mdp5_kms = get_kms(plane);

6
drivers/gpu/drm/tegra/dc.c
View File

@ -472,13 +472,15 @@ static const struct drm_plane_funcs tegra_primary_plane_funcs = {
}; };
static int tegra_plane_prepare_fb(struct drm_plane *plane, 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; return 0;
} }
static void tegra_plane_cleanup_fb(struct drm_plane *plane, 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)
{ {
} }

6
include/drm/drm_plane_helper.h
View File

@ -59,9 +59,11 @@ extern int drm_crtc_init(struct drm_device *dev,
*/ */
struct drm_plane_helper_funcs { struct drm_plane_helper_funcs {
int (*prepare_fb)(struct drm_plane *plane, 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, 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, int (*atomic_check)(struct drm_plane *plane,
struct drm_plane_state *state); struct drm_plane_state *state);