mirror of
https://github.com/torvalds/linux.git
synced 2026-05-31 10:33:41 +02:00
drm/simpledrm: Convert to atomic helpers
Replace the simple-KMS helpers with the regular atomic helpers. The
regular helpers are better architectured and therefore allow for easier
code sharing among drivers. No functional changes.
v3:
* remove empty CRTC helpers atomic_{enable, disable} (Javier)
* unconditionally run drm_atomic_helper_check_plane_state()
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220801135028.30647-6-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann
parent
fd9e3169e4
commit
de40c281fe
|
|
@ -8,6 +8,7 @@
|
|||
#include <linux/regulator/consumer.h>
|
||||
|
||||
#include <drm/drm_aperture.h>
|
||||
#include <drm/drm_atomic.h>
|
||||
#include <drm/drm_atomic_state_helper.h>
|
||||
#include <drm/drm_connector.h>
|
||||
#include <drm/drm_damage_helper.h>
|
||||
|
|
@ -20,8 +21,8 @@
|
|||
#include <drm/drm_gem_shmem_helper.h>
|
||||
#include <drm/drm_managed.h>
|
||||
#include <drm/drm_modeset_helper_vtables.h>
|
||||
#include <drm/drm_plane_helper.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
#include <drm/drm_simple_kms_helper.h>
|
||||
|
||||
#define DRIVER_NAME "simpledrm"
|
||||
#define DRIVER_DESC "DRM driver for simple-framebuffer platform devices"
|
||||
|
|
@ -221,8 +222,10 @@ struct simpledrm_device {
|
|||
/* modesetting */
|
||||
uint32_t formats[8];
|
||||
size_t nformats;
|
||||
struct drm_plane primary_plane;
|
||||
struct drm_crtc crtc;
|
||||
struct drm_encoder encoder;
|
||||
struct drm_connector connector;
|
||||
struct drm_simple_display_pipe pipe;
|
||||
};
|
||||
|
||||
static struct simpledrm_device *simpledrm_device_of_dev(struct drm_device *dev)
|
||||
|
|
@ -460,7 +463,7 @@ static int simpledrm_device_init_regulators(struct simpledrm_device *sdev)
|
|||
* TODO: Add blit helpers for remaining formats and uncomment
|
||||
* constants.
|
||||
*/
|
||||
static const uint32_t simpledrm_default_formats[] = {
|
||||
static const uint32_t simpledrm_primary_plane_formats[] = {
|
||||
DRM_FORMAT_XRGB8888,
|
||||
DRM_FORMAT_ARGB8888,
|
||||
DRM_FORMAT_RGB565,
|
||||
|
|
@ -471,11 +474,149 @@ static const uint32_t simpledrm_default_formats[] = {
|
|||
DRM_FORMAT_ARGB2101010,
|
||||
};
|
||||
|
||||
static const uint64_t simpledrm_format_modifiers[] = {
|
||||
static const uint64_t simpledrm_primary_plane_format_modifiers[] = {
|
||||
DRM_FORMAT_MOD_LINEAR,
|
||||
DRM_FORMAT_MOD_INVALID
|
||||
};
|
||||
|
||||
static int simpledrm_primary_plane_helper_atomic_check(struct drm_plane *plane,
|
||||
struct drm_atomic_state *new_state)
|
||||
{
|
||||
struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(new_state, plane);
|
||||
struct drm_crtc *new_crtc = new_plane_state->crtc;
|
||||
struct drm_crtc_state *new_crtc_state = NULL;
|
||||
int ret;
|
||||
|
||||
if (new_crtc)
|
||||
new_crtc_state = drm_atomic_get_new_crtc_state(new_state, new_crtc);
|
||||
|
||||
ret = drm_atomic_helper_check_plane_state(new_plane_state, new_crtc_state,
|
||||
DRM_PLANE_NO_SCALING,
|
||||
DRM_PLANE_NO_SCALING,
|
||||
false, false);
|
||||
if (ret)
|
||||
return ret;
|
||||
else if (!new_plane_state->visible)
|
||||
return 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void simpledrm_primary_plane_helper_atomic_update(struct drm_plane *plane,
|
||||
struct drm_atomic_state *old_state)
|
||||
{
|
||||
struct drm_plane_state *plane_state = plane->state;
|
||||
struct drm_plane_state *old_plane_state = drm_atomic_get_old_plane_state(old_state, plane);
|
||||
struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state);
|
||||
void *vmap = shadow_plane_state->data[0].vaddr; /* TODO: Use mapping abstraction */
|
||||
struct drm_framebuffer *fb = plane_state->fb;
|
||||
struct drm_device *dev = plane->dev;
|
||||
struct simpledrm_device *sdev = simpledrm_device_of_dev(dev);
|
||||
void __iomem *dst = sdev->screen_base;
|
||||
struct drm_rect src_clip, dst_clip;
|
||||
int idx;
|
||||
|
||||
if (!fb)
|
||||
return;
|
||||
|
||||
if (!drm_atomic_helper_damage_merged(old_plane_state, plane_state, &src_clip))
|
||||
return;
|
||||
|
||||
dst_clip = plane_state->dst;
|
||||
if (!drm_rect_intersect(&dst_clip, &src_clip))
|
||||
return;
|
||||
|
||||
if (!drm_dev_enter(dev, &idx))
|
||||
return;
|
||||
|
||||
dst += drm_fb_clip_offset(sdev->pitch, sdev->format, &dst_clip);
|
||||
drm_fb_blit_toio(dst, sdev->pitch, sdev->format->format, vmap, fb, &src_clip);
|
||||
|
||||
drm_dev_exit(idx);
|
||||
}
|
||||
|
||||
static void simpledrm_primary_plane_helper_atomic_disable(struct drm_plane *plane,
|
||||
struct drm_atomic_state *old_state)
|
||||
{
|
||||
struct drm_device *dev = plane->dev;
|
||||
struct simpledrm_device *sdev = simpledrm_device_of_dev(dev);
|
||||
int idx;
|
||||
|
||||
if (!drm_dev_enter(dev, &idx))
|
||||
return;
|
||||
|
||||
/* Clear screen to black if disabled */
|
||||
memset_io(sdev->screen_base, 0, sdev->pitch * sdev->mode.vdisplay);
|
||||
|
||||
drm_dev_exit(idx);
|
||||
}
|
||||
|
||||
static const struct drm_plane_helper_funcs simpledrm_primary_plane_helper_funcs = {
|
||||
DRM_GEM_SHADOW_PLANE_HELPER_FUNCS,
|
||||
.atomic_check = simpledrm_primary_plane_helper_atomic_check,
|
||||
.atomic_update = simpledrm_primary_plane_helper_atomic_update,
|
||||
.atomic_disable = simpledrm_primary_plane_helper_atomic_disable,
|
||||
};
|
||||
|
||||
static const struct drm_plane_funcs simpledrm_primary_plane_funcs = {
|
||||
.update_plane = drm_atomic_helper_update_plane,
|
||||
.disable_plane = drm_atomic_helper_disable_plane,
|
||||
.destroy = drm_plane_cleanup,
|
||||
DRM_GEM_SHADOW_PLANE_FUNCS,
|
||||
};
|
||||
|
||||
static enum drm_mode_status simpledrm_crtc_helper_mode_valid(struct drm_crtc *crtc,
|
||||
const struct drm_display_mode *mode)
|
||||
{
|
||||
struct simpledrm_device *sdev = simpledrm_device_of_dev(crtc->dev);
|
||||
|
||||
if (mode->hdisplay != sdev->mode.hdisplay &&
|
||||
mode->vdisplay != sdev->mode.vdisplay)
|
||||
return MODE_ONE_SIZE;
|
||||
else if (mode->hdisplay != sdev->mode.hdisplay)
|
||||
return MODE_ONE_WIDTH;
|
||||
else if (mode->vdisplay != sdev->mode.vdisplay)
|
||||
return MODE_ONE_HEIGHT;
|
||||
|
||||
return MODE_OK;
|
||||
}
|
||||
|
||||
static int simpledrm_crtc_helper_atomic_check(struct drm_crtc *crtc,
|
||||
struct drm_atomic_state *new_state)
|
||||
{
|
||||
struct drm_crtc_state *new_crtc_state = drm_atomic_get_new_crtc_state(new_state, crtc);
|
||||
int ret;
|
||||
|
||||
ret = drm_atomic_helper_check_crtc_state(new_crtc_state, false);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return drm_atomic_add_affected_planes(new_state, crtc);
|
||||
}
|
||||
|
||||
/*
|
||||
* The CRTC is always enabled. Screen updates are performed by
|
||||
* the primary plane's atomic_update function. Disabling clears
|
||||
* the screen in the primary plane's atomic_disable function.
|
||||
*/
|
||||
static const struct drm_crtc_helper_funcs simpledrm_crtc_helper_funcs = {
|
||||
.mode_valid = simpledrm_crtc_helper_mode_valid,
|
||||
.atomic_check = simpledrm_crtc_helper_atomic_check,
|
||||
};
|
||||
|
||||
static const struct drm_crtc_funcs simpledrm_crtc_funcs = {
|
||||
.reset = drm_atomic_helper_crtc_reset,
|
||||
.destroy = drm_crtc_cleanup,
|
||||
.set_config = drm_atomic_helper_set_config,
|
||||
.page_flip = drm_atomic_helper_page_flip,
|
||||
.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
|
||||
.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
|
||||
};
|
||||
|
||||
static const struct drm_encoder_funcs simpledrm_encoder_funcs = {
|
||||
.destroy = drm_encoder_cleanup,
|
||||
};
|
||||
|
||||
static int simpledrm_connector_helper_get_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct simpledrm_device *sdev = simpledrm_device_of_dev(connector->dev);
|
||||
|
|
@ -511,113 +652,6 @@ static const struct drm_connector_funcs simpledrm_connector_funcs = {
|
|||
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
||||
};
|
||||
|
||||
static enum drm_mode_status
|
||||
simpledrm_simple_display_pipe_mode_valid(struct drm_simple_display_pipe *pipe,
|
||||
const struct drm_display_mode *mode)
|
||||
{
|
||||
struct simpledrm_device *sdev = simpledrm_device_of_dev(pipe->crtc.dev);
|
||||
|
||||
if (mode->hdisplay != sdev->mode.hdisplay &&
|
||||
mode->vdisplay != sdev->mode.vdisplay)
|
||||
return MODE_ONE_SIZE;
|
||||
else if (mode->hdisplay != sdev->mode.hdisplay)
|
||||
return MODE_ONE_WIDTH;
|
||||
else if (mode->vdisplay != sdev->mode.vdisplay)
|
||||
return MODE_ONE_HEIGHT;
|
||||
|
||||
return MODE_OK;
|
||||
}
|
||||
|
||||
static void
|
||||
simpledrm_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe,
|
||||
struct drm_crtc_state *crtc_state,
|
||||
struct drm_plane_state *plane_state)
|
||||
{
|
||||
struct simpledrm_device *sdev = simpledrm_device_of_dev(pipe->crtc.dev);
|
||||
struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state);
|
||||
struct drm_framebuffer *fb = plane_state->fb;
|
||||
void *vmap = shadow_plane_state->data[0].vaddr; /* TODO: Use mapping abstraction */
|
||||
struct drm_device *dev = &sdev->dev;
|
||||
void __iomem *dst = sdev->screen_base;
|
||||
struct drm_rect src_clip, dst_clip;
|
||||
int idx;
|
||||
|
||||
if (!fb)
|
||||
return;
|
||||
|
||||
drm_rect_fp_to_int(&src_clip, &plane_state->src);
|
||||
|
||||
dst_clip = plane_state->dst;
|
||||
if (!drm_rect_intersect(&dst_clip, &src_clip))
|
||||
return;
|
||||
|
||||
if (!drm_dev_enter(dev, &idx))
|
||||
return;
|
||||
|
||||
dst += drm_fb_clip_offset(sdev->pitch, sdev->format, &dst_clip);
|
||||
drm_fb_blit_toio(dst, sdev->pitch, sdev->format->format, vmap, fb, &src_clip);
|
||||
|
||||
drm_dev_exit(idx);
|
||||
}
|
||||
|
||||
static void
|
||||
simpledrm_simple_display_pipe_disable(struct drm_simple_display_pipe *pipe)
|
||||
{
|
||||
struct simpledrm_device *sdev = simpledrm_device_of_dev(pipe->crtc.dev);
|
||||
struct drm_device *dev = &sdev->dev;
|
||||
int idx;
|
||||
|
||||
if (!drm_dev_enter(dev, &idx))
|
||||
return;
|
||||
|
||||
/* Clear screen to black if disabled */
|
||||
memset_io(sdev->screen_base, 0, sdev->pitch * sdev->mode.vdisplay);
|
||||
|
||||
drm_dev_exit(idx);
|
||||
}
|
||||
|
||||
static void
|
||||
simpledrm_simple_display_pipe_update(struct drm_simple_display_pipe *pipe,
|
||||
struct drm_plane_state *old_plane_state)
|
||||
{
|
||||
struct simpledrm_device *sdev = simpledrm_device_of_dev(pipe->crtc.dev);
|
||||
struct drm_plane_state *plane_state = pipe->plane.state;
|
||||
struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(plane_state);
|
||||
void *vmap = shadow_plane_state->data[0].vaddr; /* TODO: Use mapping abstraction */
|
||||
struct drm_framebuffer *fb = plane_state->fb;
|
||||
struct drm_device *dev = &sdev->dev;
|
||||
void __iomem *dst = sdev->screen_base;
|
||||
struct drm_rect src_clip, dst_clip;
|
||||
int idx;
|
||||
|
||||
if (!fb)
|
||||
return;
|
||||
|
||||
if (!drm_atomic_helper_damage_merged(old_plane_state, plane_state, &src_clip))
|
||||
return;
|
||||
|
||||
dst_clip = plane_state->dst;
|
||||
if (!drm_rect_intersect(&dst_clip, &src_clip))
|
||||
return;
|
||||
|
||||
if (!drm_dev_enter(dev, &idx))
|
||||
return;
|
||||
|
||||
dst += drm_fb_clip_offset(sdev->pitch, sdev->format, &dst_clip);
|
||||
drm_fb_blit_toio(dst, sdev->pitch, sdev->format->format, vmap, fb, &src_clip);
|
||||
|
||||
drm_dev_exit(idx);
|
||||
}
|
||||
|
||||
static const struct drm_simple_display_pipe_funcs
|
||||
simpledrm_simple_display_pipe_funcs = {
|
||||
.mode_valid = simpledrm_simple_display_pipe_mode_valid,
|
||||
.enable = simpledrm_simple_display_pipe_enable,
|
||||
.disable = simpledrm_simple_display_pipe_disable,
|
||||
.update = simpledrm_simple_display_pipe_update,
|
||||
DRM_GEM_SIMPLE_DISPLAY_PIPE_SHADOW_PLANE_FUNCS,
|
||||
};
|
||||
|
||||
static const struct drm_mode_config_funcs simpledrm_mode_config_funcs = {
|
||||
.fb_create = drm_gem_fb_create_with_dirty,
|
||||
.atomic_check = drm_atomic_helper_check,
|
||||
|
|
@ -653,10 +687,10 @@ static const uint32_t *simpledrm_device_formats(struct simpledrm_device *sdev,
|
|||
sdev->nformats = 1;
|
||||
|
||||
/* default formats go second */
|
||||
for (i = 0; i < ARRAY_SIZE(simpledrm_default_formats); ++i) {
|
||||
if (simpledrm_default_formats[i] == sdev->format->format)
|
||||
for (i = 0; i < ARRAY_SIZE(simpledrm_primary_plane_formats); ++i) {
|
||||
if (simpledrm_primary_plane_formats[i] == sdev->format->format)
|
||||
continue; /* native format already went first */
|
||||
sdev->formats[sdev->nformats] = simpledrm_default_formats[i];
|
||||
sdev->formats[sdev->nformats] = simpledrm_primary_plane_formats[i];
|
||||
sdev->nformats++;
|
||||
}
|
||||
|
||||
|
|
@ -689,8 +723,10 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,
|
|||
const struct drm_format_info *format;
|
||||
struct resource *res, *mem;
|
||||
void __iomem *screen_base;
|
||||
struct drm_plane *primary_plane;
|
||||
struct drm_crtc *crtc;
|
||||
struct drm_encoder *encoder;
|
||||
struct drm_connector *connector;
|
||||
struct drm_simple_display_pipe *pipe;
|
||||
unsigned long max_width, max_height;
|
||||
const uint32_t *formats;
|
||||
size_t nformats;
|
||||
|
|
@ -802,6 +838,40 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,
|
|||
dev->mode_config.preferred_depth = format->cpp[0] * 8;
|
||||
dev->mode_config.funcs = &simpledrm_mode_config_funcs;
|
||||
|
||||
/* Primary plane */
|
||||
|
||||
formats = simpledrm_device_formats(sdev, &nformats);
|
||||
|
||||
primary_plane = &sdev->primary_plane;
|
||||
ret = drm_universal_plane_init(dev, primary_plane, 0, &simpledrm_primary_plane_funcs,
|
||||
formats, nformats,
|
||||
simpledrm_primary_plane_format_modifiers,
|
||||
DRM_PLANE_TYPE_PRIMARY, NULL);
|
||||
if (ret)
|
||||
return ERR_PTR(ret);
|
||||
drm_plane_helper_add(primary_plane, &simpledrm_primary_plane_helper_funcs);
|
||||
drm_plane_enable_fb_damage_clips(primary_plane);
|
||||
|
||||
/* CRTC */
|
||||
|
||||
crtc = &sdev->crtc;
|
||||
ret = drm_crtc_init_with_planes(dev, crtc, primary_plane, NULL,
|
||||
&simpledrm_crtc_funcs, NULL);
|
||||
if (ret)
|
||||
return ERR_PTR(ret);
|
||||
drm_crtc_helper_add(crtc, &simpledrm_crtc_helper_funcs);
|
||||
|
||||
/* Encoder */
|
||||
|
||||
encoder = &sdev->encoder;
|
||||
ret = drm_encoder_init(dev, encoder, &simpledrm_encoder_funcs,
|
||||
DRM_MODE_ENCODER_NONE, NULL);
|
||||
if (ret)
|
||||
return ERR_PTR(ret);
|
||||
encoder->possible_crtcs = drm_crtc_mask(crtc);
|
||||
|
||||
/* Connector */
|
||||
|
||||
connector = &sdev->connector;
|
||||
ret = drm_connector_init(dev, connector, &simpledrm_connector_funcs,
|
||||
DRM_MODE_CONNECTOR_Unknown);
|
||||
|
|
@ -812,17 +882,10 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,
|
|||
DRM_MODE_PANEL_ORIENTATION_UNKNOWN,
|
||||
width, height);
|
||||
|
||||
formats = simpledrm_device_formats(sdev, &nformats);
|
||||
|
||||
pipe = &sdev->pipe;
|
||||
ret = drm_simple_display_pipe_init(dev, pipe, &simpledrm_simple_display_pipe_funcs,
|
||||
formats, nformats, simpledrm_format_modifiers,
|
||||
connector);
|
||||
ret = drm_connector_attach_encoder(connector, encoder);
|
||||
if (ret)
|
||||
return ERR_PTR(ret);
|
||||
|
||||
drm_plane_enable_fb_damage_clips(&pipe->plane);
|
||||
|
||||
drm_mode_config_reset(dev);
|
||||
|
||||
return sdev;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user