2019-05-27 14:55:01 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2016-06-10 22:55:59 +08:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2016 Noralf Trønnes
|
|
|
|
*/
|
|
|
|
|
2019-05-27 01:35:35 +08:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
|
2016-06-10 22:55:59 +08:00
|
|
|
#include <drm/drm_atomic.h>
|
|
|
|
#include <drm/drm_atomic_helper.h>
|
2019-08-26 23:26:29 +08:00
|
|
|
#include <drm/drm_bridge.h>
|
2021-06-24 00:24:56 +08:00
|
|
|
#include <drm/drm_drv.h>
|
|
|
|
#include <drm/drm_gem_atomic_helper.h>
|
2020-12-10 23:38:29 +08:00
|
|
|
#include <drm/drm_managed.h>
|
2019-01-18 05:03:34 +08:00
|
|
|
#include <drm/drm_probe_helper.h>
|
2016-06-10 22:55:59 +08:00
|
|
|
#include <drm/drm_simple_kms_helper.h>
|
|
|
|
|
|
|
|
/**
|
|
|
|
* DOC: overview
|
|
|
|
*
|
|
|
|
* This helper library provides helpers for drivers for simple display
|
|
|
|
* hardware.
|
|
|
|
*
|
|
|
|
* drm_simple_display_pipe_init() initializes a simple display pipeline
|
|
|
|
* which has only one full-screen scanout buffer feeding one output. The
|
2016-12-30 04:48:26 +08:00
|
|
|
* pipeline is represented by &struct drm_simple_display_pipe and binds
|
2016-06-10 22:55:59 +08:00
|
|
|
* together &drm_plane, &drm_crtc and &drm_encoder structures into one fixed
|
|
|
|
* entity. Some flexibility for code reuse is provided through a separately
|
|
|
|
* allocated &drm_connector object and supporting optional &drm_bridge
|
|
|
|
* encoder drivers.
|
2020-02-28 16:18:25 +08:00
|
|
|
*
|
|
|
|
* Many drivers require only a very simple encoder that fulfills the minimum
|
|
|
|
* requirements of the display pipeline and does not add additional
|
|
|
|
* functionality. The function drm_simple_encoder_init() provides an
|
|
|
|
* implementation of such an encoder.
|
2016-06-10 22:55:59 +08:00
|
|
|
*/
|
|
|
|
|
2020-02-28 16:18:25 +08:00
|
|
|
static const struct drm_encoder_funcs drm_simple_encoder_funcs_cleanup = {
|
2016-06-10 22:55:59 +08:00
|
|
|
.destroy = drm_encoder_cleanup,
|
|
|
|
};
|
|
|
|
|
2020-02-28 16:18:25 +08:00
|
|
|
/**
|
2020-03-04 22:53:12 +08:00
|
|
|
* drm_simple_encoder_init - Initialize a preallocated encoder with
|
|
|
|
* basic functionality.
|
2020-02-28 16:18:25 +08:00
|
|
|
* @dev: drm device
|
2020-03-04 22:53:12 +08:00
|
|
|
* @encoder: the encoder to initialize
|
2020-02-28 16:18:25 +08:00
|
|
|
* @encoder_type: user visible type of the encoder
|
|
|
|
*
|
|
|
|
* Initialises a preallocated encoder that has no further functionality.
|
|
|
|
* Settings for possible CRTC and clones are left to their initial values.
|
|
|
|
* The encoder will be cleaned up automatically as part of the mode-setting
|
|
|
|
* cleanup.
|
|
|
|
*
|
2020-03-04 22:53:12 +08:00
|
|
|
* The caller of drm_simple_encoder_init() is responsible for freeing
|
|
|
|
* the encoder's memory after the encoder has been cleaned up. At the
|
|
|
|
* moment this only works reliably if the encoder data structure is
|
|
|
|
* stored in the device structure. Free the encoder's memory as part of
|
|
|
|
* the device release function.
|
|
|
|
*
|
2020-12-10 23:38:29 +08:00
|
|
|
* Note: consider using drmm_simple_encoder_alloc() instead of
|
|
|
|
* drm_simple_encoder_init() to let the DRM managed resource infrastructure
|
|
|
|
* take care of cleanup and deallocation.
|
2020-03-04 22:53:12 +08:00
|
|
|
*
|
2020-02-28 16:18:25 +08:00
|
|
|
* Returns:
|
|
|
|
* Zero on success, error code on failure.
|
|
|
|
*/
|
|
|
|
int drm_simple_encoder_init(struct drm_device *dev,
|
|
|
|
struct drm_encoder *encoder,
|
|
|
|
int encoder_type)
|
|
|
|
{
|
|
|
|
return drm_encoder_init(dev, encoder,
|
|
|
|
&drm_simple_encoder_funcs_cleanup,
|
|
|
|
encoder_type, NULL);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_simple_encoder_init);
|
|
|
|
|
2020-12-10 23:38:29 +08:00
|
|
|
void *__drmm_simple_encoder_alloc(struct drm_device *dev, size_t size,
|
|
|
|
size_t offset, int encoder_type)
|
|
|
|
{
|
|
|
|
return __drmm_encoder_alloc(dev, size, offset, NULL, encoder_type,
|
|
|
|
NULL);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__drmm_simple_encoder_alloc);
|
|
|
|
|
2018-02-20 15:28:59 +08:00
|
|
|
static enum drm_mode_status
|
|
|
|
drm_simple_kms_crtc_mode_valid(struct drm_crtc *crtc,
|
|
|
|
const struct drm_display_mode *mode)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(crtc, struct drm_simple_display_pipe, crtc);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->mode_valid)
|
|
|
|
/* Anything goes */
|
|
|
|
return MODE_OK;
|
|
|
|
|
2019-10-23 18:12:56 +08:00
|
|
|
return pipe->funcs->mode_valid(pipe, mode);
|
2018-02-20 15:28:59 +08:00
|
|
|
}
|
|
|
|
|
2016-08-23 14:25:40 +08:00
|
|
|
static int drm_simple_kms_crtc_check(struct drm_crtc *crtc,
|
drm/atomic: Pass the full state to CRTC atomic_check
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 start convert all the remaining helpers to provide a consistent
interface, starting with the CRTC's atomic_check.
The conversion was done using the coccinelle script below,
built tested on all the drivers and actually tested on vc4.
virtual report
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier ret, f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- ret = FUNCS->atomic_check(crtc, crtc_state);
+ ret = FUNCS->atomic_check(crtc, state);
...>
}
@@
identifier crtc, new_state;
@@
struct drm_crtc_helper_funcs {
...
- int (*atomic_check)(struct drm_crtc *crtc, struct drm_crtc_state *new_state);
+ int (*atomic_check)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_check = func,
...,
};
@ ignores_new_state @
identifier crtc_atomic_func.func;
identifier crtc, new_state;
@@
int func(struct drm_crtc *crtc,
struct drm_crtc_state *new_state)
{
... when != new_state
}
@ adds_new_state depends on crtc_atomic_func && !ignores_new_state @
identifier crtc_atomic_func.func;
identifier crtc, new_state;
@@
int func(struct drm_crtc *crtc, struct drm_crtc_state *new_state)
{
+ struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
expression E;
type T;
@@
int func(...)
{
...
- T state = E;
+ T crtc_state = E;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
type T;
@@
int func(...)
{
...
- T state;
+ T crtc_state;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
identifier new_state;
identifier crtc;
@@
int func(struct drm_crtc *crtc,
- struct drm_crtc_state *new_state
+ struct drm_atomic_state *state
)
{ ... }
@@
identifier new_state;
identifier crtc;
@@
int vmw_du_crtc_atomic_check(struct drm_crtc *crtc,
- struct drm_crtc_state *new_state
+ struct drm_atomic_state *state
)
{
+ struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@@
identifier new_state;
identifier crtc;
@@
int vmw_du_crtc_atomic_check(struct drm_crtc *crtc,
- struct drm_crtc_state *new_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/...>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-maxime@cerno.tech
2020-10-28 20:32:21 +08:00
|
|
|
struct drm_atomic_state *state)
|
2016-08-23 14:25:40 +08:00
|
|
|
{
|
2022-06-17 18:32:25 +08:00
|
|
|
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
|
|
|
|
int ret;
|
2017-07-12 16:13:29 +08:00
|
|
|
|
2022-10-07 20:43:38 +08:00
|
|
|
if (!crtc_state->enable)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = drm_atomic_helper_check_crtc_primary_plane(crtc_state);
|
2022-06-17 18:32:25 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2017-07-12 16:13:29 +08:00
|
|
|
|
2022-10-07 20:43:38 +08:00
|
|
|
out:
|
2020-11-02 21:38:34 +08:00
|
|
|
return drm_atomic_add_affected_planes(state, crtc);
|
2016-08-23 14:25:40 +08:00
|
|
|
}
|
|
|
|
|
2017-06-30 17:36:44 +08:00
|
|
|
static void drm_simple_kms_crtc_enable(struct drm_crtc *crtc,
|
drm/atomic: Pass the full state to CRTC atomic enable/disable
If the CRTC driver ever needs to access the full DRM state, it can't do so
at atomic_enable / atomic_disable time since drm_atomic_helper_swap_state
will have cleared the pointer from the struct drm_crtc_state to the struct
drm_atomic_state before calling those hooks.
In order to allow that, let's pass the full DRM state to atomic_enable and
atomic_disable. The conversion was done using the coccinelle script below,
built tested on all the drivers and actually tested on vc4.
virtual report
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier dev, state;
identifier crtc, crtc_state;
@@
disable_outputs(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- FUNCS->atomic_disable(crtc, crtc_state);
+ FUNCS->atomic_disable(crtc, state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier dev, state;
identifier crtc, crtc_state;
@@
drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- FUNCS->atomic_enable(crtc, crtc_state);
+ FUNCS->atomic_enable(crtc, state);
...>
}
@@
identifier crtc, old_state;
@@
struct drm_crtc_helper_funcs {
...
- void (*atomic_enable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_enable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
- void (*atomic_disable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_disable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_enable = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
)
@ ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@
void func(struct drm_crtc *crtc,
struct drm_crtc_state *old_state)
{
... when != old_state
}
@ adds_old_state depends on crtc_atomic_func && !ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@
void func(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
{
+ struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
...
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
expression E;
type T;
@@
void func(...)
{
...
- T state = E;
+ T crtc_state = E;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
type T;
@@
void func(...)
{
...
- T state;
+ T crtc_state;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
identifier old_state;
identifier crtc;
@@
void func(struct drm_crtc *crtc,
- struct drm_crtc_state *old_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/...>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef142a0c13f7870.1602161031.git-series.maxime@cerno.tech
2020-10-08 20:44:08 +08:00
|
|
|
struct drm_atomic_state *state)
|
2016-06-10 22:55:59 +08:00
|
|
|
{
|
2018-03-23 04:27:37 +08:00
|
|
|
struct drm_plane *plane;
|
2016-06-10 22:55:59 +08:00
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(crtc, struct drm_simple_display_pipe, crtc);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->enable)
|
|
|
|
return;
|
|
|
|
|
2018-03-23 04:27:37 +08:00
|
|
|
plane = &pipe->plane;
|
|
|
|
pipe->funcs->enable(pipe, crtc->state, plane->state);
|
2016-06-10 22:55:59 +08:00
|
|
|
}
|
|
|
|
|
2017-06-30 17:36:45 +08:00
|
|
|
static void drm_simple_kms_crtc_disable(struct drm_crtc *crtc,
|
drm/atomic: Pass the full state to CRTC atomic enable/disable
If the CRTC driver ever needs to access the full DRM state, it can't do so
at atomic_enable / atomic_disable time since drm_atomic_helper_swap_state
will have cleared the pointer from the struct drm_crtc_state to the struct
drm_atomic_state before calling those hooks.
In order to allow that, let's pass the full DRM state to atomic_enable and
atomic_disable. The conversion was done using the coccinelle script below,
built tested on all the drivers and actually tested on vc4.
virtual report
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier dev, state;
identifier crtc, crtc_state;
@@
disable_outputs(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- FUNCS->atomic_disable(crtc, crtc_state);
+ FUNCS->atomic_disable(crtc, state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier dev, state;
identifier crtc, crtc_state;
@@
drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, struct drm_atomic_state *state)
{
<...
- FUNCS->atomic_enable(crtc, crtc_state);
+ FUNCS->atomic_enable(crtc, state);
...>
}
@@
identifier crtc, old_state;
@@
struct drm_crtc_helper_funcs {
...
- void (*atomic_enable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_enable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
- void (*atomic_disable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_disable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_enable = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
)
@ ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@
void func(struct drm_crtc *crtc,
struct drm_crtc_state *old_state)
{
... when != old_state
}
@ adds_old_state depends on crtc_atomic_func && !ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@
void func(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
{
+ struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
...
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
expression E;
type T;
@@
void func(...)
{
...
- T state = E;
+ T crtc_state = E;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
type T;
@@
void func(...)
{
...
- T state;
+ T crtc_state;
<+...
- state
+ crtc_state
...+>
}
@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
identifier old_state;
identifier crtc;
@@
void func(struct drm_crtc *crtc,
- struct drm_crtc_state *old_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/...>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef142a0c13f7870.1602161031.git-series.maxime@cerno.tech
2020-10-08 20:44:08 +08:00
|
|
|
struct drm_atomic_state *state)
|
2016-06-10 22:55:59 +08:00
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(crtc, struct drm_simple_display_pipe, crtc);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->disable)
|
|
|
|
return;
|
|
|
|
|
|
|
|
pipe->funcs->disable(pipe);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct drm_crtc_helper_funcs drm_simple_kms_crtc_helper_funcs = {
|
2018-02-20 15:28:59 +08:00
|
|
|
.mode_valid = drm_simple_kms_crtc_mode_valid,
|
2016-08-23 14:25:40 +08:00
|
|
|
.atomic_check = drm_simple_kms_crtc_check,
|
2017-06-30 17:36:44 +08:00
|
|
|
.atomic_enable = drm_simple_kms_crtc_enable,
|
2017-06-30 17:36:45 +08:00
|
|
|
.atomic_disable = drm_simple_kms_crtc_disable,
|
2016-06-10 22:55:59 +08:00
|
|
|
};
|
|
|
|
|
2021-07-14 22:22:38 +08:00
|
|
|
static void drm_simple_kms_crtc_reset(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(crtc, struct drm_simple_display_pipe, crtc);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->reset_crtc)
|
|
|
|
return drm_atomic_helper_crtc_reset(crtc);
|
|
|
|
|
|
|
|
return pipe->funcs->reset_crtc(pipe);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct drm_crtc_state *drm_simple_kms_crtc_duplicate_state(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(crtc, struct drm_simple_display_pipe, crtc);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->duplicate_crtc_state)
|
|
|
|
return drm_atomic_helper_crtc_duplicate_state(crtc);
|
|
|
|
|
|
|
|
return pipe->funcs->duplicate_crtc_state(pipe);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drm_simple_kms_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(crtc, struct drm_simple_display_pipe, crtc);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->destroy_crtc_state)
|
|
|
|
drm_atomic_helper_crtc_destroy_state(crtc, state);
|
|
|
|
else
|
|
|
|
pipe->funcs->destroy_crtc_state(pipe, state);
|
|
|
|
}
|
|
|
|
|
2018-02-12 16:52:51 +08:00
|
|
|
static int drm_simple_kms_crtc_enable_vblank(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(crtc, struct drm_simple_display_pipe, crtc);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->enable_vblank)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return pipe->funcs->enable_vblank(pipe);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drm_simple_kms_crtc_disable_vblank(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(crtc, struct drm_simple_display_pipe, crtc);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->disable_vblank)
|
|
|
|
return;
|
|
|
|
|
|
|
|
pipe->funcs->disable_vblank(pipe);
|
|
|
|
}
|
|
|
|
|
2016-06-10 22:55:59 +08:00
|
|
|
static const struct drm_crtc_funcs drm_simple_kms_crtc_funcs = {
|
2021-07-14 22:22:38 +08:00
|
|
|
.reset = drm_simple_kms_crtc_reset,
|
2016-06-10 22:55:59 +08:00
|
|
|
.destroy = drm_crtc_cleanup,
|
|
|
|
.set_config = drm_atomic_helper_set_config,
|
|
|
|
.page_flip = drm_atomic_helper_page_flip,
|
2021-07-14 22:22:38 +08:00
|
|
|
.atomic_duplicate_state = drm_simple_kms_crtc_duplicate_state,
|
|
|
|
.atomic_destroy_state = drm_simple_kms_crtc_destroy_state,
|
2018-02-12 16:52:51 +08:00
|
|
|
.enable_vblank = drm_simple_kms_crtc_enable_vblank,
|
|
|
|
.disable_vblank = drm_simple_kms_crtc_disable_vblank,
|
2016-06-10 22:55:59 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
|
drm/atomic: Pass the full state to planes atomic_check
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
2021-02-19 20:00:24 +08:00
|
|
|
struct drm_atomic_state *state)
|
2016-06-10 22:55:59 +08:00
|
|
|
{
|
drm/atomic: Pass the full state to planes atomic_check
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
2021-02-19 20:00:24 +08:00
|
|
|
struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state,
|
|
|
|
plane);
|
2016-06-10 22:55:59 +08:00
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
struct drm_crtc_state *crtc_state;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
pipe = container_of(plane, struct drm_simple_display_pipe, plane);
|
drm: Use the state pointer directly in planes atomic_check
Now that atomic_check takes the global atomic state as a parameter, we
don't need to go through the pointer in the plane state.
This was done using the following coccinelle script:
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
static struct drm_plane_helper_funcs helpers = {
...,
.atomic_check = func,
...,
};
@@
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_new_plane_state(state, plane);
<... when != plane_state
- plane_state->state
+ state
...>
}
@@
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_new_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-5-maxime@cerno.tech
2021-02-19 20:00:25 +08:00
|
|
|
crtc_state = drm_atomic_get_new_crtc_state(state,
|
2017-03-01 17:22:10 +08:00
|
|
|
&pipe->crtc);
|
2016-07-27 00:07:04 +08:00
|
|
|
|
2017-11-02 04:16:19 +08:00
|
|
|
ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state,
|
2022-07-20 16:30:54 +08:00
|
|
|
DRM_PLANE_NO_SCALING,
|
|
|
|
DRM_PLANE_NO_SCALING,
|
2022-06-17 18:32:25 +08:00
|
|
|
false, false);
|
2016-06-10 22:55:59 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2016-07-27 00:07:04 +08:00
|
|
|
if (!plane_state->visible)
|
2018-02-22 14:09:19 +08:00
|
|
|
return 0;
|
|
|
|
|
2016-06-10 22:55:59 +08:00
|
|
|
if (!pipe->funcs || !pipe->funcs->check)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return pipe->funcs->check(pipe, plane_state, crtc_state);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drm_simple_kms_plane_atomic_update(struct drm_plane *plane,
|
drm/atomic: Pass the full state to planes atomic disable and update
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
2021-02-19 20:00:29 +08:00
|
|
|
struct drm_atomic_state *state)
|
2016-06-10 22:55:59 +08:00
|
|
|
{
|
drm/atomic: Pass the full state to planes atomic disable and update
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
2021-02-19 20:00:29 +08:00
|
|
|
struct drm_plane_state *old_pstate = drm_atomic_get_old_plane_state(state,
|
|
|
|
plane);
|
2016-06-10 22:55:59 +08:00
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(plane, struct drm_simple_display_pipe, plane);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->update)
|
|
|
|
return;
|
|
|
|
|
2017-03-21 07:36:15 +08:00
|
|
|
pipe->funcs->update(pipe, old_pstate);
|
2016-06-10 22:55:59 +08:00
|
|
|
}
|
|
|
|
|
2016-10-03 01:01:24 +08:00
|
|
|
static int drm_simple_kms_plane_prepare_fb(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *state)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(plane, struct drm_simple_display_pipe, plane);
|
2021-06-24 00:24:56 +08:00
|
|
|
if (!pipe->funcs || !pipe->funcs->prepare_fb) {
|
|
|
|
if (WARN_ON_ONCE(!drm_core_check_feature(plane->dev, DRIVER_GEM)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
WARN_ON_ONCE(pipe->funcs && pipe->funcs->cleanup_fb);
|
|
|
|
|
2022-12-02 20:56:37 +08:00
|
|
|
return drm_gem_plane_helper_prepare_fb(plane, state);
|
2021-06-24 00:24:56 +08:00
|
|
|
}
|
2016-10-03 01:01:24 +08:00
|
|
|
|
|
|
|
return pipe->funcs->prepare_fb(pipe, state);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drm_simple_kms_plane_cleanup_fb(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *state)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(plane, struct drm_simple_display_pipe, plane);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->cleanup_fb)
|
|
|
|
return;
|
|
|
|
|
|
|
|
pipe->funcs->cleanup_fb(pipe, state);
|
|
|
|
}
|
|
|
|
|
2022-10-25 18:17:36 +08:00
|
|
|
static int drm_simple_kms_plane_begin_fb_access(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *new_plane_state)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(plane, struct drm_simple_display_pipe, plane);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->begin_fb_access)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return pipe->funcs->begin_fb_access(pipe, new_plane_state);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drm_simple_kms_plane_end_fb_access(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *new_plane_state)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(plane, struct drm_simple_display_pipe, plane);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->end_fb_access)
|
|
|
|
return;
|
|
|
|
|
|
|
|
pipe->funcs->end_fb_access(pipe, new_plane_state);
|
|
|
|
}
|
|
|
|
|
2018-10-26 00:26:35 +08:00
|
|
|
static bool drm_simple_kms_format_mod_supported(struct drm_plane *plane,
|
|
|
|
uint32_t format,
|
|
|
|
uint64_t modifier)
|
|
|
|
{
|
|
|
|
return modifier == DRM_FORMAT_MOD_LINEAR;
|
|
|
|
}
|
|
|
|
|
2016-06-10 22:55:59 +08:00
|
|
|
static const struct drm_plane_helper_funcs drm_simple_kms_plane_helper_funcs = {
|
2016-10-03 01:01:24 +08:00
|
|
|
.prepare_fb = drm_simple_kms_plane_prepare_fb,
|
|
|
|
.cleanup_fb = drm_simple_kms_plane_cleanup_fb,
|
2022-10-25 18:17:36 +08:00
|
|
|
.begin_fb_access = drm_simple_kms_plane_begin_fb_access,
|
|
|
|
.end_fb_access = drm_simple_kms_plane_end_fb_access,
|
2016-06-10 22:55:59 +08:00
|
|
|
.atomic_check = drm_simple_kms_plane_atomic_check,
|
|
|
|
.atomic_update = drm_simple_kms_plane_atomic_update,
|
|
|
|
};
|
|
|
|
|
2021-02-08 19:55:32 +08:00
|
|
|
static void drm_simple_kms_plane_reset(struct drm_plane *plane)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(plane, struct drm_simple_display_pipe, plane);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->reset_plane)
|
|
|
|
return drm_atomic_helper_plane_reset(plane);
|
|
|
|
|
|
|
|
return pipe->funcs->reset_plane(pipe);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct drm_plane_state *drm_simple_kms_plane_duplicate_state(struct drm_plane *plane)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(plane, struct drm_simple_display_pipe, plane);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->duplicate_plane_state)
|
|
|
|
return drm_atomic_helper_plane_duplicate_state(plane);
|
|
|
|
|
|
|
|
return pipe->funcs->duplicate_plane_state(pipe);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drm_simple_kms_plane_destroy_state(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *state)
|
|
|
|
{
|
|
|
|
struct drm_simple_display_pipe *pipe;
|
|
|
|
|
|
|
|
pipe = container_of(plane, struct drm_simple_display_pipe, plane);
|
|
|
|
if (!pipe->funcs || !pipe->funcs->destroy_plane_state)
|
|
|
|
drm_atomic_helper_plane_destroy_state(plane, state);
|
|
|
|
else
|
|
|
|
pipe->funcs->destroy_plane_state(pipe, state);
|
|
|
|
}
|
|
|
|
|
2016-06-10 22:55:59 +08:00
|
|
|
static const struct drm_plane_funcs drm_simple_kms_plane_funcs = {
|
|
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
|
|
.destroy = drm_plane_cleanup,
|
2021-02-08 19:55:32 +08:00
|
|
|
.reset = drm_simple_kms_plane_reset,
|
|
|
|
.atomic_duplicate_state = drm_simple_kms_plane_duplicate_state,
|
|
|
|
.atomic_destroy_state = drm_simple_kms_plane_destroy_state,
|
2018-10-26 00:26:35 +08:00
|
|
|
.format_mod_supported = drm_simple_kms_format_mod_supported,
|
2016-06-10 22:55:59 +08:00
|
|
|
};
|
|
|
|
|
2016-08-25 17:04:34 +08:00
|
|
|
/**
|
|
|
|
* drm_simple_display_pipe_attach_bridge - Attach a bridge to the display pipe
|
|
|
|
* @pipe: simple display pipe object
|
|
|
|
* @bridge: bridge to attach
|
|
|
|
*
|
|
|
|
* Makes it possible to still use the drm_simple_display_pipe helpers when
|
|
|
|
* a DRM bridge has to be used.
|
|
|
|
*
|
|
|
|
* Note that you probably want to initialize the pipe by passing a NULL
|
|
|
|
* connector to drm_simple_display_pipe_init().
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* Zero on success, negative error code on failure.
|
|
|
|
*/
|
|
|
|
int drm_simple_display_pipe_attach_bridge(struct drm_simple_display_pipe *pipe,
|
|
|
|
struct drm_bridge *bridge)
|
|
|
|
{
|
drm/bridge: Extend bridge API to disable connector creation
Most bridge drivers create a DRM connector to model the connector at the
output of the bridge. This model is historical and has worked pretty
well so far, but causes several issues:
- It prevents supporting more complex display pipelines where DRM
connector operations are split over multiple components. For instance a
pipeline with a bridge connected to the DDC signals to read EDID data,
and another one connected to the HPD signal to detect connection and
disconnection, will not be possible to support through this model.
- It requires every bridge driver to implement similar connector
handling code, resulting in code duplication.
- It assumes that a bridge will either be wired to a connector or to
another bridge, but doesn't support bridges that can be used in both
positions very well (although there is some ad-hoc support for this in
the analogix_dp bridge driver).
In order to solve these issues, ownership of the connector should be
moved to the display controller driver (where it can be implemented
using helpers provided by the core).
Extend the bridge API to allow disabling connector creation in bridge
drivers as a first step towards the new model. The new flags argument to
the bridge .attach() operation allows instructing the bridge driver to
skip creating a connector. Unconditionally set the new flags argument to
0 for now to keep the existing behaviour, and modify all existing bridge
drivers to return an error when connector creation is not requested as
they don't support this feature yet.
The change is based on the following semantic patch, with manual review
and edits.
@ rule1 @
identifier funcs;
identifier fn;
@@
struct drm_bridge_funcs funcs = {
...,
.attach = fn
};
@ depends on rule1 @
identifier rule1.fn;
identifier bridge;
statement S, S1;
@@
int fn(
struct drm_bridge *bridge
+ , enum drm_bridge_attach_flags flags
)
{
... when != S
+ if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) {
+ DRM_ERROR("Fix bridge driver to make connector optional!");
+ return -EINVAL;
+ }
+
S1
...
}
@ depends on rule1 @
identifier rule1.fn;
identifier bridge, flags;
expression E1, E2, E3;
@@
int fn(
struct drm_bridge *bridge,
enum drm_bridge_attach_flags flags
) {
<...
drm_bridge_attach(E1, E2, E3
+ , flags
)
...>
}
@@
expression E1, E2, E3;
@@
drm_bridge_attach(E1, E2, E3
+ , 0
)
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200226112514.12455-10-laurent.pinchart@ideasonboard.com
2020-02-26 19:24:29 +08:00
|
|
|
return drm_bridge_attach(&pipe->encoder, bridge, NULL, 0);
|
2016-08-25 17:04:34 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_simple_display_pipe_attach_bridge);
|
|
|
|
|
2016-06-10 22:55:59 +08:00
|
|
|
/**
|
|
|
|
* drm_simple_display_pipe_init - Initialize a simple display pipeline
|
|
|
|
* @dev: DRM device
|
|
|
|
* @pipe: simple display pipe object to initialize
|
|
|
|
* @funcs: callbacks for the display pipe (optional)
|
2016-08-13 04:48:37 +08:00
|
|
|
* @formats: array of supported formats (DRM_FORMAT\_\*)
|
2016-06-10 22:55:59 +08:00
|
|
|
* @format_count: number of elements in @formats
|
2017-07-24 11:46:38 +08:00
|
|
|
* @format_modifiers: array of formats modifiers
|
2016-08-25 17:04:33 +08:00
|
|
|
* @connector: connector to attach and register (optional)
|
2016-06-10 22:55:59 +08:00
|
|
|
*
|
|
|
|
* Sets up a display pipeline which consist of a really simple
|
2016-08-25 17:04:33 +08:00
|
|
|
* plane-crtc-encoder pipe.
|
|
|
|
*
|
|
|
|
* If a connector is supplied, the pipe will be coupled with the provided
|
|
|
|
* connector. You may supply a NULL connector when using drm bridges, that
|
|
|
|
* handle connectors themselves (see drm_simple_display_pipe_attach_bridge()).
|
|
|
|
*
|
2016-06-10 22:55:59 +08:00
|
|
|
* Teardown of a simple display pipe is all handled automatically by the drm
|
|
|
|
* core through calling drm_mode_config_cleanup(). Drivers afterwards need to
|
|
|
|
* release the memory for the structure themselves.
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* Zero on success, negative error code on failure.
|
|
|
|
*/
|
|
|
|
int drm_simple_display_pipe_init(struct drm_device *dev,
|
|
|
|
struct drm_simple_display_pipe *pipe,
|
|
|
|
const struct drm_simple_display_pipe_funcs *funcs,
|
|
|
|
const uint32_t *formats, unsigned int format_count,
|
2017-07-24 11:46:38 +08:00
|
|
|
const uint64_t *format_modifiers,
|
2016-06-10 22:55:59 +08:00
|
|
|
struct drm_connector *connector)
|
|
|
|
{
|
|
|
|
struct drm_encoder *encoder = &pipe->encoder;
|
|
|
|
struct drm_plane *plane = &pipe->plane;
|
|
|
|
struct drm_crtc *crtc = &pipe->crtc;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
pipe->connector = connector;
|
|
|
|
pipe->funcs = funcs;
|
|
|
|
|
|
|
|
drm_plane_helper_add(plane, &drm_simple_kms_plane_helper_funcs);
|
|
|
|
ret = drm_universal_plane_init(dev, plane, 0,
|
|
|
|
&drm_simple_kms_plane_funcs,
|
|
|
|
formats, format_count,
|
2017-07-24 11:46:38 +08:00
|
|
|
format_modifiers,
|
2016-06-10 22:55:59 +08:00
|
|
|
DRM_PLANE_TYPE_PRIMARY, NULL);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
drm_crtc_helper_add(crtc, &drm_simple_kms_crtc_helper_funcs);
|
|
|
|
ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL,
|
|
|
|
&drm_simple_kms_crtc_funcs, NULL);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2018-06-27 03:47:08 +08:00
|
|
|
encoder->possible_crtcs = drm_crtc_mask(crtc);
|
2020-02-28 16:18:25 +08:00
|
|
|
ret = drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_NONE);
|
2016-08-25 17:04:33 +08:00
|
|
|
if (ret || !connector)
|
2016-06-10 22:55:59 +08:00
|
|
|
return ret;
|
|
|
|
|
2018-07-09 16:40:07 +08:00
|
|
|
return drm_connector_attach_encoder(connector, encoder);
|
2016-06-10 22:55:59 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_simple_display_pipe_init);
|
|
|
|
|
|
|
|
MODULE_LICENSE("GPL");
|