2019-05-27 08:55:01 +02:00
// SPDX-License-Identifier: GPL-2.0-or-later
2017-12-01 07:05:41 +01:00
/*
* Copyright ( C ) Icenowy Zheng < icenowy @ aosc . io >
*
* Based on sun4i_layer . h , which is :
* Copyright ( C ) 2015 Free Electrons
* Copyright ( C ) 2015 NextThing Co
*
* Maxime Ripard < maxime . ripard @ free - electrons . com >
*/
# include <drm/drm_atomic.h>
# include <drm/drm_atomic_helper.h>
# include <drm/drm_crtc.h>
# include <drm/drm_fb_cma_helper.h>
2019-07-16 08:42:06 +02:00
# include <drm/drm_fourcc.h>
2021-02-22 15:17:56 +01:00
# include <drm/drm_gem_atomic_helper.h>
2017-12-01 07:05:41 +01:00
# include <drm/drm_gem_cma_helper.h>
# include <drm/drm_plane_helper.h>
2019-01-17 22:03:34 +01:00
# include <drm/drm_probe_helper.h>
2017-12-01 07:05:41 +01:00
# include "sun8i_mixer.h"
2020-02-24 18:39:01 +01:00
# include "sun8i_ui_layer.h"
2017-12-01 07:05:44 +01:00
# include "sun8i_ui_scaler.h"
2017-12-01 07:05:41 +01:00
static void sun8i_ui_layer_enable ( struct sun8i_mixer * mixer , int channel ,
2018-07-17 14:25:22 +02:00
int overlay , bool enable , unsigned int zpos ,
unsigned int old_zpos )
2017-12-01 07:05:41 +01:00
{
2018-11-04 19:26:46 +01:00
u32 val , bld_base , ch_base ;
bld_base = sun8i_blender_base ( mixer ) ;
ch_base = sun8i_channel_base ( mixer , channel ) ;
2017-12-01 07:05:41 +01:00
DRM_DEBUG_DRIVER ( " %sabling channel %d overlay %d \n " ,
enable ? " En " : " Dis " , channel , overlay ) ;
if ( enable )
val = SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN ;
else
val = 0 ;
regmap_update_bits ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_CHAN_UI_LAYER_ATTR ( ch_base , overlay ) ,
2017-12-01 07:05:41 +01:00
SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN , val ) ;
2018-07-17 14:25:22 +02:00
if ( ! enable | | zpos ! = old_zpos ) {
regmap_update_bits ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_BLEND_PIPE_CTL ( bld_base ) ,
2018-07-17 14:25:22 +02:00
SUN8I_MIXER_BLEND_PIPE_CTL_EN ( old_zpos ) ,
0 ) ;
regmap_update_bits ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_BLEND_ROUTE ( bld_base ) ,
2018-07-17 14:25:22 +02:00
SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK ( old_zpos ) ,
0 ) ;
}
drm/sun4i: Implement zpos for DE2
Initial implementation of DE2 planes only supported fixed zpos.
Expand implementation with configurable zpos property.
Implementation background:
Channel in DE2 driver represents one DRM plane, whereas pipe is just
mapped channel to known Z position. Pipe 0 will always be at the bottom,
pipe 1 just above pipe 0 and so on. If, for example, channel 1 is mapped
at pipe 0 and channel 0 at pipe 1, whatever is on channel 0 will appear
on top.
Before this commit, channel id was used for addressing channel related
registers (prefixed with SUN8I_MIXER_CHAN_UI_ or SUN8I_MIXER_CHAN_VI_)
and pipe registers (prefixed with SUN8I_MIXER_BLEND_). Additionally,
register SUN8I_MIXER_BLEND_ROUTE, which takes care for mapping channels
to pipes had fixed value. It mapped channel 0 to pipe 0, 1 to 1 and so
on. Consequence of all that was fixed Z order of planes.
With this commit, pipe registers are using zpos property as index and
channel related registers still use channel id as index. Pipe mapping
register is now set dynamically too and pipe enable register is rebuild
every time to make sure only active pipes are enabled.
Testing was done to confirm that there is no issues if bottom plane
contains pixels with alpha value < 0xff and if it doesn't whole screen.
Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706164732.24166-1-jernej.skrabec@siol.net
2018-07-06 18:47:32 +02:00
if ( enable ) {
val = SUN8I_MIXER_BLEND_PIPE_CTL_EN ( zpos ) ;
2017-12-01 07:05:41 +01:00
drm/sun4i: Implement zpos for DE2
Initial implementation of DE2 planes only supported fixed zpos.
Expand implementation with configurable zpos property.
Implementation background:
Channel in DE2 driver represents one DRM plane, whereas pipe is just
mapped channel to known Z position. Pipe 0 will always be at the bottom,
pipe 1 just above pipe 0 and so on. If, for example, channel 1 is mapped
at pipe 0 and channel 0 at pipe 1, whatever is on channel 0 will appear
on top.
Before this commit, channel id was used for addressing channel related
registers (prefixed with SUN8I_MIXER_CHAN_UI_ or SUN8I_MIXER_CHAN_VI_)
and pipe registers (prefixed with SUN8I_MIXER_BLEND_). Additionally,
register SUN8I_MIXER_BLEND_ROUTE, which takes care for mapping channels
to pipes had fixed value. It mapped channel 0 to pipe 0, 1 to 1 and so
on. Consequence of all that was fixed Z order of planes.
With this commit, pipe registers are using zpos property as index and
channel related registers still use channel id as index. Pipe mapping
register is now set dynamically too and pipe enable register is rebuild
every time to make sure only active pipes are enabled.
Testing was done to confirm that there is no issues if bottom plane
contains pixels with alpha value < 0xff and if it doesn't whole screen.
Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706164732.24166-1-jernej.skrabec@siol.net
2018-07-06 18:47:32 +02:00
regmap_update_bits ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_BLEND_PIPE_CTL ( bld_base ) ,
val , val ) ;
drm/sun4i: Implement zpos for DE2
Initial implementation of DE2 planes only supported fixed zpos.
Expand implementation with configurable zpos property.
Implementation background:
Channel in DE2 driver represents one DRM plane, whereas pipe is just
mapped channel to known Z position. Pipe 0 will always be at the bottom,
pipe 1 just above pipe 0 and so on. If, for example, channel 1 is mapped
at pipe 0 and channel 0 at pipe 1, whatever is on channel 0 will appear
on top.
Before this commit, channel id was used for addressing channel related
registers (prefixed with SUN8I_MIXER_CHAN_UI_ or SUN8I_MIXER_CHAN_VI_)
and pipe registers (prefixed with SUN8I_MIXER_BLEND_). Additionally,
register SUN8I_MIXER_BLEND_ROUTE, which takes care for mapping channels
to pipes had fixed value. It mapped channel 0 to pipe 0, 1 to 1 and so
on. Consequence of all that was fixed Z order of planes.
With this commit, pipe registers are using zpos property as index and
channel related registers still use channel id as index. Pipe mapping
register is now set dynamically too and pipe enable register is rebuild
every time to make sure only active pipes are enabled.
Testing was done to confirm that there is no issues if bottom plane
contains pixels with alpha value < 0xff and if it doesn't whole screen.
Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706164732.24166-1-jernej.skrabec@siol.net
2018-07-06 18:47:32 +02:00
val = channel < < SUN8I_MIXER_BLEND_ROUTE_PIPE_SHIFT ( zpos ) ;
regmap_update_bits ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_BLEND_ROUTE ( bld_base ) ,
drm/sun4i: Implement zpos for DE2
Initial implementation of DE2 planes only supported fixed zpos.
Expand implementation with configurable zpos property.
Implementation background:
Channel in DE2 driver represents one DRM plane, whereas pipe is just
mapped channel to known Z position. Pipe 0 will always be at the bottom,
pipe 1 just above pipe 0 and so on. If, for example, channel 1 is mapped
at pipe 0 and channel 0 at pipe 1, whatever is on channel 0 will appear
on top.
Before this commit, channel id was used for addressing channel related
registers (prefixed with SUN8I_MIXER_CHAN_UI_ or SUN8I_MIXER_CHAN_VI_)
and pipe registers (prefixed with SUN8I_MIXER_BLEND_). Additionally,
register SUN8I_MIXER_BLEND_ROUTE, which takes care for mapping channels
to pipes had fixed value. It mapped channel 0 to pipe 0, 1 to 1 and so
on. Consequence of all that was fixed Z order of planes.
With this commit, pipe registers are using zpos property as index and
channel related registers still use channel id as index. Pipe mapping
register is now set dynamically too and pipe enable register is rebuild
every time to make sure only active pipes are enabled.
Testing was done to confirm that there is no issues if bottom plane
contains pixels with alpha value < 0xff and if it doesn't whole screen.
Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706164732.24166-1-jernej.skrabec@siol.net
2018-07-06 18:47:32 +02:00
SUN8I_MIXER_BLEND_ROUTE_PIPE_MSK ( zpos ) ,
val ) ;
}
2017-12-01 07:05:41 +01:00
}
2021-01-28 13:39:39 +02:00
static void sun8i_ui_layer_update_alpha ( struct sun8i_mixer * mixer , int channel ,
int overlay , struct drm_plane * plane )
{
u32 mask , val , ch_base ;
ch_base = sun8i_channel_base ( mixer , channel ) ;
mask = SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_MODE_MASK |
SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_MASK ;
val = SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA ( plane - > state - > alpha > > 8 ) ;
val | = ( plane - > state - > alpha = = DRM_BLEND_ALPHA_OPAQUE ) ?
SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_MODE_PIXEL :
SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_MODE_COMBINED ;
regmap_update_bits ( mixer - > engine . regs ,
SUN8I_MIXER_CHAN_UI_LAYER_ATTR ( ch_base , overlay ) ,
mask , val ) ;
}
2017-12-01 07:05:41 +01:00
static int sun8i_ui_layer_update_coord ( struct sun8i_mixer * mixer , int channel ,
drm/sun4i: Implement zpos for DE2
Initial implementation of DE2 planes only supported fixed zpos.
Expand implementation with configurable zpos property.
Implementation background:
Channel in DE2 driver represents one DRM plane, whereas pipe is just
mapped channel to known Z position. Pipe 0 will always be at the bottom,
pipe 1 just above pipe 0 and so on. If, for example, channel 1 is mapped
at pipe 0 and channel 0 at pipe 1, whatever is on channel 0 will appear
on top.
Before this commit, channel id was used for addressing channel related
registers (prefixed with SUN8I_MIXER_CHAN_UI_ or SUN8I_MIXER_CHAN_VI_)
and pipe registers (prefixed with SUN8I_MIXER_BLEND_). Additionally,
register SUN8I_MIXER_BLEND_ROUTE, which takes care for mapping channels
to pipes had fixed value. It mapped channel 0 to pipe 0, 1 to 1 and so
on. Consequence of all that was fixed Z order of planes.
With this commit, pipe registers are using zpos property as index and
channel related registers still use channel id as index. Pipe mapping
register is now set dynamically too and pipe enable register is rebuild
every time to make sure only active pipes are enabled.
Testing was done to confirm that there is no issues if bottom plane
contains pixels with alpha value < 0xff and if it doesn't whole screen.
Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706164732.24166-1-jernej.skrabec@siol.net
2018-07-06 18:47:32 +02:00
int overlay , struct drm_plane * plane ,
unsigned int zpos )
2017-12-01 07:05:41 +01:00
{
struct drm_plane_state * state = plane - > state ;
2017-12-01 07:05:44 +01:00
u32 src_w , src_h , dst_w , dst_h ;
2018-11-04 19:26:46 +01:00
u32 bld_base , ch_base ;
2017-12-01 07:05:44 +01:00
u32 outsize , insize ;
u32 hphase , vphase ;
2017-12-01 07:05:41 +01:00
2017-12-01 07:05:44 +01:00
DRM_DEBUG_DRIVER ( " Updating UI channel %d overlay %d \n " ,
channel , overlay ) ;
2017-12-01 07:05:41 +01:00
2018-11-04 19:26:46 +01:00
bld_base = sun8i_blender_base ( mixer ) ;
ch_base = sun8i_channel_base ( mixer , channel ) ;
2017-12-01 07:05:44 +01:00
src_w = drm_rect_width ( & state - > src ) > > 16 ;
src_h = drm_rect_height ( & state - > src ) > > 16 ;
dst_w = drm_rect_width ( & state - > dst ) ;
dst_h = drm_rect_height ( & state - > dst ) ;
hphase = state - > src . x1 & 0xffff ;
vphase = state - > src . y1 & 0xffff ;
insize = SUN8I_MIXER_SIZE ( src_w , src_h ) ;
outsize = SUN8I_MIXER_SIZE ( dst_w , dst_h ) ;
2017-12-01 07:05:41 +01:00
if ( plane - > type = = DRM_PLANE_TYPE_PRIMARY ) {
bool interlaced = false ;
u32 val ;
DRM_DEBUG_DRIVER ( " Primary layer, updating global size W: %u H: %u \n " ,
2017-12-01 07:05:44 +01:00
dst_w , dst_h ) ;
2017-12-01 07:05:41 +01:00
regmap_write ( mixer - > engine . regs ,
SUN8I_MIXER_GLOBAL_SIZE ,
2017-12-01 07:05:44 +01:00
outsize ) ;
2018-11-04 19:26:46 +01:00
regmap_write ( mixer - > engine . regs ,
SUN8I_MIXER_BLEND_OUTSIZE ( bld_base ) , outsize ) ;
2017-12-01 07:05:41 +01:00
if ( state - > crtc )
interlaced = state - > crtc - > state - > adjusted_mode . flags
& DRM_MODE_FLAG_INTERLACE ;
if ( interlaced )
val = SUN8I_MIXER_BLEND_OUTCTL_INTERLACED ;
else
val = 0 ;
regmap_update_bits ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_BLEND_OUTCTL ( bld_base ) ,
2017-12-01 07:05:41 +01:00
SUN8I_MIXER_BLEND_OUTCTL_INTERLACED ,
val ) ;
DRM_DEBUG_DRIVER ( " Switching display mixer interlaced mode %s \n " ,
interlaced ? " on " : " off " ) ;
}
/* Set height and width */
2017-12-01 07:05:44 +01:00
DRM_DEBUG_DRIVER ( " Layer source offset X: %d Y: %d \n " ,
state - > src . x1 > > 16 , state - > src . y1 > > 16 ) ;
DRM_DEBUG_DRIVER ( " Layer source size W: %d H: %d \n " , src_w , src_h ) ;
2017-12-01 07:05:41 +01:00
regmap_write ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_CHAN_UI_LAYER_SIZE ( ch_base , overlay ) ,
2017-12-01 07:05:44 +01:00
insize ) ;
2017-12-01 07:05:41 +01:00
regmap_write ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_CHAN_UI_OVL_SIZE ( ch_base ) ,
2017-12-01 07:05:44 +01:00
insize ) ;
if ( insize ! = outsize | | hphase | | vphase ) {
u32 hscale , vscale ;
DRM_DEBUG_DRIVER ( " HW scaling is enabled \n " ) ;
hscale = state - > src_w / state - > crtc_w ;
vscale = state - > src_h / state - > crtc_h ;
sun8i_ui_scaler_setup ( mixer , channel , src_w , src_h , dst_w ,
dst_h , hscale , vscale , hphase , vphase ) ;
sun8i_ui_scaler_enable ( mixer , channel , true ) ;
} else {
DRM_DEBUG_DRIVER ( " HW scaling is not needed \n " ) ;
sun8i_ui_scaler_enable ( mixer , channel , false ) ;
}
2017-12-01 07:05:41 +01:00
/* Set base coordinates */
2017-12-01 07:05:44 +01:00
DRM_DEBUG_DRIVER ( " Layer destination coordinates X: %d Y: %d \n " ,
2017-12-01 07:05:41 +01:00
state - > dst . x1 , state - > dst . y1 ) ;
2017-12-01 07:05:44 +01:00
DRM_DEBUG_DRIVER ( " Layer destination size W: %d H: %d \n " , dst_w , dst_h ) ;
2017-12-01 07:05:41 +01:00
regmap_write ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_BLEND_ATTR_COORD ( bld_base , zpos ) ,
2017-12-01 07:05:41 +01:00
SUN8I_MIXER_COORD ( state - > dst . x1 , state - > dst . y1 ) ) ;
regmap_write ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_BLEND_ATTR_INSIZE ( bld_base , zpos ) ,
2017-12-01 07:05:44 +01:00
outsize ) ;
2017-12-01 07:05:41 +01:00
return 0 ;
}
static int sun8i_ui_layer_update_formats ( struct sun8i_mixer * mixer , int channel ,
int overlay , struct drm_plane * plane )
{
struct drm_plane_state * state = plane - > state ;
2020-02-24 18:38:58 +01:00
const struct drm_format_info * fmt ;
2020-02-24 18:39:00 +01:00
u32 val , ch_base , hw_fmt ;
int ret ;
2018-11-04 19:26:46 +01:00
ch_base = sun8i_channel_base ( mixer , channel ) ;
2017-12-01 07:05:41 +01:00
2020-02-24 18:38:58 +01:00
fmt = state - > fb - > format ;
2020-02-24 18:39:00 +01:00
ret = sun8i_mixer_drm_format_to_hw ( fmt - > format , & hw_fmt ) ;
if ( ret | | fmt - > is_yuv ) {
2017-12-01 07:05:41 +01:00
DRM_DEBUG_DRIVER ( " Invalid format \n " ) ;
return - EINVAL ;
}
2020-02-24 18:39:00 +01:00
val = hw_fmt < < SUN8I_MIXER_CHAN_UI_LAYER_ATTR_FBFMT_OFFSET ;
2017-12-01 07:05:41 +01:00
regmap_update_bits ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_CHAN_UI_LAYER_ATTR ( ch_base , overlay ) ,
2017-12-01 07:05:41 +01:00
SUN8I_MIXER_CHAN_UI_LAYER_ATTR_FBFMT_MASK , val ) ;
return 0 ;
}
static int sun8i_ui_layer_update_buffer ( struct sun8i_mixer * mixer , int channel ,
int overlay , struct drm_plane * plane )
{
struct drm_plane_state * state = plane - > state ;
struct drm_framebuffer * fb = state - > fb ;
struct drm_gem_cma_object * gem ;
dma_addr_t paddr ;
2018-11-04 19:26:46 +01:00
u32 ch_base ;
2017-12-01 07:05:41 +01:00
int bpp ;
2018-11-04 19:26:46 +01:00
ch_base = sun8i_channel_base ( mixer , channel ) ;
2017-12-01 07:05:41 +01:00
/* Get the physical address of the buffer in memory */
gem = drm_fb_cma_get_gem_obj ( fb , 0 ) ;
DRM_DEBUG_DRIVER ( " Using GEM @ %pad \n " , & gem - > paddr ) ;
/* Compute the start of the displayed memory */
bpp = fb - > format - > cpp [ 0 ] ;
paddr = gem - > paddr + fb - > offsets [ 0 ] ;
/* Fixup framebuffer address for src coordinates */
paddr + = ( state - > src . x1 > > 16 ) * bpp ;
paddr + = ( state - > src . y1 > > 16 ) * fb - > pitches [ 0 ] ;
/* Set the line width */
DRM_DEBUG_DRIVER ( " Layer line width: %d bytes \n " , fb - > pitches [ 0 ] ) ;
regmap_write ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_CHAN_UI_LAYER_PITCH ( ch_base , overlay ) ,
2017-12-01 07:05:41 +01:00
fb - > pitches [ 0 ] ) ;
DRM_DEBUG_DRIVER ( " Setting buffer address to %pad \n " , & paddr ) ;
regmap_write ( mixer - > engine . regs ,
2018-11-04 19:26:46 +01:00
SUN8I_MIXER_CHAN_UI_LAYER_TOP_LADDR ( ch_base , overlay ) ,
2017-12-01 07:05:41 +01:00
lower_32_bits ( paddr ) ) ;
return 0 ;
}
static int sun8i_ui_layer_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 13:00:24 +01:00
struct drm_atomic_state * state )
2017-12-01 07:05:41 +01: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 13:00:24 +01:00
struct drm_plane_state * new_plane_state = drm_atomic_get_new_plane_state ( state ,
plane ) ;
2017-12-01 07:05:44 +01:00
struct sun8i_ui_layer * layer = plane_to_sun8i_ui_layer ( plane ) ;
2021-02-19 13:00:22 +01:00
struct drm_crtc * crtc = new_plane_state - > crtc ;
2017-12-01 07:05:41 +01:00
struct drm_crtc_state * crtc_state ;
2017-12-01 07:05:44 +01:00
int min_scale , max_scale ;
2017-12-01 07:05:41 +01:00
if ( ! crtc )
return 0 ;
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 13:00:25 +01:00
crtc_state = drm_atomic_get_existing_crtc_state ( state ,
2021-02-19 13:00:22 +01:00
crtc ) ;
2017-12-01 07:05:41 +01:00
if ( WARN_ON ( ! crtc_state ) )
return - EINVAL ;
2017-12-01 07:05:44 +01:00
min_scale = DRM_PLANE_HELPER_NO_SCALING ;
max_scale = DRM_PLANE_HELPER_NO_SCALING ;
if ( layer - > mixer - > cfg - > scaler_mask & BIT ( layer - > channel ) ) {
min_scale = SUN8I_UI_SCALER_SCALE_MIN ;
max_scale = SUN8I_UI_SCALER_SCALE_MAX ;
}
2021-02-19 13:00:22 +01:00
return drm_atomic_helper_check_plane_state ( new_plane_state ,
crtc_state ,
2017-12-01 07:05:44 +01:00
min_scale , max_scale ,
2017-12-01 07:05:41 +01:00
true , true ) ;
}
static void sun8i_ui_layer_atomic_disable ( 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 13:00:29 +01:00
struct drm_atomic_state * state )
2017-12-01 07:05:41 +01: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 13:00:29 +01:00
struct drm_plane_state * old_state = drm_atomic_get_old_plane_state ( state ,
plane ) ;
2017-12-01 07:05:41 +01:00
struct sun8i_ui_layer * layer = plane_to_sun8i_ui_layer ( plane ) ;
2018-07-17 14:25:22 +02:00
unsigned int old_zpos = old_state - > normalized_zpos ;
2017-12-01 07:05:41 +01:00
struct sun8i_mixer * mixer = layer - > mixer ;
2018-07-17 14:25:22 +02:00
sun8i_ui_layer_enable ( mixer , layer - > channel , layer - > overlay , false , 0 ,
old_zpos ) ;
2017-12-01 07:05:41 +01:00
}
static void sun8i_ui_layer_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 13:00:29 +01:00
struct drm_atomic_state * state )
2017-12-01 07:05:41 +01: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 13:00:29 +01:00
struct drm_plane_state * old_state = drm_atomic_get_old_plane_state ( state ,
plane ) ;
drm: Use state helper instead of the plane state pointer
Many drivers reference the plane->state pointer in order to get the
current plane state in their atomic_update or atomic_disable hooks,
which would be the new plane state in the global atomic state since
_swap_state happened when those hooks are run.
Use the drm_atomic_get_new_plane_state helper to get that state to make it
more obvious.
This was made using the coccinelle script below:
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
(
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_update = func,
...,
};
)
@ adds_new_state @
identifier plane_atomic_func.func;
identifier plane, state;
identifier new_state;
@@
func(struct drm_plane *plane, struct drm_atomic_state *state)
{
...
- struct drm_plane_state *new_state = plane->state;
+ struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state, plane);
...
}
@ 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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20210219120032.260676-1-maxime@cerno.tech
2021-02-19 13:00:30 +01:00
struct drm_plane_state * new_state = drm_atomic_get_new_plane_state ( state ,
plane ) ;
2017-12-01 07:05:41 +01:00
struct sun8i_ui_layer * layer = plane_to_sun8i_ui_layer ( plane ) ;
drm: Store new plane state in a variable for atomic_update and disable
In order to store the new plane state in a subsequent helper, let's move
the plane->state dereferences into a variable.
This was done using the following coccinelle script, plus some hand
changes for vmwgfx:
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
(
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_update = func,
...,
};
)
@ has_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
identifier new_state;
symbol old_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
...
struct drm_plane_state *new_state = plane->state;
...
}
@ depends on !has_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
symbol old_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
+ struct drm_plane_state *new_state = plane->state;
<+...
- plane->state
+ new_state
...+>
}
@ has_new_state_state @
identifier plane_atomic_func.func;
identifier plane;
identifier new_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *state)
{
...
struct drm_plane_state *new_state = plane->state;
...
}
@ depends on !has_new_state_state @
identifier plane_atomic_func.func;
identifier plane;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *state)
{
+ struct drm_plane_state *new_plane_state = plane->state;
<+...
- plane->state
+ new_plane_state
...+>
}
@ has_new_state_old_s @
identifier plane_atomic_func.func;
identifier plane;
identifier new_state;
symbol old_s;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_s)
{
...
struct drm_plane_state *new_state = plane->state;
...
}
@ depends on !has_new_state_old_s @
identifier plane_atomic_func.func;
identifier plane;
symbol old_s;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_s)
{
+ struct drm_plane_state *new_s = plane->state;
<+...
- plane->state
+ new_s
...+>
}
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://lore.kernel.org/r/20210219120032.260676-1-maxime@cerno.tech
2021-02-19 13:00:27 +01:00
unsigned int zpos = new_state - > normalized_zpos ;
2018-07-17 14:25:22 +02:00
unsigned int old_zpos = old_state - > normalized_zpos ;
2017-12-01 07:05:41 +01:00
struct sun8i_mixer * mixer = layer - > mixer ;
drm: Store new plane state in a variable for atomic_update and disable
In order to store the new plane state in a subsequent helper, let's move
the plane->state dereferences into a variable.
This was done using the following coccinelle script, plus some hand
changes for vmwgfx:
@ plane_atomic_func @
identifier helpers;
identifier func;
@@
(
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_disable = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_update = func,
...,
};
)
@ has_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
identifier new_state;
symbol old_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
...
struct drm_plane_state *new_state = plane->state;
...
}
@ depends on !has_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
symbol old_state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
+ struct drm_plane_state *new_state = plane->state;
<+...
- plane->state
+ new_state
...+>
}
@ has_new_state_state @
identifier plane_atomic_func.func;
identifier plane;
identifier new_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *state)
{
...
struct drm_plane_state *new_state = plane->state;
...
}
@ depends on !has_new_state_state @
identifier plane_atomic_func.func;
identifier plane;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *state)
{
+ struct drm_plane_state *new_plane_state = plane->state;
<+...
- plane->state
+ new_plane_state
...+>
}
@ has_new_state_old_s @
identifier plane_atomic_func.func;
identifier plane;
identifier new_state;
symbol old_s;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_s)
{
...
struct drm_plane_state *new_state = plane->state;
...
}
@ depends on !has_new_state_old_s @
identifier plane_atomic_func.func;
identifier plane;
symbol old_s;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_s)
{
+ struct drm_plane_state *new_s = plane->state;
<+...
- plane->state
+ new_s
...+>
}
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://lore.kernel.org/r/20210219120032.260676-1-maxime@cerno.tech
2021-02-19 13:00:27 +01:00
if ( ! new_state - > visible ) {
2017-12-01 07:05:41 +01:00
sun8i_ui_layer_enable ( mixer , layer - > channel ,
2018-07-17 14:25:22 +02:00
layer - > overlay , false , 0 , old_zpos ) ;
2017-12-01 07:05:41 +01:00
return ;
}
sun8i_ui_layer_update_coord ( mixer , layer - > channel ,
drm/sun4i: Implement zpos for DE2
Initial implementation of DE2 planes only supported fixed zpos.
Expand implementation with configurable zpos property.
Implementation background:
Channel in DE2 driver represents one DRM plane, whereas pipe is just
mapped channel to known Z position. Pipe 0 will always be at the bottom,
pipe 1 just above pipe 0 and so on. If, for example, channel 1 is mapped
at pipe 0 and channel 0 at pipe 1, whatever is on channel 0 will appear
on top.
Before this commit, channel id was used for addressing channel related
registers (prefixed with SUN8I_MIXER_CHAN_UI_ or SUN8I_MIXER_CHAN_VI_)
and pipe registers (prefixed with SUN8I_MIXER_BLEND_). Additionally,
register SUN8I_MIXER_BLEND_ROUTE, which takes care for mapping channels
to pipes had fixed value. It mapped channel 0 to pipe 0, 1 to 1 and so
on. Consequence of all that was fixed Z order of planes.
With this commit, pipe registers are using zpos property as index and
channel related registers still use channel id as index. Pipe mapping
register is now set dynamically too and pipe enable register is rebuild
every time to make sure only active pipes are enabled.
Testing was done to confirm that there is no issues if bottom plane
contains pixels with alpha value < 0xff and if it doesn't whole screen.
Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706164732.24166-1-jernej.skrabec@siol.net
2018-07-06 18:47:32 +02:00
layer - > overlay , plane , zpos ) ;
2021-01-28 13:39:39 +02:00
sun8i_ui_layer_update_alpha ( mixer , layer - > channel ,
layer - > overlay , plane ) ;
2017-12-01 07:05:41 +01:00
sun8i_ui_layer_update_formats ( mixer , layer - > channel ,
layer - > overlay , plane ) ;
sun8i_ui_layer_update_buffer ( mixer , layer - > channel ,
layer - > overlay , plane ) ;
drm/sun4i: Implement zpos for DE2
Initial implementation of DE2 planes only supported fixed zpos.
Expand implementation with configurable zpos property.
Implementation background:
Channel in DE2 driver represents one DRM plane, whereas pipe is just
mapped channel to known Z position. Pipe 0 will always be at the bottom,
pipe 1 just above pipe 0 and so on. If, for example, channel 1 is mapped
at pipe 0 and channel 0 at pipe 1, whatever is on channel 0 will appear
on top.
Before this commit, channel id was used for addressing channel related
registers (prefixed with SUN8I_MIXER_CHAN_UI_ or SUN8I_MIXER_CHAN_VI_)
and pipe registers (prefixed with SUN8I_MIXER_BLEND_). Additionally,
register SUN8I_MIXER_BLEND_ROUTE, which takes care for mapping channels
to pipes had fixed value. It mapped channel 0 to pipe 0, 1 to 1 and so
on. Consequence of all that was fixed Z order of planes.
With this commit, pipe registers are using zpos property as index and
channel related registers still use channel id as index. Pipe mapping
register is now set dynamically too and pipe enable register is rebuild
every time to make sure only active pipes are enabled.
Testing was done to confirm that there is no issues if bottom plane
contains pixels with alpha value < 0xff and if it doesn't whole screen.
Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706164732.24166-1-jernej.skrabec@siol.net
2018-07-06 18:47:32 +02:00
sun8i_ui_layer_enable ( mixer , layer - > channel , layer - > overlay ,
2018-07-17 14:25:22 +02:00
true , zpos , old_zpos ) ;
2017-12-01 07:05:41 +01:00
}
2020-08-04 23:53:37 +02:00
static const struct drm_plane_helper_funcs sun8i_ui_layer_helper_funcs = {
2017-12-01 07:05:41 +01:00
. atomic_check = sun8i_ui_layer_atomic_check ,
. atomic_disable = sun8i_ui_layer_atomic_disable ,
. atomic_update = sun8i_ui_layer_atomic_update ,
} ;
static const struct drm_plane_funcs sun8i_ui_layer_funcs = {
. atomic_destroy_state = drm_atomic_helper_plane_destroy_state ,
. atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state ,
. destroy = drm_plane_cleanup ,
. disable_plane = drm_atomic_helper_disable_plane ,
. reset = drm_atomic_helper_plane_reset ,
. update_plane = drm_atomic_helper_update_plane ,
} ;
static const u32 sun8i_ui_layer_formats [ ] = {
DRM_FORMAT_ABGR1555 ,
DRM_FORMAT_ABGR4444 ,
DRM_FORMAT_ABGR8888 ,
DRM_FORMAT_ARGB1555 ,
DRM_FORMAT_ARGB4444 ,
DRM_FORMAT_ARGB8888 ,
DRM_FORMAT_BGR565 ,
DRM_FORMAT_BGR888 ,
DRM_FORMAT_BGRA5551 ,
DRM_FORMAT_BGRA4444 ,
DRM_FORMAT_BGRA8888 ,
DRM_FORMAT_BGRX8888 ,
DRM_FORMAT_RGB565 ,
DRM_FORMAT_RGB888 ,
DRM_FORMAT_RGBA4444 ,
DRM_FORMAT_RGBA5551 ,
DRM_FORMAT_RGBA8888 ,
DRM_FORMAT_RGBX8888 ,
DRM_FORMAT_XBGR8888 ,
DRM_FORMAT_XRGB8888 ,
} ;
2021-06-05 09:35:34 +02:00
static const uint64_t sun8i_layer_modifiers [ ] = {
DRM_FORMAT_MOD_LINEAR ,
DRM_FORMAT_MOD_INVALID
} ;
2017-12-01 07:05:41 +01:00
struct sun8i_ui_layer * sun8i_ui_layer_init_one ( struct drm_device * drm ,
struct sun8i_mixer * mixer ,
int index )
{
enum drm_plane_type type = DRM_PLANE_TYPE_OVERLAY ;
int channel = mixer - > cfg - > vi_num + index ;
struct sun8i_ui_layer * layer ;
drm/sun4i: Implement zpos for DE2
Initial implementation of DE2 planes only supported fixed zpos.
Expand implementation with configurable zpos property.
Implementation background:
Channel in DE2 driver represents one DRM plane, whereas pipe is just
mapped channel to known Z position. Pipe 0 will always be at the bottom,
pipe 1 just above pipe 0 and so on. If, for example, channel 1 is mapped
at pipe 0 and channel 0 at pipe 1, whatever is on channel 0 will appear
on top.
Before this commit, channel id was used for addressing channel related
registers (prefixed with SUN8I_MIXER_CHAN_UI_ or SUN8I_MIXER_CHAN_VI_)
and pipe registers (prefixed with SUN8I_MIXER_BLEND_). Additionally,
register SUN8I_MIXER_BLEND_ROUTE, which takes care for mapping channels
to pipes had fixed value. It mapped channel 0 to pipe 0, 1 to 1 and so
on. Consequence of all that was fixed Z order of planes.
With this commit, pipe registers are using zpos property as index and
channel related registers still use channel id as index. Pipe mapping
register is now set dynamically too and pipe enable register is rebuild
every time to make sure only active pipes are enabled.
Testing was done to confirm that there is no issues if bottom plane
contains pixels with alpha value < 0xff and if it doesn't whole screen.
Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706164732.24166-1-jernej.skrabec@siol.net
2018-07-06 18:47:32 +02:00
unsigned int plane_cnt ;
2017-12-01 07:05:41 +01:00
int ret ;
layer = devm_kzalloc ( drm - > dev , sizeof ( * layer ) , GFP_KERNEL ) ;
if ( ! layer )
return ERR_PTR ( - ENOMEM ) ;
if ( index = = 0 )
type = DRM_PLANE_TYPE_PRIMARY ;
/* possible crtcs are set later */
ret = drm_universal_plane_init ( drm , & layer - > plane , 0 ,
& sun8i_ui_layer_funcs ,
sun8i_ui_layer_formats ,
ARRAY_SIZE ( sun8i_ui_layer_formats ) ,
2021-06-05 09:35:34 +02:00
sun8i_layer_modifiers , type , NULL ) ;
2017-12-01 07:05:41 +01:00
if ( ret ) {
dev_err ( drm - > dev , " Couldn't initialize layer \n " ) ;
return ERR_PTR ( ret ) ;
}
drm/sun4i: Implement zpos for DE2
Initial implementation of DE2 planes only supported fixed zpos.
Expand implementation with configurable zpos property.
Implementation background:
Channel in DE2 driver represents one DRM plane, whereas pipe is just
mapped channel to known Z position. Pipe 0 will always be at the bottom,
pipe 1 just above pipe 0 and so on. If, for example, channel 1 is mapped
at pipe 0 and channel 0 at pipe 1, whatever is on channel 0 will appear
on top.
Before this commit, channel id was used for addressing channel related
registers (prefixed with SUN8I_MIXER_CHAN_UI_ or SUN8I_MIXER_CHAN_VI_)
and pipe registers (prefixed with SUN8I_MIXER_BLEND_). Additionally,
register SUN8I_MIXER_BLEND_ROUTE, which takes care for mapping channels
to pipes had fixed value. It mapped channel 0 to pipe 0, 1 to 1 and so
on. Consequence of all that was fixed Z order of planes.
With this commit, pipe registers are using zpos property as index and
channel related registers still use channel id as index. Pipe mapping
register is now set dynamically too and pipe enable register is rebuild
every time to make sure only active pipes are enabled.
Testing was done to confirm that there is no issues if bottom plane
contains pixels with alpha value < 0xff and if it doesn't whole screen.
Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706164732.24166-1-jernej.skrabec@siol.net
2018-07-06 18:47:32 +02:00
plane_cnt = mixer - > cfg - > ui_num + mixer - > cfg - > vi_num ;
2021-01-28 13:39:39 +02:00
ret = drm_plane_create_alpha_property ( & layer - > plane ) ;
if ( ret ) {
dev_err ( drm - > dev , " Couldn't add alpha property \n " ) ;
return ERR_PTR ( ret ) ;
}
drm/sun4i: Implement zpos for DE2
Initial implementation of DE2 planes only supported fixed zpos.
Expand implementation with configurable zpos property.
Implementation background:
Channel in DE2 driver represents one DRM plane, whereas pipe is just
mapped channel to known Z position. Pipe 0 will always be at the bottom,
pipe 1 just above pipe 0 and so on. If, for example, channel 1 is mapped
at pipe 0 and channel 0 at pipe 1, whatever is on channel 0 will appear
on top.
Before this commit, channel id was used for addressing channel related
registers (prefixed with SUN8I_MIXER_CHAN_UI_ or SUN8I_MIXER_CHAN_VI_)
and pipe registers (prefixed with SUN8I_MIXER_BLEND_). Additionally,
register SUN8I_MIXER_BLEND_ROUTE, which takes care for mapping channels
to pipes had fixed value. It mapped channel 0 to pipe 0, 1 to 1 and so
on. Consequence of all that was fixed Z order of planes.
With this commit, pipe registers are using zpos property as index and
channel related registers still use channel id as index. Pipe mapping
register is now set dynamically too and pipe enable register is rebuild
every time to make sure only active pipes are enabled.
Testing was done to confirm that there is no issues if bottom plane
contains pixels with alpha value < 0xff and if it doesn't whole screen.
Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180706164732.24166-1-jernej.skrabec@siol.net
2018-07-06 18:47:32 +02:00
ret = drm_plane_create_zpos_property ( & layer - > plane , channel ,
0 , plane_cnt - 1 ) ;
2017-12-01 07:05:41 +01:00
if ( ret ) {
dev_err ( drm - > dev , " Couldn't add zpos property \n " ) ;
return ERR_PTR ( ret ) ;
}
drm_plane_helper_add ( & layer - > plane , & sun8i_ui_layer_helper_funcs ) ;
layer - > mixer = mixer ;
layer - > channel = channel ;
layer - > overlay = 0 ;
return layer ;
}
