7c11b99a8e
The current atomic helpers have either their object state being passed as
an argument or the full atomic state.
The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.
Let's convert all the remaining helpers to provide a consistent
interface, starting with the planes atomic_check.
The conversion was done using the coccinelle script below plus some
manual changes for vmwgfx, built tested on all the drivers.
@@
identifier plane, plane_state;
symbol state;
@@
struct drm_plane_helper_funcs {
...
int (*atomic_check)(struct drm_plane *plane,
- struct drm_plane_state *plane_state);
+ struct drm_atomic_state *state);
...
}
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_check = func,
...,
};
@@
struct drm_plane_helper_funcs *FUNCS;
identifier f;
identifier dev;
identifier plane, plane_state, state;
@@
f(struct drm_device *dev, struct drm_atomic_state *state)
{
<+...
- FUNCS->atomic_check(plane, plane_state)
+ FUNCS->atomic_check(plane, state)
...+>
}
@ ignores_new_state @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *new_plane_state)
{
... when != new_plane_state
}
@ adds_new_state depends on plane_atomic_func && !ignores_new_state @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *new_plane_state)
{
+ struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane);
...
}
@ depends on plane_atomic_func @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *new_plane_state
+ struct drm_atomic_state *state
)
{ ... }
@ include depends on adds_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_new_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-4-maxime@cerno.tech
39 lines
1.3 KiB
C
39 lines
1.3 KiB
C
#ifndef ARMADA_PLANE_H
|
|
#define ARMADA_PLANE_H
|
|
|
|
struct armada_plane_state {
|
|
struct drm_plane_state base;
|
|
u32 src_hw;
|
|
u32 dst_yx;
|
|
u32 dst_hw;
|
|
u32 addrs[2][3];
|
|
u16 pitches[3];
|
|
bool interlace;
|
|
};
|
|
|
|
#define to_armada_plane_state(st) \
|
|
container_of(st, struct armada_plane_state, base)
|
|
#define armada_src_hw(state) to_armada_plane_state(state)->src_hw
|
|
#define armada_dst_yx(state) to_armada_plane_state(state)->dst_yx
|
|
#define armada_dst_hw(state) to_armada_plane_state(state)->dst_hw
|
|
#define armada_addr(state, f, p) to_armada_plane_state(state)->addrs[f][p]
|
|
#define armada_pitch(state, n) to_armada_plane_state(state)->pitches[n]
|
|
|
|
void armada_drm_plane_calc(struct drm_plane_state *state, u32 addrs[2][3],
|
|
u16 pitches[3], bool interlaced);
|
|
int armada_drm_plane_prepare_fb(struct drm_plane *plane,
|
|
struct drm_plane_state *state);
|
|
void armada_drm_plane_cleanup_fb(struct drm_plane *plane,
|
|
struct drm_plane_state *old_state);
|
|
int armada_drm_plane_atomic_check(struct drm_plane *plane,
|
|
struct drm_atomic_state *state);
|
|
void armada_plane_reset(struct drm_plane *plane);
|
|
struct drm_plane_state *armada_plane_duplicate_state(struct drm_plane *plane);
|
|
void armada_plane_destroy_state(struct drm_plane *plane,
|
|
struct drm_plane_state *state);
|
|
|
|
int armada_drm_primary_plane_init(struct drm_device *drm,
|
|
struct drm_plane *primary);
|
|
|
|
#endif
|