mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
977697e20b
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 the remaining helpers to provide a consistent interface,
this time with the planes atomic_update and atomic_disable.
The conversion was done using the coccinelle script below, built tested on
all the drivers.
@@
identifier plane, plane_state;
symbol state;
@@
struct drm_plane_helper_funcs {
...
void (*atomic_update)(struct drm_plane *plane,
- struct drm_plane_state *plane_state);
+ struct drm_atomic_state *state);
...
}
@@
identifier plane, plane_state;
symbol state;
@@
struct drm_plane_helper_funcs {
...
void (*atomic_disable)(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_update = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
)
@@
struct drm_plane_helper_funcs *FUNCS;
identifier f;
identifier crtc_state;
identifier plane, plane_state, state;
expression e;
@@
f(struct drm_crtc_state *crtc_state)
{
...
struct drm_atomic_state *state = e;
<+...
(
- FUNCS->atomic_disable(plane, plane_state)
+ FUNCS->atomic_disable(plane, state)
|
- FUNCS->atomic_update(plane, plane_state)
+ FUNCS->atomic_update(plane, state)
)
...+>
}
@@
identifier plane_atomic_func.func;
identifier plane;
symbol state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *state)
+ struct drm_plane_state *old_plane_state)
{
<...
- state
+ old_plane_state
...>
}
@ ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, old_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
... when != old_state
}
@ adds_old_state depends on plane_atomic_func && !ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, plane_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *plane_state)
{
+ struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane);
...
}
@ depends on plane_atomic_func @
identifier plane_atomic_func.func;
identifier plane, plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *plane_state
+ struct drm_atomic_state *state
)
{ ... }
@ include depends on adds_old_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && adds_old_state @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
@@
identifier plane_atomic_func.func;
identifier plane, state;
identifier plane_state;
@@
func(struct drm_plane *plane, struct drm_atomic_state *state) {
...
struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane);
<+...
- plane_state->state
+ state
...+>
}
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-9-maxime@cerno.tech
121 lines
3.1 KiB
C
121 lines
3.1 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2015 Texas Instruments
|
|
* Author: Jyri Sarha <jsarha@ti.com>
|
|
*/
|
|
|
|
#include <drm/drm_atomic.h>
|
|
#include <drm/drm_plane_helper.h>
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_fourcc.h>
|
|
|
|
#include "tilcdc_drv.h"
|
|
|
|
static const struct drm_plane_funcs tilcdc_plane_funcs = {
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
.destroy = drm_plane_cleanup,
|
|
.reset = drm_atomic_helper_plane_reset,
|
|
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
|
|
};
|
|
|
|
static int tilcdc_plane_atomic_check(struct drm_plane *plane,
|
|
struct drm_atomic_state *state)
|
|
{
|
|
struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state,
|
|
plane);
|
|
struct drm_crtc_state *crtc_state;
|
|
struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,
|
|
plane);
|
|
unsigned int pitch;
|
|
|
|
if (!new_state->crtc)
|
|
return 0;
|
|
|
|
if (WARN_ON(!new_state->fb))
|
|
return -EINVAL;
|
|
|
|
if (new_state->crtc_x || new_state->crtc_y) {
|
|
dev_err(plane->dev->dev, "%s: crtc position must be zero.",
|
|
__func__);
|
|
return -EINVAL;
|
|
}
|
|
|
|
crtc_state = drm_atomic_get_existing_crtc_state(state,
|
|
new_state->crtc);
|
|
/* we should have a crtc state if the plane is attached to a crtc */
|
|
if (WARN_ON(!crtc_state))
|
|
return 0;
|
|
|
|
if (crtc_state->mode.hdisplay != new_state->crtc_w ||
|
|
crtc_state->mode.vdisplay != new_state->crtc_h) {
|
|
dev_err(plane->dev->dev,
|
|
"%s: Size must match mode (%dx%d == %dx%d)", __func__,
|
|
crtc_state->mode.hdisplay, crtc_state->mode.vdisplay,
|
|
new_state->crtc_w, new_state->crtc_h);
|
|
return -EINVAL;
|
|
}
|
|
|
|
pitch = crtc_state->mode.hdisplay *
|
|
new_state->fb->format->cpp[0];
|
|
if (new_state->fb->pitches[0] != pitch) {
|
|
dev_err(plane->dev->dev,
|
|
"Invalid pitch: fb and crtc widths must be the same");
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (old_state->fb && new_state->fb->format != old_state->fb->format) {
|
|
dev_dbg(plane->dev->dev,
|
|
"%s(): pixel format change requires mode_change\n",
|
|
__func__);
|
|
crtc_state->mode_changed = true;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void tilcdc_plane_atomic_update(struct drm_plane *plane,
|
|
struct drm_atomic_state *state)
|
|
{
|
|
struct drm_plane_state *new_state = plane->state;
|
|
|
|
if (!new_state->crtc)
|
|
return;
|
|
|
|
if (WARN_ON(!new_state->fb || !new_state->crtc->state))
|
|
return;
|
|
|
|
if (tilcdc_crtc_update_fb(new_state->crtc,
|
|
new_state->fb,
|
|
new_state->crtc->state->event) == 0) {
|
|
new_state->crtc->state->event = NULL;
|
|
}
|
|
}
|
|
|
|
static const struct drm_plane_helper_funcs plane_helper_funcs = {
|
|
.atomic_check = tilcdc_plane_atomic_check,
|
|
.atomic_update = tilcdc_plane_atomic_update,
|
|
};
|
|
|
|
int tilcdc_plane_init(struct drm_device *dev,
|
|
struct drm_plane *plane)
|
|
{
|
|
struct tilcdc_drm_private *priv = dev->dev_private;
|
|
int ret;
|
|
|
|
ret = drm_plane_init(dev, plane, 1,
|
|
&tilcdc_plane_funcs,
|
|
priv->pixelformats,
|
|
priv->num_pixelformats,
|
|
true);
|
|
if (ret) {
|
|
dev_err(dev->dev, "Failed to initialize plane: %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
drm_plane_helper_add(plane, &plane_helper_funcs);
|
|
|
|
return 0;
|
|
}
|