2019-05-29 07:17:56 -07:00
// SPDX-License-Identifier: GPL-2.0-only
2014-08-22 18:36:26 +08:00
/*
* Copyright ( C ) Fuzhou Rockchip Electronics Co . Ltd
* Author : Mark Yao < mark . yao @ rock - chips . com >
*/
2019-07-16 08:42:19 +02:00
# include <linux/clk.h>
# include <linux/component.h>
# include <linux/delay.h>
# include <linux/iopoll.h>
# include <linux/kernel.h>
2021-10-19 22:58:42 +01:00
# include <linux/log2.h>
2019-07-16 08:42:19 +02:00
# include <linux/module.h>
# include <linux/of.h>
# include <linux/of_device.h>
# include <linux/overflow.h>
# include <linux/platform_device.h>
# include <linux/pm_runtime.h>
# include <linux/reset.h>
2014-08-22 18:36:26 +08:00
# include <drm/drm.h>
2015-11-30 18:22:42 +08:00
# include <drm/drm_atomic.h>
2018-12-05 10:33:10 -02:00
# include <drm/drm_atomic_uapi.h>
2022-06-13 23:03:12 +03:00
# include <drm/drm_blend.h>
2014-08-22 18:36:26 +08:00
# include <drm/drm_crtc.h>
2016-09-14 21:54:57 +09:00
# include <drm/drm_flip_work.h>
2019-07-16 08:42:19 +02:00
# include <drm/drm_fourcc.h>
2022-06-14 12:54:49 +03:00
# include <drm/drm_framebuffer.h>
2021-02-22 15:17:56 +01:00
# include <drm/drm_gem_atomic_helper.h>
2018-11-30 11:24:49 +01:00
# include <drm/drm_gem_framebuffer_helper.h>
2019-01-17 22:03:34 +01:00
# include <drm/drm_probe_helper.h>
2019-06-11 12:08:22 -04:00
# include <drm/drm_self_refresh_helper.h>
2019-07-16 08:42:19 +02:00
# include <drm/drm_vblank.h>
2017-03-06 15:02:26 -05:00
# ifdef CONFIG_DRM_ANALOGIX_DP
2017-03-03 14:39:36 +01:00
# include <drm/bridge/analogix_dp.h>
2017-03-06 15:02:26 -05:00
# endif
2014-08-22 18:36:26 +08:00
# include "rockchip_drm_drv.h"
# include "rockchip_drm_gem.h"
# include "rockchip_drm_fb.h"
# include "rockchip_drm_vop.h"
2018-08-30 23:12:06 +02:00
# include "rockchip_rgb.h"
2014-08-22 18:36:26 +08:00
2019-01-09 15:56:37 -03:00
# define VOP_WIN_SET(vop, win, name, v) \
2017-07-28 14:06:25 +08:00
vop_reg_set ( vop , & win - > phy - > name , win - > base , ~ 0 , v , # name )
2019-01-09 15:56:37 -03:00
# define VOP_SCL_SET(vop, win, name, v) \
2017-07-28 14:06:25 +08:00
vop_reg_set ( vop , & win - > phy - > scl - > name , win - > base , ~ 0 , v , # name )
2019-01-09 15:56:37 -03:00
# define VOP_SCL_SET_EXT(vop, win, name, v) \
2017-07-28 14:06:25 +08:00
vop_reg_set ( vop , & win - > phy - > scl - > ext - > name , \
win - > base , ~ 0 , v , # name )
2017-07-26 14:19:19 +08:00
2019-01-09 15:56:37 -03:00
# define VOP_WIN_YUV2YUV_SET(vop, win_yuv2yuv, name, v) \
2019-01-08 18:46:59 -03:00
do { \
if ( win_yuv2yuv & & win_yuv2yuv - > name . mask ) \
vop_reg_set ( vop , & win_yuv2yuv - > name , 0 , ~ 0 , v , # name ) ; \
} while ( 0 )
2019-01-09 15:56:37 -03:00
# define VOP_WIN_YUV2YUV_COEFFICIENT_SET(vop, win_yuv2yuv, name, v) \
2019-01-08 18:46:59 -03:00
do { \
if ( win_yuv2yuv & & win_yuv2yuv - > phy - > name . mask ) \
vop_reg_set ( vop , & win_yuv2yuv - > phy - > name , win_yuv2yuv - > base , ~ 0 , v , # name ) ; \
} while ( 0 )
2017-07-26 14:19:19 +08:00
# define VOP_INTR_SET_MASK(vop, name, mask, v) \
2017-07-28 14:06:25 +08:00
vop_reg_set ( vop , & vop - > data - > intr - > name , 0 , mask , v , # name )
# define VOP_REG_SET(vop, group, name, v) \
vop_reg_set ( vop , & vop - > data - > group - > name , 0 , ~ 0 , v , # name )
2017-07-26 14:19:19 +08:00
2021-10-19 22:58:42 +01:00
# define VOP_HAS_REG(vop, group, name) \
( ! ! ( vop - > data - > group - > name . mask ) )
2015-12-15 08:36:55 +08:00
# define VOP_INTR_SET_TYPE(vop, name, type, v) \
do { \
2016-01-12 18:05:18 +00:00
int i , reg = 0 , mask = 0 ; \
2015-12-15 08:36:55 +08:00
for ( i = 0 ; i < vop - > data - > intr - > nintrs ; i + + ) { \
2016-01-12 18:05:18 +00:00
if ( vop - > data - > intr - > intrs [ i ] & type ) { \
2015-12-15 08:36:55 +08:00
reg | = ( v ) < < i ; \
2016-01-12 18:05:18 +00:00
mask | = 1 < < i ; \
} \
2015-12-15 08:36:55 +08:00
} \
2017-07-26 14:19:19 +08:00
VOP_INTR_SET_MASK ( vop , name , mask , reg ) ; \
2015-12-15 08:36:55 +08:00
} while ( 0 )
# define VOP_INTR_GET_TYPE(vop, name, type) \
vop_get_intr_type ( vop , & vop - > data - > intr - > name , type )
2019-01-09 15:56:37 -03:00
# define VOP_WIN_GET(vop, win, name) \
2019-07-03 10:51:11 +01:00
vop_read_reg ( vop , win - > base , & win - > phy - > name )
2014-08-22 18:36:26 +08:00
2019-01-09 15:56:39 -03:00
# define VOP_WIN_HAS_REG(win, name) \
( ! ! ( win - > phy - > name . mask ) )
2014-08-22 18:36:26 +08:00
# define VOP_WIN_GET_YRGBADDR(vop, win) \
vop_readl ( vop , win - > base + win - > phy - > yrgb_mst . offset )
2018-04-18 10:31:52 -07:00
# define VOP_WIN_TO_INDEX(vop_win) \
( ( vop_win ) - ( vop_win ) - > vop - > win )
2020-03-11 15:55:41 +01:00
# define VOP_AFBC_SET(vop, name, v) \
do { \
if ( ( vop ) - > data - > afbc ) \
vop_reg_set ( ( vop ) , & ( vop ) - > data - > afbc - > name , \
0 , ~ 0 , v , # name ) ; \
} while ( 0 )
2014-08-22 18:36:26 +08:00
# define to_vop(x) container_of(x, struct vop, crtc)
# define to_vop_win(x) container_of(x, struct vop_win, base)
2020-03-11 15:55:41 +01:00
# define AFBC_FMT_RGB565 0x0
# define AFBC_FMT_U8U8U8U8 0x5
# define AFBC_FMT_U8U8U8 0x4
# define AFBC_TILE_16x16 BIT(4)
2019-01-08 18:46:59 -03:00
/*
* The coefficients of the following matrix are all fixed points .
* The format is S2 .10 for the 3 x3 part of the matrix , and S9 .12 for the offsets .
* They are all represented in two ' s complement .
*/
static const uint32_t bt601_yuv2rgb [ ] = {
0x4A8 , 0x0 , 0x662 ,
0x4A8 , 0x1E6F , 0x1CBF ,
0x4A8 , 0x812 , 0x0 ,
0x321168 , 0x0877CF , 0x2EB127
} ;
2016-09-14 21:54:57 +09:00
enum vop_pending {
VOP_PENDING_FB_UNREF ,
} ;
2014-08-22 18:36:26 +08:00
struct vop_win {
struct drm_plane base ;
const struct vop_win_data * data ;
2019-01-08 18:46:59 -03:00
const struct vop_win_yuv2yuv_data * yuv2yuv_data ;
2014-08-22 18:36:26 +08:00
struct vop * vop ;
} ;
2018-08-30 23:12:06 +02:00
struct rockchip_rgb ;
2014-08-22 18:36:26 +08:00
struct vop {
struct drm_crtc crtc ;
struct device * dev ;
struct drm_device * drm_dev ;
2015-01-22 14:37:56 +08:00
bool is_enabled ;
2014-08-22 18:36:26 +08:00
2015-02-04 13:10:31 +08:00
struct completion dsp_hold_completion ;
2019-06-11 12:08:24 -04:00
unsigned int win_enabled ;
2016-06-08 14:19:11 +02:00
/* protected by dev->event_lock */
2015-11-30 18:22:42 +08:00
struct drm_pending_vblank_event * event ;
2014-08-22 18:36:26 +08:00
2016-09-14 21:54:57 +09:00
struct drm_flip_work fb_unref_work ;
unsigned long pending ;
2016-07-24 14:57:40 +08:00
struct completion line_flag_completion ;
2014-08-22 18:36:26 +08:00
const struct vop_data * data ;
uint32_t * regsbak ;
void __iomem * regs ;
2019-10-10 16:43:50 -03:00
void __iomem * lut_regs ;
2014-08-22 18:36:26 +08:00
/* physical map length of vop register */
uint32_t len ;
/* one time only one process allowed to config the register */
spinlock_t reg_lock ;
/* lock vop irq reg */
spinlock_t irq_lock ;
2018-03-09 23:22:55 +01:00
/* protects crtc enable/disable */
struct mutex vop_lock ;
2014-08-22 18:36:26 +08:00
unsigned int irq ;
/* vop AHP clk */
struct clk * hclk ;
/* vop dclk */
struct clk * dclk ;
/* vop share memory frequency */
struct clk * aclk ;
/* vop dclk reset */
struct reset_control * dclk_rst ;
2018-08-30 23:12:06 +02:00
/* optional internal rgb encoder */
struct rockchip_rgb * rgb ;
2014-08-22 18:36:26 +08:00
struct vop_win win [ ] ;
} ;
static inline uint32_t vop_readl ( struct vop * vop , uint32_t offset )
{
return readl ( vop - > regs + offset ) ;
}
static inline uint32_t vop_read_reg ( struct vop * vop , uint32_t base ,
const struct vop_reg * reg )
{
return ( vop_readl ( vop , base + reg - > offset ) > > reg - > shift ) & reg - > mask ;
}
2017-07-28 14:06:25 +08:00
static void vop_reg_set ( struct vop * vop , const struct vop_reg * reg ,
uint32_t _offset , uint32_t _mask , uint32_t v ,
const char * reg_name )
2014-08-22 18:36:26 +08:00
{
2017-07-28 14:06:25 +08:00
int offset , mask , shift ;
if ( ! reg | | ! reg - > mask ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_DEBUG ( vop - > dev , " Warning: not support %s \n " , reg_name ) ;
2016-04-20 14:18:15 +08:00
return ;
2017-07-28 14:06:25 +08:00
}
offset = reg - > offset + _offset ;
mask = reg - > mask & _mask ;
shift = reg - > shift ;
2014-08-22 18:36:26 +08:00
2017-07-28 14:06:25 +08:00
if ( reg - > write_mask ) {
2016-04-20 14:18:15 +08:00
v = ( ( v < < shift ) & 0xffff ) | ( mask < < ( shift + 16 ) ) ;
} else {
2014-08-22 18:36:26 +08:00
uint32_t cached_val = vop - > regsbak [ offset > > 2 ] ;
2016-04-20 14:18:15 +08:00
v = ( cached_val & ~ ( mask < < shift ) ) | ( ( v & mask ) < < shift ) ;
vop - > regsbak [ offset > > 2 ] = v ;
2014-08-22 18:36:26 +08:00
}
2016-04-20 14:18:15 +08:00
2017-07-28 14:06:25 +08:00
if ( reg - > relaxed )
2016-04-20 14:18:15 +08:00
writel_relaxed ( v , vop - > regs + offset ) ;
else
writel ( v , vop - > regs + offset ) ;
2014-08-22 18:36:26 +08:00
}
2015-12-15 08:36:55 +08:00
static inline uint32_t vop_get_intr_type ( struct vop * vop ,
const struct vop_reg * reg , int type )
{
uint32_t i , ret = 0 ;
uint32_t regs = vop_read_reg ( vop , 0 , reg ) ;
for ( i = 0 ; i < vop - > data - > intr - > nintrs ; i + + ) {
if ( ( type & vop - > data - > intr - > intrs [ i ] ) & & ( regs & 1 < < i ) )
ret | = vop - > data - > intr - > intrs [ i ] ;
}
return ret ;
}
2015-12-14 18:14:36 +08:00
static inline void vop_cfg_done ( struct vop * vop )
{
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , common , cfg_done , 1 ) ;
2015-12-14 18:14:36 +08:00
}
2015-05-11 19:55:39 +09:00
static bool has_rb_swapped ( uint32_t format )
{
switch ( format ) {
case DRM_FORMAT_XBGR8888 :
case DRM_FORMAT_ABGR8888 :
case DRM_FORMAT_BGR888 :
case DRM_FORMAT_BGR565 :
return true ;
default :
return false ;
}
}
2022-01-14 15:40:38 +08:00
static bool has_uv_swapped ( uint32_t format )
{
switch ( format ) {
case DRM_FORMAT_NV21 :
case DRM_FORMAT_NV61 :
case DRM_FORMAT_NV42 :
return true ;
default :
return false ;
}
}
2014-08-22 18:36:26 +08:00
static enum vop_data_format vop_convert_format ( uint32_t format )
{
switch ( format ) {
case DRM_FORMAT_XRGB8888 :
case DRM_FORMAT_ARGB8888 :
2015-05-11 19:55:39 +09:00
case DRM_FORMAT_XBGR8888 :
case DRM_FORMAT_ABGR8888 :
2014-08-22 18:36:26 +08:00
return VOP_FMT_ARGB8888 ;
case DRM_FORMAT_RGB888 :
2015-05-11 19:55:39 +09:00
case DRM_FORMAT_BGR888 :
2014-08-22 18:36:26 +08:00
return VOP_FMT_RGB888 ;
case DRM_FORMAT_RGB565 :
2015-05-11 19:55:39 +09:00
case DRM_FORMAT_BGR565 :
2014-08-22 18:36:26 +08:00
return VOP_FMT_RGB565 ;
case DRM_FORMAT_NV12 :
2022-01-14 15:40:38 +08:00
case DRM_FORMAT_NV21 :
2014-08-22 18:36:26 +08:00
return VOP_FMT_YUV420SP ;
case DRM_FORMAT_NV16 :
2022-01-14 15:40:38 +08:00
case DRM_FORMAT_NV61 :
2014-08-22 18:36:26 +08:00
return VOP_FMT_YUV422SP ;
case DRM_FORMAT_NV24 :
2022-01-14 15:40:38 +08:00
case DRM_FORMAT_NV42 :
2014-08-22 18:36:26 +08:00
return VOP_FMT_YUV444SP ;
default :
2016-08-12 13:00:54 -04:00
DRM_ERROR ( " unsupported format[%08x] \n " , format ) ;
2014-08-22 18:36:26 +08:00
return - EINVAL ;
}
}
2020-03-11 15:55:41 +01:00
static int vop_convert_afbc_format ( uint32_t format )
{
switch ( format ) {
case DRM_FORMAT_XRGB8888 :
case DRM_FORMAT_ARGB8888 :
case DRM_FORMAT_XBGR8888 :
case DRM_FORMAT_ABGR8888 :
return AFBC_FMT_U8U8U8U8 ;
case DRM_FORMAT_RGB888 :
case DRM_FORMAT_BGR888 :
return AFBC_FMT_U8U8U8 ;
case DRM_FORMAT_RGB565 :
case DRM_FORMAT_BGR565 :
return AFBC_FMT_RGB565 ;
/* either of the below should not be reachable */
default :
DRM_WARN_ONCE ( " unsupported AFBC format[%08x] \n " , format ) ;
return - EINVAL ;
}
return - EINVAL ;
}
2015-06-26 17:14:46 +08:00
static uint16_t scl_vop_cal_scale ( enum scale_mode mode , uint32_t src ,
uint32_t dst , bool is_horizontal ,
int vsu_mode , int * vskiplines )
{
uint16_t val = 1 < < SCL_FT_DEFAULT_FIXPOINT_SHIFT ;
2018-02-23 14:22:50 +08:00
if ( vskiplines )
* vskiplines = 0 ;
2015-06-26 17:14:46 +08:00
if ( is_horizontal ) {
if ( mode = = SCALE_UP )
val = GET_SCL_FT_BIC ( src , dst ) ;
else if ( mode = = SCALE_DOWN )
val = GET_SCL_FT_BILI_DN ( src , dst ) ;
} else {
if ( mode = = SCALE_UP ) {
if ( vsu_mode = = SCALE_UP_BIL )
val = GET_SCL_FT_BILI_UP ( src , dst ) ;
else
val = GET_SCL_FT_BIC ( src , dst ) ;
} else if ( mode = = SCALE_DOWN ) {
if ( vskiplines ) {
* vskiplines = scl_get_vskiplines ( src , dst ) ;
val = scl_get_bili_dn_vskip ( src , dst ,
* vskiplines ) ;
} else {
val = GET_SCL_FT_BILI_DN ( src , dst ) ;
}
}
}
return val ;
}
static void scl_vop_cal_scl_fac ( struct vop * vop , const struct vop_win_data * win ,
uint32_t src_w , uint32_t src_h , uint32_t dst_w ,
2019-05-16 12:31:46 +02:00
uint32_t dst_h , const struct drm_format_info * info )
2015-06-26 17:14:46 +08:00
{
uint16_t yrgb_hor_scl_mode , yrgb_ver_scl_mode ;
uint16_t cbcr_hor_scl_mode = SCALE_NONE ;
uint16_t cbcr_ver_scl_mode = SCALE_NONE ;
2018-07-17 18:13:44 +01:00
bool is_yuv = false ;
2019-05-16 12:31:48 +02:00
uint16_t cbcr_src_w = src_w / info - > hsub ;
uint16_t cbcr_src_h = src_h / info - > vsub ;
2015-06-26 17:14:46 +08:00
uint16_t vsu_mode ;
uint16_t lb_mode ;
uint32_t val ;
2018-02-23 14:22:50 +08:00
int vskiplines ;
2015-06-26 17:14:46 +08:00
2018-07-17 18:13:44 +01:00
if ( info - > is_yuv )
is_yuv = true ;
2015-06-26 17:14:46 +08:00
if ( dst_w > 3840 ) {
2016-08-12 13:00:54 -04:00
DRM_DEV_ERROR ( vop - > dev , " Maximum dst width (3840) exceeded \n " ) ;
2015-06-26 17:14:46 +08:00
return ;
}
2015-12-15 09:08:43 +08:00
if ( ! win - > phy - > scl - > ext ) {
VOP_SCL_SET ( vop , win , scale_yrgb_x ,
scl_cal_scale2 ( src_w , dst_w ) ) ;
VOP_SCL_SET ( vop , win , scale_yrgb_y ,
scl_cal_scale2 ( src_h , dst_h ) ) ;
if ( is_yuv ) {
VOP_SCL_SET ( vop , win , scale_cbcr_x ,
2016-06-06 15:58:46 +08:00
scl_cal_scale2 ( cbcr_src_w , dst_w ) ) ;
2015-12-15 09:08:43 +08:00
VOP_SCL_SET ( vop , win , scale_cbcr_y ,
2016-06-06 15:58:46 +08:00
scl_cal_scale2 ( cbcr_src_h , dst_h ) ) ;
2015-12-15 09:08:43 +08:00
}
return ;
}
2015-06-26 17:14:46 +08:00
yrgb_hor_scl_mode = scl_get_scl_mode ( src_w , dst_w ) ;
yrgb_ver_scl_mode = scl_get_scl_mode ( src_h , dst_h ) ;
if ( is_yuv ) {
cbcr_hor_scl_mode = scl_get_scl_mode ( cbcr_src_w , dst_w ) ;
cbcr_ver_scl_mode = scl_get_scl_mode ( cbcr_src_h , dst_h ) ;
if ( cbcr_hor_scl_mode = = SCALE_DOWN )
lb_mode = scl_vop_cal_lb_mode ( dst_w , true ) ;
else
lb_mode = scl_vop_cal_lb_mode ( cbcr_src_w , true ) ;
} else {
if ( yrgb_hor_scl_mode = = SCALE_DOWN )
lb_mode = scl_vop_cal_lb_mode ( dst_w , false ) ;
else
lb_mode = scl_vop_cal_lb_mode ( src_w , false ) ;
}
2015-12-15 09:08:43 +08:00
VOP_SCL_SET_EXT ( vop , win , lb_mode , lb_mode ) ;
2015-06-26 17:14:46 +08:00
if ( lb_mode = = LB_RGB_3840X2 ) {
if ( yrgb_ver_scl_mode ! = SCALE_NONE ) {
2016-08-12 13:00:54 -04:00
DRM_DEV_ERROR ( vop - > dev , " not allow yrgb ver scale \n " ) ;
2015-06-26 17:14:46 +08:00
return ;
}
if ( cbcr_ver_scl_mode ! = SCALE_NONE ) {
2016-08-12 13:00:54 -04:00
DRM_DEV_ERROR ( vop - > dev , " not allow cbcr ver scale \n " ) ;
2015-06-26 17:14:46 +08:00
return ;
}
vsu_mode = SCALE_UP_BIL ;
} else if ( lb_mode = = LB_RGB_2560X4 ) {
vsu_mode = SCALE_UP_BIL ;
} else {
vsu_mode = SCALE_UP_BIC ;
}
val = scl_vop_cal_scale ( yrgb_hor_scl_mode , src_w , dst_w ,
true , 0 , NULL ) ;
VOP_SCL_SET ( vop , win , scale_yrgb_x , val ) ;
val = scl_vop_cal_scale ( yrgb_ver_scl_mode , src_h , dst_h ,
false , vsu_mode , & vskiplines ) ;
VOP_SCL_SET ( vop , win , scale_yrgb_y , val ) ;
2015-12-15 09:08:43 +08:00
VOP_SCL_SET_EXT ( vop , win , vsd_yrgb_gt4 , vskiplines = = 4 ) ;
VOP_SCL_SET_EXT ( vop , win , vsd_yrgb_gt2 , vskiplines = = 2 ) ;
2015-06-26 17:14:46 +08:00
2015-12-15 09:08:43 +08:00
VOP_SCL_SET_EXT ( vop , win , yrgb_hor_scl_mode , yrgb_hor_scl_mode ) ;
VOP_SCL_SET_EXT ( vop , win , yrgb_ver_scl_mode , yrgb_ver_scl_mode ) ;
VOP_SCL_SET_EXT ( vop , win , yrgb_hsd_mode , SCALE_DOWN_BIL ) ;
VOP_SCL_SET_EXT ( vop , win , yrgb_vsd_mode , SCALE_DOWN_BIL ) ;
VOP_SCL_SET_EXT ( vop , win , yrgb_vsu_mode , vsu_mode ) ;
2015-06-26 17:14:46 +08:00
if ( is_yuv ) {
val = scl_vop_cal_scale ( cbcr_hor_scl_mode , cbcr_src_w ,
dst_w , true , 0 , NULL ) ;
VOP_SCL_SET ( vop , win , scale_cbcr_x , val ) ;
val = scl_vop_cal_scale ( cbcr_ver_scl_mode , cbcr_src_h ,
dst_h , false , vsu_mode , & vskiplines ) ;
VOP_SCL_SET ( vop , win , scale_cbcr_y , val ) ;
2015-12-15 09:08:43 +08:00
VOP_SCL_SET_EXT ( vop , win , vsd_cbcr_gt4 , vskiplines = = 4 ) ;
VOP_SCL_SET_EXT ( vop , win , vsd_cbcr_gt2 , vskiplines = = 2 ) ;
VOP_SCL_SET_EXT ( vop , win , cbcr_hor_scl_mode , cbcr_hor_scl_mode ) ;
VOP_SCL_SET_EXT ( vop , win , cbcr_ver_scl_mode , cbcr_ver_scl_mode ) ;
VOP_SCL_SET_EXT ( vop , win , cbcr_hsd_mode , SCALE_DOWN_BIL ) ;
VOP_SCL_SET_EXT ( vop , win , cbcr_vsd_mode , SCALE_DOWN_BIL ) ;
VOP_SCL_SET_EXT ( vop , win , cbcr_vsu_mode , vsu_mode ) ;
2015-06-26 17:14:46 +08:00
}
}
2015-02-04 13:10:31 +08:00
static void vop_dsp_hold_valid_irq_enable ( struct vop * vop )
{
unsigned long flags ;
if ( WARN_ON ( ! vop - > is_enabled ) )
return ;
spin_lock_irqsave ( & vop - > irq_lock , flags ) ;
2016-09-14 21:54:54 +09:00
VOP_INTR_SET_TYPE ( vop , clear , DSP_HOLD_VALID_INTR , 1 ) ;
2015-12-15 08:36:55 +08:00
VOP_INTR_SET_TYPE ( vop , enable , DSP_HOLD_VALID_INTR , 1 ) ;
2015-02-04 13:10:31 +08:00
spin_unlock_irqrestore ( & vop - > irq_lock , flags ) ;
}
static void vop_dsp_hold_valid_irq_disable ( struct vop * vop )
{
unsigned long flags ;
if ( WARN_ON ( ! vop - > is_enabled ) )
return ;
spin_lock_irqsave ( & vop - > irq_lock , flags ) ;
2015-12-15 08:36:55 +08:00
VOP_INTR_SET_TYPE ( vop , enable , DSP_HOLD_VALID_INTR , 0 ) ;
2015-02-04 13:10:31 +08:00
spin_unlock_irqrestore ( & vop - > irq_lock , flags ) ;
}
2016-07-24 14:57:40 +08:00
/*
* ( 1 ) each frame starts at the start of the Vsync pulse which is signaled by
* the " FRAME_SYNC " interrupt .
* ( 2 ) the active data region of each frame ends at dsp_vact_end
* ( 3 ) we should program this same number ( dsp_vact_end ) into dsp_line_frag_num ,
* to get " LINE_FLAG " interrupt at the end of the active on screen data .
*
* VOP_INTR_CTRL0 . dsp_line_frag_num = VOP_DSP_VACT_ST_END . dsp_vact_end
* Interrupts
* LINE_FLAG - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
* FRAME_SYNC - - - - + |
* | |
* v v
* | Vsync | Vbp | Vactive | Vfp |
* ^ ^ ^ ^
* | | | |
* | | | |
* dsp_vs_end - - - - - - - - - - - - + | | | VOP_DSP_VTOTAL_VS_END
* dsp_vact_start - - - - - - - - - - - - - - + | | VOP_DSP_VACT_ST_END
* dsp_vact_end - - - - - - - - - - - - - - - - - - - - - - - - - - - - + | VOP_DSP_VACT_ST_END
* dsp_total - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + VOP_DSP_VTOTAL_VS_END
*/
static bool vop_line_flag_irq_is_enabled ( struct vop * vop )
{
uint32_t line_flag_irq ;
unsigned long flags ;
spin_lock_irqsave ( & vop - > irq_lock , flags ) ;
line_flag_irq = VOP_INTR_GET_TYPE ( vop , enable , LINE_FLAG_INTR ) ;
spin_unlock_irqrestore ( & vop - > irq_lock , flags ) ;
return ! ! line_flag_irq ;
}
2017-04-27 14:54:17 +08:00
static void vop_line_flag_irq_enable ( struct vop * vop )
2016-07-24 14:57:40 +08:00
{
unsigned long flags ;
if ( WARN_ON ( ! vop - > is_enabled ) )
return ;
spin_lock_irqsave ( & vop - > irq_lock , flags ) ;
2016-09-14 21:54:54 +09:00
VOP_INTR_SET_TYPE ( vop , clear , LINE_FLAG_INTR , 1 ) ;
2016-07-24 14:57:40 +08:00
VOP_INTR_SET_TYPE ( vop , enable , LINE_FLAG_INTR , 1 ) ;
spin_unlock_irqrestore ( & vop - > irq_lock , flags ) ;
}
static void vop_line_flag_irq_disable ( struct vop * vop )
{
unsigned long flags ;
if ( WARN_ON ( ! vop - > is_enabled ) )
return ;
spin_lock_irqsave ( & vop - > irq_lock , flags ) ;
VOP_INTR_SET_TYPE ( vop , enable , LINE_FLAG_INTR , 0 ) ;
spin_unlock_irqrestore ( & vop - > irq_lock , flags ) ;
}
2018-06-12 15:20:27 +02:00
static int vop_core_clks_enable ( struct vop * vop )
{
int ret ;
ret = clk_enable ( vop - > hclk ) ;
if ( ret < 0 )
return ret ;
ret = clk_enable ( vop - > aclk ) ;
if ( ret < 0 )
goto err_disable_hclk ;
return 0 ;
err_disable_hclk :
clk_disable ( vop - > hclk ) ;
return ret ;
}
static void vop_core_clks_disable ( struct vop * vop )
{
clk_disable ( vop - > aclk ) ;
clk_disable ( vop - > hclk ) ;
}
2019-06-11 12:08:23 -04:00
static void vop_win_disable ( struct vop * vop , const struct vop_win * vop_win )
2019-02-20 22:40:06 +00:00
{
2019-06-11 12:08:23 -04:00
const struct vop_win_data * win = vop_win - > data ;
2019-02-20 22:40:06 +00:00
if ( win - > phy - > scl & & win - > phy - > scl - > ext ) {
VOP_SCL_SET_EXT ( vop , win , yrgb_hor_scl_mode , SCALE_NONE ) ;
VOP_SCL_SET_EXT ( vop , win , yrgb_ver_scl_mode , SCALE_NONE ) ;
VOP_SCL_SET_EXT ( vop , win , cbcr_hor_scl_mode , SCALE_NONE ) ;
VOP_SCL_SET_EXT ( vop , win , cbcr_ver_scl_mode , SCALE_NONE ) ;
}
VOP_WIN_SET ( vop , win , enable , 0 ) ;
2019-06-11 12:08:24 -04:00
vop - > win_enabled & = ~ BIT ( VOP_WIN_TO_INDEX ( vop_win ) ) ;
2019-02-20 22:40:06 +00:00
}
2019-06-11 12:08:22 -04:00
static int vop_enable ( struct drm_crtc * crtc , struct drm_crtc_state * old_state )
2014-08-22 18:36:26 +08:00
{
struct vop * vop = to_vop ( crtc ) ;
drm/rockchip: vop: fix iommu page fault when resume
Iommu would get page fault with following path:
vop_disable:
1, disable all windows and set vop config done
2, vop enter to standy, all windows not works, but their registers
are not clean, when you read window's enable bit, may found the
window is enable.
vop_enable:
1, memcpy(vop->regsbak, vop->regs, len)
save current vop registers to vop->regsbak, then you can found
window is enable on regsbak.
2, VOP_WIN_SET(vop, win, gate, 1);
force enable window gate, but gate and enable are on same
hardware register, then window enable bit rewrite to vop hardware.
3, vop power on, and vop might try to scan destroyed buffer,
then iommu get page fault.
Move windows disable after vop regsbak restore, then vop regsbak mechanism
would keep tracing the modify, everything would be safe.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Reviewed-by: Sandy huang <sandy.huang@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1501494582-6934-1-git-send-email-mark.yao@rock-chips.com
2017-07-31 17:49:42 +08:00
int ret , i ;
2014-08-22 18:36:26 +08:00
2022-06-15 06:26:44 +00:00
ret = pm_runtime_resume_and_get ( vop - > dev ) ;
2015-04-01 13:48:53 +08:00
if ( ret < 0 ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev , " failed to get pm runtime: %d \n " , ret ) ;
2017-04-06 20:31:20 +08:00
return ret ;
2015-04-01 13:48:53 +08:00
}
2018-06-12 15:20:27 +02:00
ret = vop_core_clks_enable ( vop ) ;
2016-08-15 16:12:29 -07:00
if ( WARN_ON ( ret < 0 ) )
goto err_put_pm_runtime ;
2014-08-22 18:36:26 +08:00
ret = clk_enable ( vop - > dclk ) ;
2016-08-15 16:12:29 -07:00
if ( WARN_ON ( ret < 0 ) )
2018-06-12 15:20:27 +02:00
goto err_disable_core ;
2014-08-22 18:36:26 +08:00
/*
* Slave iommu shares power , irq and clock with vop . It was associated
* automatically with this master device via common driver code .
* Now that we have enabled the clock we attach it to the shared drm
* mapping .
*/
ret = rockchip_drm_dma_attach_device ( vop - > drm_dev , vop - > dev ) ;
if ( ret ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev ,
" failed to attach dma mapping, %d \n " , ret ) ;
2018-06-12 15:20:27 +02:00
goto err_disable_dclk ;
2014-08-22 18:36:26 +08:00
}
2018-02-20 13:01:19 +00:00
spin_lock ( & vop - > reg_lock ) ;
for ( i = 0 ; i < vop - > len ; i + = 4 )
writel_relaxed ( vop - > regsbak [ i / 4 ] , vop - > regs + i ) ;
drm/rockchip: vop: fix iommu page fault when resume
Iommu would get page fault with following path:
vop_disable:
1, disable all windows and set vop config done
2, vop enter to standy, all windows not works, but their registers
are not clean, when you read window's enable bit, may found the
window is enable.
vop_enable:
1, memcpy(vop->regsbak, vop->regs, len)
save current vop registers to vop->regsbak, then you can found
window is enable on regsbak.
2, VOP_WIN_SET(vop, win, gate, 1);
force enable window gate, but gate and enable are on same
hardware register, then window enable bit rewrite to vop hardware.
3, vop power on, and vop might try to scan destroyed buffer,
then iommu get page fault.
Move windows disable after vop regsbak restore, then vop regsbak mechanism
would keep tracing the modify, everything would be safe.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Reviewed-by: Sandy huang <sandy.huang@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1501494582-6934-1-git-send-email-mark.yao@rock-chips.com
2017-07-31 17:49:42 +08:00
/*
* We need to make sure that all windows are disabled before we
* enable the crtc . Otherwise we might try to scan from a destroyed
* buffer later .
2019-06-11 12:08:22 -04:00
*
* In the case of enable - after - PSR , we don ' t need to worry about this
* case since the buffer is guaranteed to be valid and disabling the
* window will result in screen glitches on PSR exit .
drm/rockchip: vop: fix iommu page fault when resume
Iommu would get page fault with following path:
vop_disable:
1, disable all windows and set vop config done
2, vop enter to standy, all windows not works, but their registers
are not clean, when you read window's enable bit, may found the
window is enable.
vop_enable:
1, memcpy(vop->regsbak, vop->regs, len)
save current vop registers to vop->regsbak, then you can found
window is enable on regsbak.
2, VOP_WIN_SET(vop, win, gate, 1);
force enable window gate, but gate and enable are on same
hardware register, then window enable bit rewrite to vop hardware.
3, vop power on, and vop might try to scan destroyed buffer,
then iommu get page fault.
Move windows disable after vop regsbak restore, then vop regsbak mechanism
would keep tracing the modify, everything would be safe.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Reviewed-by: Sandy huang <sandy.huang@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1501494582-6934-1-git-send-email-mark.yao@rock-chips.com
2017-07-31 17:49:42 +08:00
*/
2019-06-11 12:08:22 -04:00
if ( ! old_state | | ! old_state - > self_refresh_active ) {
for ( i = 0 ; i < vop - > data - > win_size ; i + + ) {
struct vop_win * vop_win = & vop - > win [ i ] ;
drm/rockchip: vop: fix iommu page fault when resume
Iommu would get page fault with following path:
vop_disable:
1, disable all windows and set vop config done
2, vop enter to standy, all windows not works, but their registers
are not clean, when you read window's enable bit, may found the
window is enable.
vop_enable:
1, memcpy(vop->regsbak, vop->regs, len)
save current vop registers to vop->regsbak, then you can found
window is enable on regsbak.
2, VOP_WIN_SET(vop, win, gate, 1);
force enable window gate, but gate and enable are on same
hardware register, then window enable bit rewrite to vop hardware.
3, vop power on, and vop might try to scan destroyed buffer,
then iommu get page fault.
Move windows disable after vop regsbak restore, then vop regsbak mechanism
would keep tracing the modify, everything would be safe.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Reviewed-by: Sandy huang <sandy.huang@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1501494582-6934-1-git-send-email-mark.yao@rock-chips.com
2017-07-31 17:49:42 +08:00
2019-06-11 12:08:23 -04:00
vop_win_disable ( vop , vop_win ) ;
2019-06-11 12:08:22 -04:00
}
drm/rockchip: vop: fix iommu page fault when resume
Iommu would get page fault with following path:
vop_disable:
1, disable all windows and set vop config done
2, vop enter to standy, all windows not works, but their registers
are not clean, when you read window's enable bit, may found the
window is enable.
vop_enable:
1, memcpy(vop->regsbak, vop->regs, len)
save current vop registers to vop->regsbak, then you can found
window is enable on regsbak.
2, VOP_WIN_SET(vop, win, gate, 1);
force enable window gate, but gate and enable are on same
hardware register, then window enable bit rewrite to vop hardware.
3, vop power on, and vop might try to scan destroyed buffer,
then iommu get page fault.
Move windows disable after vop regsbak restore, then vop regsbak mechanism
would keep tracing the modify, everything would be safe.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Reviewed-by: Sandy huang <sandy.huang@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1501494582-6934-1-git-send-email-mark.yao@rock-chips.com
2017-07-31 17:49:42 +08:00
}
2020-03-11 15:55:41 +01:00
if ( vop - > data - > afbc ) {
struct rockchip_crtc_state * s ;
/*
* Disable AFBC and forget there was a vop window with AFBC
*/
VOP_AFBC_SET ( vop , enable , 0 ) ;
s = to_rockchip_crtc_state ( crtc - > state ) ;
s - > enable_afbc = false ;
}
2016-08-26 20:39:38 -07:00
vop_cfg_done ( vop ) ;
2020-05-05 16:16:13 +01:00
spin_unlock ( & vop - > reg_lock ) ;
2015-01-22 18:29:57 +08:00
/*
* At here , vop clock & iommu is enable , R / W vop regs would be safe .
*/
vop - > is_enabled = true ;
2014-08-22 18:36:26 +08:00
spin_lock ( & vop - > reg_lock ) ;
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , common , standby , 1 ) ;
2014-08-22 18:36:26 +08:00
spin_unlock ( & vop - > reg_lock ) ;
2015-11-23 15:21:08 +08:00
drm_crtc_vblank_on ( crtc ) ;
2014-08-22 18:36:26 +08:00
2016-08-15 16:12:29 -07:00
return 0 ;
2014-08-22 18:36:26 +08:00
err_disable_dclk :
clk_disable ( vop - > dclk ) ;
2018-06-12 15:20:27 +02:00
err_disable_core :
vop_core_clks_disable ( vop ) ;
2016-08-15 16:12:29 -07:00
err_put_pm_runtime :
pm_runtime_put_sync ( vop - > dev ) ;
return ret ;
2014-08-22 18:36:26 +08:00
}
2019-06-11 12:08:24 -04:00
static void rockchip_drm_set_win_enabled ( struct drm_crtc * crtc , bool enabled )
{
struct vop * vop = to_vop ( crtc ) ;
int i ;
spin_lock ( & vop - > reg_lock ) ;
for ( i = 0 ; i < vop - > data - > win_size ; i + + ) {
struct vop_win * vop_win = & vop - > win [ i ] ;
const struct vop_win_data * win = vop_win - > data ;
VOP_WIN_SET ( vop , win , enable ,
enabled & & ( vop - > win_enabled & BIT ( i ) ) ) ;
}
vop_cfg_done ( vop ) ;
spin_unlock ( & vop - > reg_lock ) ;
}
2017-06-30 12:36:45 +03:00
static void vop_crtc_atomic_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 14:44:08 +02:00
struct drm_atomic_state * state )
2014-08-22 18:36:26 +08:00
{
struct vop * vop = to_vop ( crtc ) ;
2016-06-08 14:19:12 +02:00
WARN_ON ( vop - > event ) ;
2019-06-11 12:08:24 -04:00
if ( crtc - > state - > self_refresh_active )
rockchip_drm_set_win_enabled ( crtc , false ) ;
2019-06-11 12:08:22 -04:00
2019-06-11 12:08:24 -04:00
mutex_lock ( & vop - > vop_lock ) ;
2019-06-11 12:08:22 -04:00
2015-11-23 15:21:08 +08:00
drm_crtc_vblank_off ( crtc ) ;
2014-08-22 18:36:26 +08:00
2019-06-11 12:08:24 -04:00
if ( crtc - > state - > self_refresh_active )
goto out ;
2014-08-22 18:36:26 +08:00
/*
2015-02-04 13:10:31 +08:00
* Vop standby will take effect at end of current frame ,
* if dsp hold valid irq happen , it means standby complete .
*
* we must wait standby complete when we want to disable aclk ,
* if not , memory bus maybe dead .
2014-08-22 18:36:26 +08:00
*/
2015-02-04 13:10:31 +08:00
reinit_completion ( & vop - > dsp_hold_completion ) ;
vop_dsp_hold_valid_irq_enable ( vop ) ;
2014-08-22 18:36:26 +08:00
spin_lock ( & vop - > reg_lock ) ;
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , common , standby , 1 ) ;
2014-08-22 18:36:26 +08:00
spin_unlock ( & vop - > reg_lock ) ;
2015-01-22 18:29:57 +08:00
2021-10-08 15:31:04 -07:00
if ( ! wait_for_completion_timeout ( & vop - > dsp_hold_completion ,
msecs_to_jiffies ( 200 ) ) )
WARN ( 1 , " %s: timed out waiting for DSP hold " , crtc - > name ) ;
2015-02-04 13:10:31 +08:00
vop_dsp_hold_valid_irq_disable ( vop ) ;
2015-01-22 18:29:57 +08:00
vop - > is_enabled = false ;
2015-02-04 13:10:31 +08:00
2014-08-22 18:36:26 +08:00
/*
2015-02-04 13:10:31 +08:00
* vop standby complete , so iommu detach is safe .
2014-08-22 18:36:26 +08:00
*/
rockchip_drm_dma_detach_device ( vop - > drm_dev , vop - > dev ) ;
2015-02-04 13:10:31 +08:00
clk_disable ( vop - > dclk ) ;
2018-06-12 15:20:27 +02:00
vop_core_clks_disable ( vop ) ;
2015-04-01 13:48:53 +08:00
pm_runtime_put ( vop - > dev ) ;
2019-06-11 12:08:24 -04:00
out :
2018-03-09 23:22:55 +01:00
mutex_unlock ( & vop - > vop_lock ) ;
2016-06-08 14:19:12 +02:00
if ( crtc - > state - > event & & ! crtc - > state - > active ) {
spin_lock_irq ( & crtc - > dev - > event_lock ) ;
drm_crtc_send_vblank_event ( crtc , crtc - > state - > event ) ;
spin_unlock_irq ( & crtc - > dev - > event_lock ) ;
crtc - > state - > event = NULL ;
}
2014-08-22 18:36:26 +08:00
}
2015-11-30 18:22:42 +08:00
static void vop_plane_destroy ( struct drm_plane * plane )
2014-08-22 18:36:26 +08:00
{
2015-11-30 18:22:42 +08:00
drm_plane_cleanup ( plane ) ;
2014-08-22 18:36:26 +08:00
}
2020-03-11 15:55:41 +01:00
static inline bool rockchip_afbc ( u64 modifier )
{
return modifier = = ROCKCHIP_AFBC_MOD ;
}
static bool rockchip_mod_supported ( struct drm_plane * plane ,
u32 format , u64 modifier )
{
if ( modifier = = DRM_FORMAT_MOD_LINEAR )
return true ;
if ( ! rockchip_afbc ( modifier ) ) {
2020-04-15 09:34:20 +01:00
DRM_DEBUG_KMS ( " Unsupported format modifier 0x%llx \n " , modifier ) ;
2020-03-11 15:55:41 +01:00
return false ;
}
return vop_convert_afbc_format ( format ) > = 0 ;
}
2015-11-30 18:22:42 +08:00
static int vop_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 13:00:24 +01:00
struct drm_atomic_state * state )
2014-08-22 18:36:26 +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 13:00:24 +01:00
struct drm_plane_state * new_plane_state = drm_atomic_get_new_plane_state ( state ,
plane ) ;
2021-02-19 13:00:22 +01:00
struct drm_crtc * crtc = new_plane_state - > crtc ;
2016-03-04 11:04:03 +00:00
struct drm_crtc_state * crtc_state ;
2021-02-19 13:00:22 +01:00
struct drm_framebuffer * fb = new_plane_state - > fb ;
2014-08-22 18:36:26 +08:00
struct vop_win * vop_win = to_vop_win ( plane ) ;
const struct vop_win_data * win = vop_win - > data ;
int ret ;
2015-06-26 17:14:46 +08:00
int min_scale = win - > phy - > scl ? FRAC_16_16 ( 1 , 8 ) :
2022-07-20 10:30:54 +02:00
DRM_PLANE_NO_SCALING ;
2015-06-26 17:14:46 +08:00
int max_scale = win - > phy - > scl ? FRAC_16_16 ( 8 , 1 ) :
2022-07-20 10:30:54 +02:00
DRM_PLANE_NO_SCALING ;
2014-08-22 18:36:26 +08:00
2019-12-13 18:26:08 +01:00
if ( ! crtc | | WARN_ON ( ! fb ) )
2016-09-14 21:55:01 +09:00
return 0 ;
2016-03-04 11:04:03 +00:00
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 ) ;
2016-03-04 11:04:03 +00:00
if ( WARN_ON ( ! crtc_state ) )
return - EINVAL ;
2021-02-19 13:00:22 +01:00
ret = drm_atomic_helper_check_plane_state ( new_plane_state , crtc_state ,
2017-11-01 22:16:19 +02:00
min_scale , max_scale ,
true , true ) ;
2014-08-22 18:36:26 +08:00
if ( ret )
return ret ;
2021-02-19 13:00:22 +01:00
if ( ! new_plane_state - > visible )
2016-09-14 21:55:01 +09:00
return 0 ;
2014-08-22 18:36:26 +08:00
2016-12-14 23:32:55 +02:00
ret = vop_convert_format ( fb - > format - > format ) ;
2016-09-14 21:55:01 +09:00
if ( ret < 0 )
return ret ;
2015-07-20 16:16:49 +08:00
2015-11-30 18:22:42 +08:00
/*
* Src . x1 can be odd when do clip , but yuv plane start point
* need align with 2 pixel .
*/
2021-02-19 13:00:22 +01:00
if ( fb - > format - > is_yuv & & ( ( new_plane_state - > src . x1 > > 16 ) % 2 ) ) {
2017-07-31 17:49:55 +08:00
DRM_ERROR ( " Invalid Source: Yuv format not support odd xpos \n " ) ;
2014-08-22 18:36:26 +08:00
return - EINVAL ;
2017-07-31 17:49:55 +08:00
}
2014-08-22 18:36:26 +08:00
2021-02-19 13:00:22 +01:00
if ( fb - > format - > is_yuv & & new_plane_state - > rotation & DRM_MODE_REFLECT_Y ) {
2019-01-09 15:56:39 -03:00
DRM_ERROR ( " Invalid Source: Yuv format does not support this rotation \n " ) ;
return - EINVAL ;
}
2020-03-11 15:55:41 +01:00
if ( rockchip_afbc ( fb - > modifier ) ) {
struct vop * vop = to_vop ( crtc ) ;
if ( ! vop - > data - > afbc ) {
DRM_ERROR ( " vop does not support AFBC \n " ) ;
return - EINVAL ;
}
ret = vop_convert_afbc_format ( fb - > format - > format ) ;
if ( ret < 0 )
return ret ;
2021-02-19 13:00:22 +01:00
if ( new_plane_state - > src . x1 | | new_plane_state - > src . y1 ) {
DRM_ERROR ( " AFBC does not support offset display, xpos=%d, ypos=%d, offset=%d \n " ,
new_plane_state - > src . x1 ,
new_plane_state - > src . y1 , fb - > offsets [ 0 ] ) ;
2020-03-11 15:55:41 +01:00
return - EINVAL ;
}
2021-02-19 13:00:22 +01:00
if ( new_plane_state - > rotation & & new_plane_state - > rotation ! = DRM_MODE_ROTATE_0 ) {
2020-03-11 15:55:41 +01:00
DRM_ERROR ( " No rotation support in AFBC, rotation=%d \n " ,
2021-02-19 13:00:22 +01:00
new_plane_state - > rotation ) ;
2020-03-11 15:55:41 +01:00
return - EINVAL ;
}
}
2015-11-30 18:22:42 +08:00
return 0 ;
}
2014-08-22 18:36:26 +08:00
2015-11-30 18:22:42 +08:00
static void vop_plane_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 )
2015-11-30 18:22:42 +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 13:00:29 +01:00
struct drm_plane_state * old_state = drm_atomic_get_old_plane_state ( state ,
plane ) ;
2015-11-30 18:22:42 +08:00
struct vop_win * vop_win = to_vop_win ( plane ) ;
struct vop * vop = to_vop ( old_state - > crtc ) ;
2014-08-22 18:36:26 +08:00
2015-11-30 18:22:42 +08:00
if ( ! old_state - > crtc )
return ;
2014-08-22 18:36:26 +08:00
2015-11-30 18:22:42 +08:00
spin_lock ( & vop - > reg_lock ) ;
2014-08-22 18:36:26 +08:00
2019-06-11 12:08:23 -04:00
vop_win_disable ( vop , vop_win ) ;
2015-07-20 16:16:49 +08:00
2015-11-30 18:22:42 +08:00
spin_unlock ( & vop - > reg_lock ) ;
}
2015-07-20 16:16:49 +08:00
2015-11-30 18:22:42 +08:00
static void vop_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 13:00:29 +01:00
struct drm_atomic_state * state )
2015-11-30 18:22:42 +08:00
{
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 ) ;
drm: Rename plane->state variables in atomic update and disable
Some drivers are storing the plane->state pointer in atomic_update and
atomic_disable in a variable simply called state, while the state passed
as an argument is called old_state.
In order to ease subsequent reworks and to avoid confusing or
inconsistent names, let's rename those variables to new_state.
This was done using the following coccinelle script, plus some manual
changes for mtk and tegra.
@ 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,
...,
};
)
@ moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
symbol old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_state = plane->state;
...
}
@ depends on moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ new_state
...>
}
@ moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
symbol oldstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *oldstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *newstate = plane->state;
...
}
@ depends on moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ newstate
...>
}
@ moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
symbol old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_pstate = plane->state;
...
}
@ depends on moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
<...
- state
+ new_pstate
...>
}
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://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-8-maxime@cerno.tech
2021-02-19 13:00:28 +01:00
struct drm_crtc * crtc = new_state - > crtc ;
2015-11-30 18:22:42 +08:00
struct vop_win * vop_win = to_vop_win ( plane ) ;
const struct vop_win_data * win = vop_win - > data ;
2019-01-08 18:46:59 -03:00
const struct vop_win_yuv2yuv_data * win_yuv2yuv = vop_win - > yuv2yuv_data ;
drm: Rename plane->state variables in atomic update and disable
Some drivers are storing the plane->state pointer in atomic_update and
atomic_disable in a variable simply called state, while the state passed
as an argument is called old_state.
In order to ease subsequent reworks and to avoid confusing or
inconsistent names, let's rename those variables to new_state.
This was done using the following coccinelle script, plus some manual
changes for mtk and tegra.
@ 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,
...,
};
)
@ moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
symbol old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_state = plane->state;
...
}
@ depends on moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ new_state
...>
}
@ moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
symbol oldstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *oldstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *newstate = plane->state;
...
}
@ depends on moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ newstate
...>
}
@ moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
symbol old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_pstate = plane->state;
...
}
@ depends on moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
<...
- state
+ new_pstate
...>
}
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://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-8-maxime@cerno.tech
2021-02-19 13:00:28 +01:00
struct vop * vop = to_vop ( new_state - > crtc ) ;
struct drm_framebuffer * fb = new_state - > fb ;
2015-11-30 18:22:42 +08:00
unsigned int actual_w , actual_h ;
unsigned int dsp_stx , dsp_sty ;
uint32_t act_info , dsp_info , dsp_st ;
drm: Rename plane->state variables in atomic update and disable
Some drivers are storing the plane->state pointer in atomic_update and
atomic_disable in a variable simply called state, while the state passed
as an argument is called old_state.
In order to ease subsequent reworks and to avoid confusing or
inconsistent names, let's rename those variables to new_state.
This was done using the following coccinelle script, plus some manual
changes for mtk and tegra.
@ 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,
...,
};
)
@ moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
symbol old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_state = plane->state;
...
}
@ depends on moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ new_state
...>
}
@ moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
symbol oldstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *oldstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *newstate = plane->state;
...
}
@ depends on moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ newstate
...>
}
@ moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
symbol old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_pstate = plane->state;
...
}
@ depends on moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
<...
- state
+ new_pstate
...>
}
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://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-8-maxime@cerno.tech
2021-02-19 13:00:28 +01:00
struct drm_rect * src = & new_state - > src ;
struct drm_rect * dest = & new_state - > dst ;
2015-11-30 18:22:42 +08:00
struct drm_gem_object * obj , * uv_obj ;
struct rockchip_gem_object * rk_obj , * rk_uv_obj ;
unsigned long offset ;
dma_addr_t dma_addr ;
uint32_t val ;
2022-01-14 15:40:38 +08:00
bool rb_swap , uv_swap ;
2018-04-18 10:31:52 -07:00
int win_index = VOP_WIN_TO_INDEX ( vop_win ) ;
2016-09-14 21:55:01 +09:00
int format ;
2019-01-08 18:46:59 -03:00
int is_yuv = fb - > format - > is_yuv ;
int i ;
2015-07-20 16:16:49 +08:00
2014-08-22 18:36:26 +08:00
/*
2015-11-30 18:22:42 +08:00
* can ' t update plane when vop is disabled .
2014-08-22 18:36:26 +08:00
*/
2016-06-08 14:19:11 +02:00
if ( WARN_ON ( ! crtc ) )
2015-11-30 18:22:42 +08:00
return ;
2014-08-22 18:36:26 +08:00
2015-11-30 18:22:42 +08:00
if ( WARN_ON ( ! vop - > is_enabled ) )
return ;
2014-08-22 18:36:26 +08:00
drm: Rename plane->state variables in atomic update and disable
Some drivers are storing the plane->state pointer in atomic_update and
atomic_disable in a variable simply called state, while the state passed
as an argument is called old_state.
In order to ease subsequent reworks and to avoid confusing or
inconsistent names, let's rename those variables to new_state.
This was done using the following coccinelle script, plus some manual
changes for mtk and tegra.
@ 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,
...,
};
)
@ moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
symbol old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_state = plane->state;
...
}
@ depends on moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ new_state
...>
}
@ moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
symbol oldstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *oldstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *newstate = plane->state;
...
}
@ depends on moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ newstate
...>
}
@ moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
symbol old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_pstate = plane->state;
...
}
@ depends on moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
<...
- state
+ new_pstate
...>
}
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://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-8-maxime@cerno.tech
2021-02-19 13:00:28 +01:00
if ( ! new_state - > visible ) {
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
vop_plane_atomic_disable ( plane , state ) ;
2015-11-30 18:22:42 +08:00
return ;
2014-08-22 18:36:26 +08:00
}
2015-11-30 18:22:42 +08:00
2018-03-30 15:11:19 +01:00
obj = fb - > obj [ 0 ] ;
2015-11-30 18:22:42 +08:00
rk_obj = to_rockchip_obj ( obj ) ;
actual_w = drm_rect_width ( src ) > > 16 ;
actual_h = drm_rect_height ( src ) > > 16 ;
act_info = ( actual_h - 1 ) < < 16 | ( ( actual_w - 1 ) & 0xffff ) ;
dsp_info = ( drm_rect_height ( dest ) - 1 ) < < 16 ;
dsp_info | = ( drm_rect_width ( dest ) - 1 ) & 0xffff ;
dsp_stx = dest - > x1 + crtc - > mode . htotal - crtc - > mode . hsync_start ;
dsp_sty = dest - > y1 + crtc - > mode . vtotal - crtc - > mode . vsync_start ;
dsp_st = dsp_sty < < 16 | ( dsp_stx & 0xffff ) ;
2016-12-14 23:30:57 +02:00
offset = ( src - > x1 > > 16 ) * fb - > format - > cpp [ 0 ] ;
2015-11-30 18:22:42 +08:00
offset + = ( src - > y1 > > 16 ) * fb - > pitches [ 0 ] ;
2016-09-14 21:55:01 +09:00
dma_addr = rk_obj - > dma_addr + offset + fb - > offsets [ 0 ] ;
2019-01-09 15:56:39 -03:00
/*
* For y - mirroring we need to move address
* to the beginning of the last line .
*/
drm: Rename plane->state variables in atomic update and disable
Some drivers are storing the plane->state pointer in atomic_update and
atomic_disable in a variable simply called state, while the state passed
as an argument is called old_state.
In order to ease subsequent reworks and to avoid confusing or
inconsistent names, let's rename those variables to new_state.
This was done using the following coccinelle script, plus some manual
changes for mtk and tegra.
@ 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,
...,
};
)
@ moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
symbol old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_state = plane->state;
...
}
@ depends on moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ new_state
...>
}
@ moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
symbol oldstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *oldstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *newstate = plane->state;
...
}
@ depends on moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ newstate
...>
}
@ moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
symbol old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_pstate = plane->state;
...
}
@ depends on moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
<...
- state
+ new_pstate
...>
}
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://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-8-maxime@cerno.tech
2021-02-19 13:00:28 +01:00
if ( new_state - > rotation & DRM_MODE_REFLECT_Y )
2019-01-09 15:56:39 -03:00
dma_addr + = ( actual_h - 1 ) * fb - > pitches [ 0 ] ;
2016-12-14 23:32:55 +02:00
format = vop_convert_format ( fb - > format - > format ) ;
2014-08-22 18:36:26 +08:00
spin_lock ( & vop - > reg_lock ) ;
2020-03-11 15:55:41 +01:00
if ( rockchip_afbc ( fb - > modifier ) ) {
int afbc_format = vop_convert_afbc_format ( fb - > format - > format ) ;
VOP_AFBC_SET ( vop , format , afbc_format | AFBC_TILE_16x16 ) ;
VOP_AFBC_SET ( vop , hreg_block_split , 0 ) ;
VOP_AFBC_SET ( vop , win_sel , VOP_WIN_TO_INDEX ( vop_win ) ) ;
VOP_AFBC_SET ( vop , hdr_ptr , dma_addr ) ;
VOP_AFBC_SET ( vop , pic_size , act_info ) ;
}
2016-09-14 21:55:01 +09:00
VOP_WIN_SET ( vop , win , format , format ) ;
2017-07-31 17:49:50 +08:00
VOP_WIN_SET ( vop , win , yrgb_vir , DIV_ROUND_UP ( fb - > pitches [ 0 ] , 4 ) ) ;
2016-09-14 21:55:01 +09:00
VOP_WIN_SET ( vop , win , yrgb_mst , dma_addr ) ;
2019-01-08 18:46:59 -03:00
VOP_WIN_YUV2YUV_SET ( vop , win_yuv2yuv , y2r_en , is_yuv ) ;
2019-01-09 15:56:39 -03:00
VOP_WIN_SET ( vop , win , y_mir_en ,
drm: Rename plane->state variables in atomic update and disable
Some drivers are storing the plane->state pointer in atomic_update and
atomic_disable in a variable simply called state, while the state passed
as an argument is called old_state.
In order to ease subsequent reworks and to avoid confusing or
inconsistent names, let's rename those variables to new_state.
This was done using the following coccinelle script, plus some manual
changes for mtk and tegra.
@ 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,
...,
};
)
@ moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
symbol old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_state = plane->state;
...
}
@ depends on moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ new_state
...>
}
@ moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
symbol oldstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *oldstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *newstate = plane->state;
...
}
@ depends on moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ newstate
...>
}
@ moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
symbol old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_pstate = plane->state;
...
}
@ depends on moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
<...
- state
+ new_pstate
...>
}
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://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-8-maxime@cerno.tech
2021-02-19 13:00:28 +01:00
( new_state - > rotation & DRM_MODE_REFLECT_Y ) ? 1 : 0 ) ;
2019-01-09 15:56:39 -03:00
VOP_WIN_SET ( vop , win , x_mir_en ,
drm: Rename plane->state variables in atomic update and disable
Some drivers are storing the plane->state pointer in atomic_update and
atomic_disable in a variable simply called state, while the state passed
as an argument is called old_state.
In order to ease subsequent reworks and to avoid confusing or
inconsistent names, let's rename those variables to new_state.
This was done using the following coccinelle script, plus some manual
changes for mtk and tegra.
@ 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,
...,
};
)
@ moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
symbol old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_state = plane->state;
...
}
@ depends on moves_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ new_state
...>
}
@ moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
symbol oldstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *oldstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *newstate = plane->state;
...
}
@ depends on moves_new_state_oldstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_state;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_state)
{
<...
- state
+ newstate
...>
}
@ moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
symbol old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
...
- struct drm_plane_state *state = plane->state;
+ struct drm_plane_state *new_pstate = plane->state;
...
}
@ depends on moves_new_state_old_pstate @
identifier plane_atomic_func.func;
identifier plane;
identifier old_pstate;
symbol state;
@@
func(struct drm_plane *plane, struct drm_plane_state *old_pstate)
{
<...
- state
+ new_pstate
...>
}
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://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-8-maxime@cerno.tech
2021-02-19 13:00:28 +01:00
( new_state - > rotation & DRM_MODE_REFLECT_X ) ? 1 : 0 ) ;
2019-01-08 18:46:59 -03:00
if ( is_yuv ) {
2019-05-16 12:31:48 +02:00
int hsub = fb - > format - > hsub ;
int vsub = fb - > format - > vsub ;
2016-12-14 23:30:57 +02:00
int bpp = fb - > format - > cpp [ 1 ] ;
2015-11-30 18:22:42 +08:00
2018-03-30 15:11:19 +01:00
uv_obj = fb - > obj [ 1 ] ;
2015-11-30 18:22:42 +08:00
rk_uv_obj = to_rockchip_obj ( uv_obj ) ;
offset = ( src - > x1 > > 16 ) * bpp / hsub ;
offset + = ( src - > y1 > > 16 ) * fb - > pitches [ 1 ] / vsub ;
dma_addr = rk_uv_obj - > dma_addr + offset + fb - > offsets [ 1 ] ;
2017-07-31 17:49:50 +08:00
VOP_WIN_SET ( vop , win , uv_vir , DIV_ROUND_UP ( fb - > pitches [ 1 ] , 4 ) ) ;
2015-11-30 18:22:42 +08:00
VOP_WIN_SET ( vop , win , uv_mst , dma_addr ) ;
2019-01-08 18:46:59 -03:00
for ( i = 0 ; i < NUM_YUV2YUV_COEFFICIENTS ; i + + ) {
VOP_WIN_YUV2YUV_COEFFICIENT_SET ( vop ,
win_yuv2yuv ,
y2r_coefficients [ i ] ,
bt601_yuv2rgb [ i ] ) ;
}
2022-01-14 15:40:38 +08:00
uv_swap = has_uv_swapped ( fb - > format - > format ) ;
VOP_WIN_SET ( vop , win , uv_swap , uv_swap ) ;
2015-07-20 16:16:49 +08:00
}
2015-06-26 17:14:46 +08:00
if ( win - > phy - > scl )
scl_vop_cal_scl_fac ( vop , win , actual_w , actual_h ,
2015-11-30 18:22:42 +08:00
drm_rect_width ( dest ) , drm_rect_height ( dest ) ,
2019-05-16 12:31:46 +02:00
fb - > format ) ;
2015-06-26 17:14:46 +08:00
2015-11-30 18:22:42 +08:00
VOP_WIN_SET ( vop , win , act_info , act_info ) ;
VOP_WIN_SET ( vop , win , dsp_info , dsp_info ) ;
VOP_WIN_SET ( vop , win , dsp_st , dsp_st ) ;
2015-06-26 17:14:46 +08:00
2016-12-14 23:32:55 +02:00
rb_swap = has_rb_swapped ( fb - > format - > format ) ;
2015-05-11 19:55:39 +09:00
VOP_WIN_SET ( vop , win , rb_swap , rb_swap ) ;
2014-08-22 18:36:26 +08:00
2018-04-18 10:31:52 -07:00
/*
* Blending win0 with the background color doesn ' t seem to work
* correctly . We only get the background color , no matter the contents
* of the win0 framebuffer . However , blending pre - multiplied color
* with the default opaque black default background color is a no - op ,
* so we can just disable blending to get the correct result .
*/
if ( fb - > format - > has_alpha & & win_index > 0 ) {
2014-08-22 18:36:26 +08:00
VOP_WIN_SET ( vop , win , dst_alpha_ctl ,
DST_FACTOR_M0 ( ALPHA_SRC_INVERSE ) ) ;
val = SRC_ALPHA_EN ( 1 ) | SRC_COLOR_M0 ( ALPHA_SRC_PRE_MUL ) |
SRC_ALPHA_M0 ( ALPHA_STRAIGHT ) |
SRC_BLEND_M0 ( ALPHA_PER_PIX ) |
SRC_ALPHA_CAL_M0 ( ALPHA_NO_SATURATION ) |
SRC_FACTOR_M0 ( ALPHA_ONE ) ;
VOP_WIN_SET ( vop , win , src_alpha_ctl , val ) ;
2020-04-16 16:05:26 +02:00
VOP_WIN_SET ( vop , win , alpha_pre_mul , ALPHA_SRC_PRE_MUL ) ;
VOP_WIN_SET ( vop , win , alpha_mode , ALPHA_PER_PIX ) ;
VOP_WIN_SET ( vop , win , alpha_en , 1 ) ;
2014-08-22 18:36:26 +08:00
} else {
VOP_WIN_SET ( vop , win , src_alpha_ctl , SRC_ALPHA_EN ( 0 ) ) ;
2021-05-28 15:05:54 +02:00
VOP_WIN_SET ( vop , win , alpha_en , 0 ) ;
2014-08-22 18:36:26 +08:00
}
VOP_WIN_SET ( vop , win , enable , 1 ) ;
2019-06-11 12:08:24 -04:00
vop - > win_enabled | = BIT ( win_index ) ;
2014-08-22 18:36:26 +08:00
spin_unlock ( & vop - > reg_lock ) ;
}
2018-12-05 10:33:10 -02:00
static int vop_plane_atomic_async_check ( struct drm_plane * plane ,
drm/atomic: Pass the full state to planes async atomic check 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 start convert all the remaining helpers to provide a consistent
interface, starting with the planes atomic_async_check and
atomic_async_update.
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 {
...
int (*atomic_async_check)(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_async_update)(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_async_check = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_async_update = 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_async_check(plane, plane_state)
+ FUNCS->atomic_async_check(plane, state)
...+>
}
@@
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_async_update(plane, plane_state)
+ FUNCS->atomic_async_update(plane, state)
...+>
}
@@
identifier mtk_plane_atomic_async_update;
identifier plane;
symbol new_state, state;
expression e;
@@
void mtk_plane_atomic_async_update(struct drm_plane *plane, struct drm_plane_state *new_state)
{
...
- struct mtk_plane_state *state = e;
+ struct mtk_plane_state *new_plane_state = e;
<+...
- state
+ new_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 *new_plane_state)
{
<...
- state
+ new_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, plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *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/...>
@@
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
...+>
}
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-1-maxime@cerno.tech
2021-02-19 13:00:21 +01:00
struct drm_atomic_state * state )
2018-12-05 10:33:10 -02:00
{
drm/atomic: Pass the full state to planes async atomic check 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 start convert all the remaining helpers to provide a consistent
interface, starting with the planes atomic_async_check and
atomic_async_update.
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 {
...
int (*atomic_async_check)(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_async_update)(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_async_check = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_async_update = 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_async_check(plane, plane_state)
+ FUNCS->atomic_async_check(plane, state)
...+>
}
@@
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_async_update(plane, plane_state)
+ FUNCS->atomic_async_update(plane, state)
...+>
}
@@
identifier mtk_plane_atomic_async_update;
identifier plane;
symbol new_state, state;
expression e;
@@
void mtk_plane_atomic_async_update(struct drm_plane *plane, struct drm_plane_state *new_state)
{
...
- struct mtk_plane_state *state = e;
+ struct mtk_plane_state *new_plane_state = e;
<+...
- state
+ new_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 *new_plane_state)
{
<...
- state
+ new_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, plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *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/...>
@@
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
...+>
}
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-1-maxime@cerno.tech
2021-02-19 13:00:21 +01:00
struct drm_plane_state * new_plane_state = drm_atomic_get_new_plane_state ( state ,
plane ) ;
2018-12-05 10:33:10 -02:00
struct vop_win * vop_win = to_vop_win ( plane ) ;
const struct vop_win_data * win = vop_win - > data ;
int min_scale = win - > phy - > scl ? FRAC_16_16 ( 1 , 8 ) :
2022-07-20 10:30:54 +02:00
DRM_PLANE_NO_SCALING ;
2018-12-05 10:33:10 -02:00
int max_scale = win - > phy - > scl ? FRAC_16_16 ( 8 , 1 ) :
2022-07-20 10:30:54 +02:00
DRM_PLANE_NO_SCALING ;
2018-12-05 10:33:10 -02:00
struct drm_crtc_state * crtc_state ;
drm/atomic: Pass the full state to planes async atomic check 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 start convert all the remaining helpers to provide a consistent
interface, starting with the planes atomic_async_check and
atomic_async_update.
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 {
...
int (*atomic_async_check)(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_async_update)(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_async_check = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_async_update = 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_async_check(plane, plane_state)
+ FUNCS->atomic_async_check(plane, state)
...+>
}
@@
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_async_update(plane, plane_state)
+ FUNCS->atomic_async_update(plane, state)
...+>
}
@@
identifier mtk_plane_atomic_async_update;
identifier plane;
symbol new_state, state;
expression e;
@@
void mtk_plane_atomic_async_update(struct drm_plane *plane, struct drm_plane_state *new_state)
{
...
- struct mtk_plane_state *state = e;
+ struct mtk_plane_state *new_plane_state = e;
<+...
- state
+ new_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 *new_plane_state)
{
<...
- state
+ new_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, plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *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/...>
@@
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
...+>
}
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-1-maxime@cerno.tech
2021-02-19 13:00:21 +01:00
if ( plane ! = new_plane_state - > crtc - > cursor )
2018-12-05 10:33:10 -02:00
return - EINVAL ;
if ( ! plane - > state )
return - EINVAL ;
if ( ! plane - > state - > fb )
return - EINVAL ;
drm/atomic: Pass the full state to planes async atomic check 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 start convert all the remaining helpers to provide a consistent
interface, starting with the planes atomic_async_check and
atomic_async_update.
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 {
...
int (*atomic_async_check)(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_async_update)(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_async_check = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_async_update = 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_async_check(plane, plane_state)
+ FUNCS->atomic_async_check(plane, state)
...+>
}
@@
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_async_update(plane, plane_state)
+ FUNCS->atomic_async_update(plane, state)
...+>
}
@@
identifier mtk_plane_atomic_async_update;
identifier plane;
symbol new_state, state;
expression e;
@@
void mtk_plane_atomic_async_update(struct drm_plane *plane, struct drm_plane_state *new_state)
{
...
- struct mtk_plane_state *state = e;
+ struct mtk_plane_state *new_plane_state = e;
<+...
- state
+ new_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 *new_plane_state)
{
<...
- state
+ new_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, plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *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/...>
@@
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
...+>
}
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-1-maxime@cerno.tech
2021-02-19 13:00:21 +01:00
if ( state )
crtc_state = drm_atomic_get_existing_crtc_state ( state ,
new_plane_state - > crtc ) ;
2018-12-05 10:33:10 -02:00
else /* Special case for asynchronous cursor updates. */
crtc_state = plane - > crtc - > state ;
return drm_atomic_helper_check_plane_state ( plane - > state , crtc_state ,
min_scale , max_scale ,
true , true ) ;
}
static void vop_plane_atomic_async_update ( struct drm_plane * plane ,
drm/atomic: Pass the full state to planes async atomic check 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 start convert all the remaining helpers to provide a consistent
interface, starting with the planes atomic_async_check and
atomic_async_update.
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 {
...
int (*atomic_async_check)(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_async_update)(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_async_check = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_async_update = 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_async_check(plane, plane_state)
+ FUNCS->atomic_async_check(plane, state)
...+>
}
@@
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_async_update(plane, plane_state)
+ FUNCS->atomic_async_update(plane, state)
...+>
}
@@
identifier mtk_plane_atomic_async_update;
identifier plane;
symbol new_state, state;
expression e;
@@
void mtk_plane_atomic_async_update(struct drm_plane *plane, struct drm_plane_state *new_state)
{
...
- struct mtk_plane_state *state = e;
+ struct mtk_plane_state *new_plane_state = e;
<+...
- state
+ new_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 *new_plane_state)
{
<...
- state
+ new_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, plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *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/...>
@@
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
...+>
}
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-1-maxime@cerno.tech
2021-02-19 13:00:21 +01:00
struct drm_atomic_state * state )
2018-12-05 10:33:10 -02:00
{
drm/atomic: Pass the full state to planes async atomic check 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 start convert all the remaining helpers to provide a consistent
interface, starting with the planes atomic_async_check and
atomic_async_update.
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 {
...
int (*atomic_async_check)(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_async_update)(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_async_check = func,
...,
};
|
static const struct drm_plane_helper_funcs helpers = {
...,
.atomic_async_update = 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_async_check(plane, plane_state)
+ FUNCS->atomic_async_check(plane, state)
...+>
}
@@
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_async_update(plane, plane_state)
+ FUNCS->atomic_async_update(plane, state)
...+>
}
@@
identifier mtk_plane_atomic_async_update;
identifier plane;
symbol new_state, state;
expression e;
@@
void mtk_plane_atomic_async_update(struct drm_plane *plane, struct drm_plane_state *new_state)
{
...
- struct mtk_plane_state *state = e;
+ struct mtk_plane_state *new_plane_state = e;
<+...
- state
+ new_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 *new_plane_state)
{
<...
- state
+ new_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, plane_state;
@@
func(struct drm_plane *plane,
- struct drm_plane_state *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/...>
@@
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
...+>
}
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-1-maxime@cerno.tech
2021-02-19 13:00:21 +01:00
struct drm_plane_state * new_state = drm_atomic_get_new_plane_state ( state ,
plane ) ;
2018-12-05 10:33:10 -02:00
struct vop * vop = to_vop ( plane - > state - > crtc ) ;
drm/rockchip: fix fb references in async update
In the case of async update, modifications are done in place, i.e. in the
current plane state, so the new_state is prepared and the new_state is
cleaned up (instead of the old_state, unlike what happens in a
normal sync update).
To cleanup the old_fb properly, it needs to be placed in the new_state
in the end of async_update, so cleanup call will unreference the old_fb
correctly.
Also, the previous code had a:
plane_state = plane->funcs->atomic_duplicate_state(plane);
...
swap(plane_state, plane->state);
if (plane->state->fb && plane->state->fb != new_state->fb) {
...
}
Which was wrong, as the fb were just assigned to be equal, so this if
statement nevers evaluates to true.
Another details is that the function drm_crtc_vblank_get() can only be
called when vop->is_enabled is true, otherwise it has no effect and
trows a WARN_ON().
Calling drm_atomic_set_fb_for_plane() (which get a referent of the new
fb and pus the old fb) is not required, as it is taken care by
drm_mode_cursor_universal() when calling
drm_atomic_helper_update_plane().
Fixes: 15609559a834 ("drm/rockchip: update cursors asynchronously through atomic.")
Cc: <stable@vger.kernel.org> # v4.20+
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190603165610.24614-2-helen.koike@collabora.com
2019-06-03 13:56:06 -03:00
struct drm_framebuffer * old_fb = plane - > state - > fb ;
plane - > state - > crtc_x = new_state - > crtc_x ;
plane - > state - > crtc_y = new_state - > crtc_y ;
plane - > state - > crtc_h = new_state - > crtc_h ;
plane - > state - > crtc_w = new_state - > crtc_w ;
plane - > state - > src_x = new_state - > src_x ;
plane - > state - > src_y = new_state - > src_y ;
plane - > state - > src_h = new_state - > src_h ;
plane - > state - > src_w = new_state - > src_w ;
swap ( plane - > state - > fb , new_state - > fb ) ;
2018-12-05 10:33:10 -02:00
if ( vop - > is_enabled ) {
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
vop_plane_atomic_update ( plane , state ) ;
2018-12-05 10:33:10 -02:00
spin_lock ( & vop - > reg_lock ) ;
vop_cfg_done ( vop ) ;
spin_unlock ( & vop - > reg_lock ) ;
drm/rockchip: fix fb references in async update
In the case of async update, modifications are done in place, i.e. in the
current plane state, so the new_state is prepared and the new_state is
cleaned up (instead of the old_state, unlike what happens in a
normal sync update).
To cleanup the old_fb properly, it needs to be placed in the new_state
in the end of async_update, so cleanup call will unreference the old_fb
correctly.
Also, the previous code had a:
plane_state = plane->funcs->atomic_duplicate_state(plane);
...
swap(plane_state, plane->state);
if (plane->state->fb && plane->state->fb != new_state->fb) {
...
}
Which was wrong, as the fb were just assigned to be equal, so this if
statement nevers evaluates to true.
Another details is that the function drm_crtc_vblank_get() can only be
called when vop->is_enabled is true, otherwise it has no effect and
trows a WARN_ON().
Calling drm_atomic_set_fb_for_plane() (which get a referent of the new
fb and pus the old fb) is not required, as it is taken care by
drm_mode_cursor_universal() when calling
drm_atomic_helper_update_plane().
Fixes: 15609559a834 ("drm/rockchip: update cursors asynchronously through atomic.")
Cc: <stable@vger.kernel.org> # v4.20+
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190603165610.24614-2-helen.koike@collabora.com
2019-06-03 13:56:06 -03:00
/*
* A scanout can still be occurring , so we can ' t drop the
* reference to the old framebuffer . To solve this we get a
* reference to old_fb and set a worker to release it later .
* FIXME : if we perform 500 async_update calls before the
* vblank , then we can have 500 different framebuffers waiting
* to be released .
*/
if ( old_fb & & plane - > state - > fb ! = old_fb ) {
drm_framebuffer_get ( old_fb ) ;
WARN_ON ( drm_crtc_vblank_get ( plane - > state - > crtc ) ! = 0 ) ;
drm_flip_work_queue ( & vop - > fb_unref_work , old_fb ) ;
set_bit ( VOP_PENDING_FB_UNREF , & vop - > pending ) ;
}
}
2018-12-05 10:33:10 -02:00
}
2015-11-30 18:22:42 +08:00
static const struct drm_plane_helper_funcs plane_helper_funcs = {
. atomic_check = vop_plane_atomic_check ,
. atomic_update = vop_plane_atomic_update ,
. atomic_disable = vop_plane_atomic_disable ,
2018-12-05 10:33:10 -02:00
. atomic_async_check = vop_plane_atomic_async_check ,
. atomic_async_update = vop_plane_atomic_async_update ,
2015-11-30 18:22:42 +08:00
} ;
2014-08-22 18:36:26 +08:00
static const struct drm_plane_funcs vop_plane_funcs = {
2015-11-30 18:22:42 +08:00
. update_plane = drm_atomic_helper_update_plane ,
. disable_plane = drm_atomic_helper_disable_plane ,
2014-08-22 18:36:26 +08:00
. destroy = vop_plane_destroy ,
2016-09-14 21:55:01 +09:00
. reset = drm_atomic_helper_plane_reset ,
. atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state ,
. atomic_destroy_state = drm_atomic_helper_plane_destroy_state ,
2020-03-11 15:55:41 +01:00
. format_mod_supported = rockchip_mod_supported ,
2014-08-22 18:36:26 +08:00
} ;
static int vop_crtc_enable_vblank ( struct drm_crtc * crtc )
{
struct vop * vop = to_vop ( crtc ) ;
unsigned long flags ;
2015-11-30 18:22:42 +08:00
if ( WARN_ON ( ! vop - > is_enabled ) )
2014-08-22 18:36:26 +08:00
return - EPERM ;
spin_lock_irqsave ( & vop - > irq_lock , flags ) ;
2016-09-14 21:54:54 +09:00
VOP_INTR_SET_TYPE ( vop , clear , FS_INTR , 1 ) ;
2015-12-15 08:36:55 +08:00
VOP_INTR_SET_TYPE ( vop , enable , FS_INTR , 1 ) ;
2014-08-22 18:36:26 +08:00
spin_unlock_irqrestore ( & vop - > irq_lock , flags ) ;
return 0 ;
}
static void vop_crtc_disable_vblank ( struct drm_crtc * crtc )
{
struct vop * vop = to_vop ( crtc ) ;
unsigned long flags ;
2015-11-30 18:22:42 +08:00
if ( WARN_ON ( ! vop - > is_enabled ) )
2014-08-22 18:36:26 +08:00
return ;
2015-01-22 14:37:56 +08:00
2014-08-22 18:36:26 +08:00
spin_lock_irqsave ( & vop - > irq_lock , flags ) ;
2015-12-15 08:36:55 +08:00
VOP_INTR_SET_TYPE ( vop , enable , FS_INTR , 0 ) ;
2014-08-22 18:36:26 +08:00
spin_unlock_irqrestore ( & vop - > irq_lock , flags ) ;
}
static bool vop_crtc_mode_fixup ( struct drm_crtc * crtc ,
const struct drm_display_mode * mode ,
struct drm_display_mode * adjusted_mode )
{
2016-01-06 12:03:53 +08:00
struct vop * vop = to_vop ( crtc ) ;
drm/rockchip: Round up _before_ giving to the clock framework
I'm embarassed to say that even though I've touched
vop_crtc_mode_fixup() twice and I swear I tested it, there's still a
stupid glaring bug in it. Specifically, on veyron_minnie (with all
the latest display timings) we want to be setting our pixel clock to
66,666,666.67 Hz and we tell userspace that's what we set, but we're
actually choosing 66,000,000 Hz. This is confirmed by looking at the
clock tree.
The problem is that in drm_display_mode_from_videomode() we convert
from Hz to kHz with:
dmode->clock = vm->pixelclock / 1000;
...and drm_display_mode_from_videomode() is called from panel-simple
when we have an "override_mode" like we do on veyron_minnie. See
commit 123643e5c40a ("ARM: dts: rockchip: Specify
rk3288-veyron-minnie's display timings").
...so when the device tree specifies a clock of 66666667 for the panel
then DRM translates that to 66666000. The clock framework will always
pick a clock that is _lower_ than the one requested, so it will refuse
to pick 66666667 and we'll end up at 66000000.
While we could try to fix drm_display_mode_from_videomode() to round
to the nearest kHz and it would fix our problem, it wouldn't help if
the clock we actually needed was 60,000,001 Hz. We could
alternatively have DRM always round up, but maybe this would break
someone else who already baked in the assumption that DRM rounds down.
Specifically note that clock drivers are not consistent about whether
they round up or round down when you call clk_set_rate(). We know how
Rockchip's clock driver works, but (for instance) you can see that on
most Qualcomm clocks the default is clk_rcg2_ops which rounds up.
Let's solve this by just adding 999 Hz before calling
clk_round_rate(). This should be safe and work everywhere. As
discussed in more detail in comments in the commit, Rockchip's PLLs
are configured in a way that there shouldn't be another PLL setting
that is only a few kHz off so we won't get mixed up.
NOTE: if this is picked to stable, it's probably easiest to first pick
commit 527e4ca3b6d1 ("drm/rockchip: Base adjustments of the mode based
on prev adjustments") which shouldn't hurt in stable.
Fixes: b59b8de31497 ("drm/rockchip: return a true clock rate to adjusted_mode")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191003114726.v2.1.Ib233b3e706cf6317858384264d5b0ed35657456e@changeid
2019-10-03 11:47:30 -07:00
unsigned long rate ;
2016-01-06 12:03:53 +08:00
drm/rockchip: Round up _before_ giving to the clock framework
I'm embarassed to say that even though I've touched
vop_crtc_mode_fixup() twice and I swear I tested it, there's still a
stupid glaring bug in it. Specifically, on veyron_minnie (with all
the latest display timings) we want to be setting our pixel clock to
66,666,666.67 Hz and we tell userspace that's what we set, but we're
actually choosing 66,000,000 Hz. This is confirmed by looking at the
clock tree.
The problem is that in drm_display_mode_from_videomode() we convert
from Hz to kHz with:
dmode->clock = vm->pixelclock / 1000;
...and drm_display_mode_from_videomode() is called from panel-simple
when we have an "override_mode" like we do on veyron_minnie. See
commit 123643e5c40a ("ARM: dts: rockchip: Specify
rk3288-veyron-minnie's display timings").
...so when the device tree specifies a clock of 66666667 for the panel
then DRM translates that to 66666000. The clock framework will always
pick a clock that is _lower_ than the one requested, so it will refuse
to pick 66666667 and we'll end up at 66000000.
While we could try to fix drm_display_mode_from_videomode() to round
to the nearest kHz and it would fix our problem, it wouldn't help if
the clock we actually needed was 60,000,001 Hz. We could
alternatively have DRM always round up, but maybe this would break
someone else who already baked in the assumption that DRM rounds down.
Specifically note that clock drivers are not consistent about whether
they round up or round down when you call clk_set_rate(). We know how
Rockchip's clock driver works, but (for instance) you can see that on
most Qualcomm clocks the default is clk_rcg2_ops which rounds up.
Let's solve this by just adding 999 Hz before calling
clk_round_rate(). This should be safe and work everywhere. As
discussed in more detail in comments in the commit, Rockchip's PLLs
are configured in a way that there shouldn't be another PLL setting
that is only a few kHz off so we won't get mixed up.
NOTE: if this is picked to stable, it's probably easiest to first pick
commit 527e4ca3b6d1 ("drm/rockchip: Base adjustments of the mode based
on prev adjustments") which shouldn't hurt in stable.
Fixes: b59b8de31497 ("drm/rockchip: return a true clock rate to adjusted_mode")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191003114726.v2.1.Ib233b3e706cf6317858384264d5b0ed35657456e@changeid
2019-10-03 11:47:30 -07:00
/*
* Clock craziness .
*
* Key points :
*
2022-09-08 20:36:16 +08:00
* - DRM works in kHz .
drm/rockchip: Round up _before_ giving to the clock framework
I'm embarassed to say that even though I've touched
vop_crtc_mode_fixup() twice and I swear I tested it, there's still a
stupid glaring bug in it. Specifically, on veyron_minnie (with all
the latest display timings) we want to be setting our pixel clock to
66,666,666.67 Hz and we tell userspace that's what we set, but we're
actually choosing 66,000,000 Hz. This is confirmed by looking at the
clock tree.
The problem is that in drm_display_mode_from_videomode() we convert
from Hz to kHz with:
dmode->clock = vm->pixelclock / 1000;
...and drm_display_mode_from_videomode() is called from panel-simple
when we have an "override_mode" like we do on veyron_minnie. See
commit 123643e5c40a ("ARM: dts: rockchip: Specify
rk3288-veyron-minnie's display timings").
...so when the device tree specifies a clock of 66666667 for the panel
then DRM translates that to 66666000. The clock framework will always
pick a clock that is _lower_ than the one requested, so it will refuse
to pick 66666667 and we'll end up at 66000000.
While we could try to fix drm_display_mode_from_videomode() to round
to the nearest kHz and it would fix our problem, it wouldn't help if
the clock we actually needed was 60,000,001 Hz. We could
alternatively have DRM always round up, but maybe this would break
someone else who already baked in the assumption that DRM rounds down.
Specifically note that clock drivers are not consistent about whether
they round up or round down when you call clk_set_rate(). We know how
Rockchip's clock driver works, but (for instance) you can see that on
most Qualcomm clocks the default is clk_rcg2_ops which rounds up.
Let's solve this by just adding 999 Hz before calling
clk_round_rate(). This should be safe and work everywhere. As
discussed in more detail in comments in the commit, Rockchip's PLLs
are configured in a way that there shouldn't be another PLL setting
that is only a few kHz off so we won't get mixed up.
NOTE: if this is picked to stable, it's probably easiest to first pick
commit 527e4ca3b6d1 ("drm/rockchip: Base adjustments of the mode based
on prev adjustments") which shouldn't hurt in stable.
Fixes: b59b8de31497 ("drm/rockchip: return a true clock rate to adjusted_mode")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191003114726.v2.1.Ib233b3e706cf6317858384264d5b0ed35657456e@changeid
2019-10-03 11:47:30 -07:00
* - Clock framework works in Hz .
* - Rockchip ' s clock driver picks the clock rate that is the
* same _OR LOWER_ than the one requested .
*
* Action plan :
*
drm/rockchip: Update crtc fixup to account for fractional clk change
After commit 928f9e268611 ("clk: fractional-divider: Hide
clk_fractional_divider_ops from wide audience") was merged it appears
that the DSI panel on my Odroid Go Advance stopped working. Upon closer
examination of the problem, it looks like it was the fixup in the
rockchip_drm_vop.c file was causing the issue. The changes made to the
clk driver appear to change some assumptions made in the fixup.
After debugging the working 5.14 kernel and the no-longer working
5.15 kernel, it looks like this was broken all along but still
worked, whereas after the fractional clock change it stopped
working despite the issue (it went from sort-of broken to very broken).
In the 5.14 kernel the dclk_vopb_frac was being requested to be set to
17000999 on my board. The clock driver was taking the value of the
parent clock and attempting to divide the requested value from it
(17000000/17000999 = 0), then subtracting 1 from it (making it -1),
and running it through fls_long to get 64. It would then subtract
the value of fd->mwidth from it to get 48, and then bit shift
17000999 to the left by 48, coming up with a very large number of
7649082492112076800. This resulted in a numerator of 65535 and a
denominator of 1 from the clk driver. The driver seemingly would
try again and get a correct 1:1 value later, and then move on.
Output from my 5.14 kernel (with some printfs for good measure):
[ 2.830066] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops)
[ 2.839431] rockchip-drm display-subsystem: bound ff450000.dsi (ops dw_mipi_dsi_rockchip_ops)
[ 2.855980] Clock is dclk_vopb_frac
[ 2.856004] Scale 64, Rate 7649082492112076800, Oldrate 17000999, Parent Rate 17000000, Best Numerator 65535, Best Denominator 1, fd->mwidth 16
[ 2.903529] Clock is dclk_vopb_frac
[ 2.903556] Scale 0, Rate 17000000, Oldrate 17000000, Parent Rate 17000000, Best Numerator 1, Best Denominator 1, fd->mwidth 16
[ 2.903579] Clock is dclk_vopb_frac
[ 2.903583] Scale 0, Rate 17000000, Oldrate 17000000, Parent Rate 17000000, Best Numerator 1, Best Denominator 1, fd->mwidth 16
Contrast this with 5.15 after the clk change where the rate of 17000999
was getting passed and resulted in numerators/denomiators of 17001/
17000.
Output from my 5.15 kernel (with some printfs added for good measure):
[ 2.817571] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops)
[ 2.826975] rockchip-drm display-subsystem: bound ff450000.dsi (ops dw_mipi_dsi_rockchip_ops)
[ 2.843430] Rate 17000999, Parent Rate 17000000, Best Numerator 17018, Best Denominator 17017
[ 2.891073] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
[ 2.891269] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
[ 2.891281] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
I have tested the change extensively on my Odroid Go Advance (Rockchip
RK3326) and it appears to work well. However, this change will affect
all Rockchip SoCs that use this driver so I believe further testing
is warranted. Please note that without this change I can confirm
at least all PX30s with DSI panels will stop working with the 5.15
kernel.
Upon advice from Doug Anderson <dianders@chromium.org> it was decided
that we would first check if the clock rate can be set exactly as
requested, and only if it could not would we then add 999 to it and
attempt the process again. This way we can preserve the behavior for
clocks that still need it while resolving the specific issue for the
PX30 and DSI panels (since it is using a fractional clock).
Changes since v2:
- Moved fixes to correct location.
Changes since v1:
- Made the addition of 999 conditional based on whether the clock
subsystem can set the actual clock rate as requested.
- Updated the notes in the fixup routine to reflect this new behavior.
- Added reference to original commit, as this has technically been
broken since then however only now is it an issue due to the clock
changes.
Fixes: 4e7cf74fa3b2 ("clk: fractional-divider: Export approximation algorithm to the CCF users")
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210916202907.18394-1-macroalpha82@gmail.com
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
2021-09-16 15:29:07 -05:00
* 1. Try to set the exact rate first , and confirm the clock framework
* can provide it .
drm/rockchip: Round up _before_ giving to the clock framework
I'm embarassed to say that even though I've touched
vop_crtc_mode_fixup() twice and I swear I tested it, there's still a
stupid glaring bug in it. Specifically, on veyron_minnie (with all
the latest display timings) we want to be setting our pixel clock to
66,666,666.67 Hz and we tell userspace that's what we set, but we're
actually choosing 66,000,000 Hz. This is confirmed by looking at the
clock tree.
The problem is that in drm_display_mode_from_videomode() we convert
from Hz to kHz with:
dmode->clock = vm->pixelclock / 1000;
...and drm_display_mode_from_videomode() is called from panel-simple
when we have an "override_mode" like we do on veyron_minnie. See
commit 123643e5c40a ("ARM: dts: rockchip: Specify
rk3288-veyron-minnie's display timings").
...so when the device tree specifies a clock of 66666667 for the panel
then DRM translates that to 66666000. The clock framework will always
pick a clock that is _lower_ than the one requested, so it will refuse
to pick 66666667 and we'll end up at 66000000.
While we could try to fix drm_display_mode_from_videomode() to round
to the nearest kHz and it would fix our problem, it wouldn't help if
the clock we actually needed was 60,000,001 Hz. We could
alternatively have DRM always round up, but maybe this would break
someone else who already baked in the assumption that DRM rounds down.
Specifically note that clock drivers are not consistent about whether
they round up or round down when you call clk_set_rate(). We know how
Rockchip's clock driver works, but (for instance) you can see that on
most Qualcomm clocks the default is clk_rcg2_ops which rounds up.
Let's solve this by just adding 999 Hz before calling
clk_round_rate(). This should be safe and work everywhere. As
discussed in more detail in comments in the commit, Rockchip's PLLs
are configured in a way that there shouldn't be another PLL setting
that is only a few kHz off so we won't get mixed up.
NOTE: if this is picked to stable, it's probably easiest to first pick
commit 527e4ca3b6d1 ("drm/rockchip: Base adjustments of the mode based
on prev adjustments") which shouldn't hurt in stable.
Fixes: b59b8de31497 ("drm/rockchip: return a true clock rate to adjusted_mode")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191003114726.v2.1.Ib233b3e706cf6317858384264d5b0ed35657456e@changeid
2019-10-03 11:47:30 -07:00
*
drm/rockchip: Update crtc fixup to account for fractional clk change
After commit 928f9e268611 ("clk: fractional-divider: Hide
clk_fractional_divider_ops from wide audience") was merged it appears
that the DSI panel on my Odroid Go Advance stopped working. Upon closer
examination of the problem, it looks like it was the fixup in the
rockchip_drm_vop.c file was causing the issue. The changes made to the
clk driver appear to change some assumptions made in the fixup.
After debugging the working 5.14 kernel and the no-longer working
5.15 kernel, it looks like this was broken all along but still
worked, whereas after the fractional clock change it stopped
working despite the issue (it went from sort-of broken to very broken).
In the 5.14 kernel the dclk_vopb_frac was being requested to be set to
17000999 on my board. The clock driver was taking the value of the
parent clock and attempting to divide the requested value from it
(17000000/17000999 = 0), then subtracting 1 from it (making it -1),
and running it through fls_long to get 64. It would then subtract
the value of fd->mwidth from it to get 48, and then bit shift
17000999 to the left by 48, coming up with a very large number of
7649082492112076800. This resulted in a numerator of 65535 and a
denominator of 1 from the clk driver. The driver seemingly would
try again and get a correct 1:1 value later, and then move on.
Output from my 5.14 kernel (with some printfs for good measure):
[ 2.830066] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops)
[ 2.839431] rockchip-drm display-subsystem: bound ff450000.dsi (ops dw_mipi_dsi_rockchip_ops)
[ 2.855980] Clock is dclk_vopb_frac
[ 2.856004] Scale 64, Rate 7649082492112076800, Oldrate 17000999, Parent Rate 17000000, Best Numerator 65535, Best Denominator 1, fd->mwidth 16
[ 2.903529] Clock is dclk_vopb_frac
[ 2.903556] Scale 0, Rate 17000000, Oldrate 17000000, Parent Rate 17000000, Best Numerator 1, Best Denominator 1, fd->mwidth 16
[ 2.903579] Clock is dclk_vopb_frac
[ 2.903583] Scale 0, Rate 17000000, Oldrate 17000000, Parent Rate 17000000, Best Numerator 1, Best Denominator 1, fd->mwidth 16
Contrast this with 5.15 after the clk change where the rate of 17000999
was getting passed and resulted in numerators/denomiators of 17001/
17000.
Output from my 5.15 kernel (with some printfs added for good measure):
[ 2.817571] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops)
[ 2.826975] rockchip-drm display-subsystem: bound ff450000.dsi (ops dw_mipi_dsi_rockchip_ops)
[ 2.843430] Rate 17000999, Parent Rate 17000000, Best Numerator 17018, Best Denominator 17017
[ 2.891073] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
[ 2.891269] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
[ 2.891281] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
I have tested the change extensively on my Odroid Go Advance (Rockchip
RK3326) and it appears to work well. However, this change will affect
all Rockchip SoCs that use this driver so I believe further testing
is warranted. Please note that without this change I can confirm
at least all PX30s with DSI panels will stop working with the 5.15
kernel.
Upon advice from Doug Anderson <dianders@chromium.org> it was decided
that we would first check if the clock rate can be set exactly as
requested, and only if it could not would we then add 999 to it and
attempt the process again. This way we can preserve the behavior for
clocks that still need it while resolving the specific issue for the
PX30 and DSI panels (since it is using a fractional clock).
Changes since v2:
- Moved fixes to correct location.
Changes since v1:
- Made the addition of 999 conditional based on whether the clock
subsystem can set the actual clock rate as requested.
- Updated the notes in the fixup routine to reflect this new behavior.
- Added reference to original commit, as this has technically been
broken since then however only now is it an issue due to the clock
changes.
Fixes: 4e7cf74fa3b2 ("clk: fractional-divider: Export approximation algorithm to the CCF users")
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210916202907.18394-1-macroalpha82@gmail.com
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
2021-09-16 15:29:07 -05:00
* 2. If the clock framework cannot provide the exact rate , we should
* add 999 Hz to the requested rate . That way if the clock we need
* is 60000001 Hz ( ~ 60 MHz ) and DRM tells us to make 60000 kHz then
* the clock framework will actually give us the right clock .
drm/rockchip: Round up _before_ giving to the clock framework
I'm embarassed to say that even though I've touched
vop_crtc_mode_fixup() twice and I swear I tested it, there's still a
stupid glaring bug in it. Specifically, on veyron_minnie (with all
the latest display timings) we want to be setting our pixel clock to
66,666,666.67 Hz and we tell userspace that's what we set, but we're
actually choosing 66,000,000 Hz. This is confirmed by looking at the
clock tree.
The problem is that in drm_display_mode_from_videomode() we convert
from Hz to kHz with:
dmode->clock = vm->pixelclock / 1000;
...and drm_display_mode_from_videomode() is called from panel-simple
when we have an "override_mode" like we do on veyron_minnie. See
commit 123643e5c40a ("ARM: dts: rockchip: Specify
rk3288-veyron-minnie's display timings").
...so when the device tree specifies a clock of 66666667 for the panel
then DRM translates that to 66666000. The clock framework will always
pick a clock that is _lower_ than the one requested, so it will refuse
to pick 66666667 and we'll end up at 66000000.
While we could try to fix drm_display_mode_from_videomode() to round
to the nearest kHz and it would fix our problem, it wouldn't help if
the clock we actually needed was 60,000,001 Hz. We could
alternatively have DRM always round up, but maybe this would break
someone else who already baked in the assumption that DRM rounds down.
Specifically note that clock drivers are not consistent about whether
they round up or round down when you call clk_set_rate(). We know how
Rockchip's clock driver works, but (for instance) you can see that on
most Qualcomm clocks the default is clk_rcg2_ops which rounds up.
Let's solve this by just adding 999 Hz before calling
clk_round_rate(). This should be safe and work everywhere. As
discussed in more detail in comments in the commit, Rockchip's PLLs
are configured in a way that there shouldn't be another PLL setting
that is only a few kHz off so we won't get mixed up.
NOTE: if this is picked to stable, it's probably easiest to first pick
commit 527e4ca3b6d1 ("drm/rockchip: Base adjustments of the mode based
on prev adjustments") which shouldn't hurt in stable.
Fixes: b59b8de31497 ("drm/rockchip: return a true clock rate to adjusted_mode")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191003114726.v2.1.Ib233b3e706cf6317858384264d5b0ed35657456e@changeid
2019-10-03 11:47:30 -07:00
*
drm/rockchip: Update crtc fixup to account for fractional clk change
After commit 928f9e268611 ("clk: fractional-divider: Hide
clk_fractional_divider_ops from wide audience") was merged it appears
that the DSI panel on my Odroid Go Advance stopped working. Upon closer
examination of the problem, it looks like it was the fixup in the
rockchip_drm_vop.c file was causing the issue. The changes made to the
clk driver appear to change some assumptions made in the fixup.
After debugging the working 5.14 kernel and the no-longer working
5.15 kernel, it looks like this was broken all along but still
worked, whereas after the fractional clock change it stopped
working despite the issue (it went from sort-of broken to very broken).
In the 5.14 kernel the dclk_vopb_frac was being requested to be set to
17000999 on my board. The clock driver was taking the value of the
parent clock and attempting to divide the requested value from it
(17000000/17000999 = 0), then subtracting 1 from it (making it -1),
and running it through fls_long to get 64. It would then subtract
the value of fd->mwidth from it to get 48, and then bit shift
17000999 to the left by 48, coming up with a very large number of
7649082492112076800. This resulted in a numerator of 65535 and a
denominator of 1 from the clk driver. The driver seemingly would
try again and get a correct 1:1 value later, and then move on.
Output from my 5.14 kernel (with some printfs for good measure):
[ 2.830066] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops)
[ 2.839431] rockchip-drm display-subsystem: bound ff450000.dsi (ops dw_mipi_dsi_rockchip_ops)
[ 2.855980] Clock is dclk_vopb_frac
[ 2.856004] Scale 64, Rate 7649082492112076800, Oldrate 17000999, Parent Rate 17000000, Best Numerator 65535, Best Denominator 1, fd->mwidth 16
[ 2.903529] Clock is dclk_vopb_frac
[ 2.903556] Scale 0, Rate 17000000, Oldrate 17000000, Parent Rate 17000000, Best Numerator 1, Best Denominator 1, fd->mwidth 16
[ 2.903579] Clock is dclk_vopb_frac
[ 2.903583] Scale 0, Rate 17000000, Oldrate 17000000, Parent Rate 17000000, Best Numerator 1, Best Denominator 1, fd->mwidth 16
Contrast this with 5.15 after the clk change where the rate of 17000999
was getting passed and resulted in numerators/denomiators of 17001/
17000.
Output from my 5.15 kernel (with some printfs added for good measure):
[ 2.817571] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops)
[ 2.826975] rockchip-drm display-subsystem: bound ff450000.dsi (ops dw_mipi_dsi_rockchip_ops)
[ 2.843430] Rate 17000999, Parent Rate 17000000, Best Numerator 17018, Best Denominator 17017
[ 2.891073] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
[ 2.891269] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
[ 2.891281] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
I have tested the change extensively on my Odroid Go Advance (Rockchip
RK3326) and it appears to work well. However, this change will affect
all Rockchip SoCs that use this driver so I believe further testing
is warranted. Please note that without this change I can confirm
at least all PX30s with DSI panels will stop working with the 5.15
kernel.
Upon advice from Doug Anderson <dianders@chromium.org> it was decided
that we would first check if the clock rate can be set exactly as
requested, and only if it could not would we then add 999 to it and
attempt the process again. This way we can preserve the behavior for
clocks that still need it while resolving the specific issue for the
PX30 and DSI panels (since it is using a fractional clock).
Changes since v2:
- Moved fixes to correct location.
Changes since v1:
- Made the addition of 999 conditional based on whether the clock
subsystem can set the actual clock rate as requested.
- Updated the notes in the fixup routine to reflect this new behavior.
- Added reference to original commit, as this has technically been
broken since then however only now is it an issue due to the clock
changes.
Fixes: 4e7cf74fa3b2 ("clk: fractional-divider: Export approximation algorithm to the CCF users")
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210916202907.18394-1-macroalpha82@gmail.com
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
2021-09-16 15:29:07 -05:00
* 3. Get the clock framework to round the rate for us to tell us
drm/rockchip: Round up _before_ giving to the clock framework
I'm embarassed to say that even though I've touched
vop_crtc_mode_fixup() twice and I swear I tested it, there's still a
stupid glaring bug in it. Specifically, on veyron_minnie (with all
the latest display timings) we want to be setting our pixel clock to
66,666,666.67 Hz and we tell userspace that's what we set, but we're
actually choosing 66,000,000 Hz. This is confirmed by looking at the
clock tree.
The problem is that in drm_display_mode_from_videomode() we convert
from Hz to kHz with:
dmode->clock = vm->pixelclock / 1000;
...and drm_display_mode_from_videomode() is called from panel-simple
when we have an "override_mode" like we do on veyron_minnie. See
commit 123643e5c40a ("ARM: dts: rockchip: Specify
rk3288-veyron-minnie's display timings").
...so when the device tree specifies a clock of 66666667 for the panel
then DRM translates that to 66666000. The clock framework will always
pick a clock that is _lower_ than the one requested, so it will refuse
to pick 66666667 and we'll end up at 66000000.
While we could try to fix drm_display_mode_from_videomode() to round
to the nearest kHz and it would fix our problem, it wouldn't help if
the clock we actually needed was 60,000,001 Hz. We could
alternatively have DRM always round up, but maybe this would break
someone else who already baked in the assumption that DRM rounds down.
Specifically note that clock drivers are not consistent about whether
they round up or round down when you call clk_set_rate(). We know how
Rockchip's clock driver works, but (for instance) you can see that on
most Qualcomm clocks the default is clk_rcg2_ops which rounds up.
Let's solve this by just adding 999 Hz before calling
clk_round_rate(). This should be safe and work everywhere. As
discussed in more detail in comments in the commit, Rockchip's PLLs
are configured in a way that there shouldn't be another PLL setting
that is only a few kHz off so we won't get mixed up.
NOTE: if this is picked to stable, it's probably easiest to first pick
commit 527e4ca3b6d1 ("drm/rockchip: Base adjustments of the mode based
on prev adjustments") which shouldn't hurt in stable.
Fixes: b59b8de31497 ("drm/rockchip: return a true clock rate to adjusted_mode")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191003114726.v2.1.Ib233b3e706cf6317858384264d5b0ed35657456e@changeid
2019-10-03 11:47:30 -07:00
* what it will actually make .
*
drm/rockchip: Update crtc fixup to account for fractional clk change
After commit 928f9e268611 ("clk: fractional-divider: Hide
clk_fractional_divider_ops from wide audience") was merged it appears
that the DSI panel on my Odroid Go Advance stopped working. Upon closer
examination of the problem, it looks like it was the fixup in the
rockchip_drm_vop.c file was causing the issue. The changes made to the
clk driver appear to change some assumptions made in the fixup.
After debugging the working 5.14 kernel and the no-longer working
5.15 kernel, it looks like this was broken all along but still
worked, whereas after the fractional clock change it stopped
working despite the issue (it went from sort-of broken to very broken).
In the 5.14 kernel the dclk_vopb_frac was being requested to be set to
17000999 on my board. The clock driver was taking the value of the
parent clock and attempting to divide the requested value from it
(17000000/17000999 = 0), then subtracting 1 from it (making it -1),
and running it through fls_long to get 64. It would then subtract
the value of fd->mwidth from it to get 48, and then bit shift
17000999 to the left by 48, coming up with a very large number of
7649082492112076800. This resulted in a numerator of 65535 and a
denominator of 1 from the clk driver. The driver seemingly would
try again and get a correct 1:1 value later, and then move on.
Output from my 5.14 kernel (with some printfs for good measure):
[ 2.830066] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops)
[ 2.839431] rockchip-drm display-subsystem: bound ff450000.dsi (ops dw_mipi_dsi_rockchip_ops)
[ 2.855980] Clock is dclk_vopb_frac
[ 2.856004] Scale 64, Rate 7649082492112076800, Oldrate 17000999, Parent Rate 17000000, Best Numerator 65535, Best Denominator 1, fd->mwidth 16
[ 2.903529] Clock is dclk_vopb_frac
[ 2.903556] Scale 0, Rate 17000000, Oldrate 17000000, Parent Rate 17000000, Best Numerator 1, Best Denominator 1, fd->mwidth 16
[ 2.903579] Clock is dclk_vopb_frac
[ 2.903583] Scale 0, Rate 17000000, Oldrate 17000000, Parent Rate 17000000, Best Numerator 1, Best Denominator 1, fd->mwidth 16
Contrast this with 5.15 after the clk change where the rate of 17000999
was getting passed and resulted in numerators/denomiators of 17001/
17000.
Output from my 5.15 kernel (with some printfs added for good measure):
[ 2.817571] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops)
[ 2.826975] rockchip-drm display-subsystem: bound ff450000.dsi (ops dw_mipi_dsi_rockchip_ops)
[ 2.843430] Rate 17000999, Parent Rate 17000000, Best Numerator 17018, Best Denominator 17017
[ 2.891073] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
[ 2.891269] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
[ 2.891281] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
I have tested the change extensively on my Odroid Go Advance (Rockchip
RK3326) and it appears to work well. However, this change will affect
all Rockchip SoCs that use this driver so I believe further testing
is warranted. Please note that without this change I can confirm
at least all PX30s with DSI panels will stop working with the 5.15
kernel.
Upon advice from Doug Anderson <dianders@chromium.org> it was decided
that we would first check if the clock rate can be set exactly as
requested, and only if it could not would we then add 999 to it and
attempt the process again. This way we can preserve the behavior for
clocks that still need it while resolving the specific issue for the
PX30 and DSI panels (since it is using a fractional clock).
Changes since v2:
- Moved fixes to correct location.
Changes since v1:
- Made the addition of 999 conditional based on whether the clock
subsystem can set the actual clock rate as requested.
- Updated the notes in the fixup routine to reflect this new behavior.
- Added reference to original commit, as this has technically been
broken since then however only now is it an issue due to the clock
changes.
Fixes: 4e7cf74fa3b2 ("clk: fractional-divider: Export approximation algorithm to the CCF users")
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210916202907.18394-1-macroalpha82@gmail.com
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
2021-09-16 15:29:07 -05:00
* 4. Store the rounded up rate so that we don ' t need to worry about
drm/rockchip: Round up _before_ giving to the clock framework
I'm embarassed to say that even though I've touched
vop_crtc_mode_fixup() twice and I swear I tested it, there's still a
stupid glaring bug in it. Specifically, on veyron_minnie (with all
the latest display timings) we want to be setting our pixel clock to
66,666,666.67 Hz and we tell userspace that's what we set, but we're
actually choosing 66,000,000 Hz. This is confirmed by looking at the
clock tree.
The problem is that in drm_display_mode_from_videomode() we convert
from Hz to kHz with:
dmode->clock = vm->pixelclock / 1000;
...and drm_display_mode_from_videomode() is called from panel-simple
when we have an "override_mode" like we do on veyron_minnie. See
commit 123643e5c40a ("ARM: dts: rockchip: Specify
rk3288-veyron-minnie's display timings").
...so when the device tree specifies a clock of 66666667 for the panel
then DRM translates that to 66666000. The clock framework will always
pick a clock that is _lower_ than the one requested, so it will refuse
to pick 66666667 and we'll end up at 66000000.
While we could try to fix drm_display_mode_from_videomode() to round
to the nearest kHz and it would fix our problem, it wouldn't help if
the clock we actually needed was 60,000,001 Hz. We could
alternatively have DRM always round up, but maybe this would break
someone else who already baked in the assumption that DRM rounds down.
Specifically note that clock drivers are not consistent about whether
they round up or round down when you call clk_set_rate(). We know how
Rockchip's clock driver works, but (for instance) you can see that on
most Qualcomm clocks the default is clk_rcg2_ops which rounds up.
Let's solve this by just adding 999 Hz before calling
clk_round_rate(). This should be safe and work everywhere. As
discussed in more detail in comments in the commit, Rockchip's PLLs
are configured in a way that there shouldn't be another PLL setting
that is only a few kHz off so we won't get mixed up.
NOTE: if this is picked to stable, it's probably easiest to first pick
commit 527e4ca3b6d1 ("drm/rockchip: Base adjustments of the mode based
on prev adjustments") which shouldn't hurt in stable.
Fixes: b59b8de31497 ("drm/rockchip: return a true clock rate to adjusted_mode")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191003114726.v2.1.Ib233b3e706cf6317858384264d5b0ed35657456e@changeid
2019-10-03 11:47:30 -07:00
* this in the actual clk_set_rate ( ) .
*/
drm/rockchip: Update crtc fixup to account for fractional clk change
After commit 928f9e268611 ("clk: fractional-divider: Hide
clk_fractional_divider_ops from wide audience") was merged it appears
that the DSI panel on my Odroid Go Advance stopped working. Upon closer
examination of the problem, it looks like it was the fixup in the
rockchip_drm_vop.c file was causing the issue. The changes made to the
clk driver appear to change some assumptions made in the fixup.
After debugging the working 5.14 kernel and the no-longer working
5.15 kernel, it looks like this was broken all along but still
worked, whereas after the fractional clock change it stopped
working despite the issue (it went from sort-of broken to very broken).
In the 5.14 kernel the dclk_vopb_frac was being requested to be set to
17000999 on my board. The clock driver was taking the value of the
parent clock and attempting to divide the requested value from it
(17000000/17000999 = 0), then subtracting 1 from it (making it -1),
and running it through fls_long to get 64. It would then subtract
the value of fd->mwidth from it to get 48, and then bit shift
17000999 to the left by 48, coming up with a very large number of
7649082492112076800. This resulted in a numerator of 65535 and a
denominator of 1 from the clk driver. The driver seemingly would
try again and get a correct 1:1 value later, and then move on.
Output from my 5.14 kernel (with some printfs for good measure):
[ 2.830066] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops)
[ 2.839431] rockchip-drm display-subsystem: bound ff450000.dsi (ops dw_mipi_dsi_rockchip_ops)
[ 2.855980] Clock is dclk_vopb_frac
[ 2.856004] Scale 64, Rate 7649082492112076800, Oldrate 17000999, Parent Rate 17000000, Best Numerator 65535, Best Denominator 1, fd->mwidth 16
[ 2.903529] Clock is dclk_vopb_frac
[ 2.903556] Scale 0, Rate 17000000, Oldrate 17000000, Parent Rate 17000000, Best Numerator 1, Best Denominator 1, fd->mwidth 16
[ 2.903579] Clock is dclk_vopb_frac
[ 2.903583] Scale 0, Rate 17000000, Oldrate 17000000, Parent Rate 17000000, Best Numerator 1, Best Denominator 1, fd->mwidth 16
Contrast this with 5.15 after the clk change where the rate of 17000999
was getting passed and resulted in numerators/denomiators of 17001/
17000.
Output from my 5.15 kernel (with some printfs added for good measure):
[ 2.817571] rockchip-drm display-subsystem: bound ff460000.vop (ops vop_component_ops)
[ 2.826975] rockchip-drm display-subsystem: bound ff450000.dsi (ops dw_mipi_dsi_rockchip_ops)
[ 2.843430] Rate 17000999, Parent Rate 17000000, Best Numerator 17018, Best Denominator 17017
[ 2.891073] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
[ 2.891269] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
[ 2.891281] Rate 17001000, Parent Rate 17000000, Best Numerator 17001, Best Denominator 17000
I have tested the change extensively on my Odroid Go Advance (Rockchip
RK3326) and it appears to work well. However, this change will affect
all Rockchip SoCs that use this driver so I believe further testing
is warranted. Please note that without this change I can confirm
at least all PX30s with DSI panels will stop working with the 5.15
kernel.
Upon advice from Doug Anderson <dianders@chromium.org> it was decided
that we would first check if the clock rate can be set exactly as
requested, and only if it could not would we then add 999 to it and
attempt the process again. This way we can preserve the behavior for
clocks that still need it while resolving the specific issue for the
PX30 and DSI panels (since it is using a fractional clock).
Changes since v2:
- Moved fixes to correct location.
Changes since v1:
- Made the addition of 999 conditional based on whether the clock
subsystem can set the actual clock rate as requested.
- Updated the notes in the fixup routine to reflect this new behavior.
- Added reference to original commit, as this has technically been
broken since then however only now is it an issue due to the clock
changes.
Fixes: 4e7cf74fa3b2 ("clk: fractional-divider: Export approximation algorithm to the CCF users")
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210916202907.18394-1-macroalpha82@gmail.com
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
2021-09-16 15:29:07 -05:00
rate = clk_round_rate ( vop - > dclk , adjusted_mode - > clock * 1000 ) ;
if ( rate / 1000 ! = adjusted_mode - > clock )
rate = clk_round_rate ( vop - > dclk ,
adjusted_mode - > clock * 1000 + 999 ) ;
drm/rockchip: Round up _before_ giving to the clock framework
I'm embarassed to say that even though I've touched
vop_crtc_mode_fixup() twice and I swear I tested it, there's still a
stupid glaring bug in it. Specifically, on veyron_minnie (with all
the latest display timings) we want to be setting our pixel clock to
66,666,666.67 Hz and we tell userspace that's what we set, but we're
actually choosing 66,000,000 Hz. This is confirmed by looking at the
clock tree.
The problem is that in drm_display_mode_from_videomode() we convert
from Hz to kHz with:
dmode->clock = vm->pixelclock / 1000;
...and drm_display_mode_from_videomode() is called from panel-simple
when we have an "override_mode" like we do on veyron_minnie. See
commit 123643e5c40a ("ARM: dts: rockchip: Specify
rk3288-veyron-minnie's display timings").
...so when the device tree specifies a clock of 66666667 for the panel
then DRM translates that to 66666000. The clock framework will always
pick a clock that is _lower_ than the one requested, so it will refuse
to pick 66666667 and we'll end up at 66000000.
While we could try to fix drm_display_mode_from_videomode() to round
to the nearest kHz and it would fix our problem, it wouldn't help if
the clock we actually needed was 60,000,001 Hz. We could
alternatively have DRM always round up, but maybe this would break
someone else who already baked in the assumption that DRM rounds down.
Specifically note that clock drivers are not consistent about whether
they round up or round down when you call clk_set_rate(). We know how
Rockchip's clock driver works, but (for instance) you can see that on
most Qualcomm clocks the default is clk_rcg2_ops which rounds up.
Let's solve this by just adding 999 Hz before calling
clk_round_rate(). This should be safe and work everywhere. As
discussed in more detail in comments in the commit, Rockchip's PLLs
are configured in a way that there shouldn't be another PLL setting
that is only a few kHz off so we won't get mixed up.
NOTE: if this is picked to stable, it's probably easiest to first pick
commit 527e4ca3b6d1 ("drm/rockchip: Base adjustments of the mode based
on prev adjustments") which shouldn't hurt in stable.
Fixes: b59b8de31497 ("drm/rockchip: return a true clock rate to adjusted_mode")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191003114726.v2.1.Ib233b3e706cf6317858384264d5b0ed35657456e@changeid
2019-10-03 11:47:30 -07:00
adjusted_mode - > clock = DIV_ROUND_UP ( rate , 1000 ) ;
2016-01-06 12:03:53 +08:00
2014-08-22 18:36:26 +08:00
return true ;
}
2019-10-10 16:43:50 -03:00
static bool vop_dsp_lut_is_enabled ( struct vop * vop )
{
return vop_read_reg ( vop , 0 , & vop - > data - > common - > dsp_lut_en ) ;
}
2021-10-19 22:58:42 +01:00
static u32 vop_lut_buffer_index ( struct vop * vop )
{
return vop_read_reg ( vop , 0 , & vop - > data - > common - > lut_buffer_index ) ;
}
2019-10-10 16:43:50 -03:00
static void vop_crtc_write_gamma_lut ( struct vop * vop , struct drm_crtc * crtc )
{
struct drm_color_lut * lut = crtc - > state - > gamma_lut - > data ;
2021-10-19 22:58:42 +01:00
unsigned int i , bpc = ilog2 ( vop - > data - > lut_size ) ;
2019-10-10 16:43:50 -03:00
for ( i = 0 ; i < crtc - > gamma_size ; i + + ) {
u32 word ;
2021-10-19 22:58:42 +01:00
word = ( drm_color_lut_extract ( lut [ i ] . red , bpc ) < < ( 2 * bpc ) ) |
( drm_color_lut_extract ( lut [ i ] . green , bpc ) < < bpc ) |
drm_color_lut_extract ( lut [ i ] . blue , bpc ) ;
2019-10-10 16:43:50 -03:00
writel ( word , vop - > lut_regs + i * 4 ) ;
}
}
static void vop_crtc_gamma_set ( struct vop * vop , struct drm_crtc * crtc ,
struct drm_crtc_state * old_state )
{
struct drm_crtc_state * state = crtc - > state ;
unsigned int idle ;
2021-10-19 22:58:42 +01:00
u32 lut_idx , old_idx ;
2019-10-10 16:43:50 -03:00
int ret ;
if ( ! vop - > lut_regs )
return ;
2021-10-19 22:58:42 +01:00
if ( ! state - > gamma_lut | | ! VOP_HAS_REG ( vop , common , update_gamma_lut ) ) {
/*
* To disable gamma ( gamma_lut is null ) or to write
* an update to the LUT , clear dsp_lut_en .
*/
spin_lock ( & vop - > reg_lock ) ;
VOP_REG_SET ( vop , common , dsp_lut_en , 0 ) ;
vop_cfg_done ( vop ) ;
spin_unlock ( & vop - > reg_lock ) ;
2019-10-10 16:43:50 -03:00
2021-10-19 22:58:42 +01:00
/*
* In order to write the LUT to the internal memory ,
* we need to first make sure the dsp_lut_en bit is cleared .
*/
ret = readx_poll_timeout ( vop_dsp_lut_is_enabled , vop ,
idle , ! idle , 5 , 30 * 1000 ) ;
if ( ret ) {
DRM_DEV_ERROR ( vop - > dev , " display LUT RAM enable timeout! \n " ) ;
return ;
}
if ( ! state - > gamma_lut )
return ;
} else {
/*
* On RK3399 the gamma LUT can updated without clearing dsp_lut_en ,
* by setting update_gamma_lut then waiting for lut_buffer_index change
*/
old_idx = vop_lut_buffer_index ( vop ) ;
}
2019-10-10 16:43:50 -03:00
spin_lock ( & vop - > reg_lock ) ;
vop_crtc_write_gamma_lut ( vop , crtc ) ;
VOP_REG_SET ( vop , common , dsp_lut_en , 1 ) ;
2021-10-19 22:58:42 +01:00
VOP_REG_SET ( vop , common , update_gamma_lut , 1 ) ;
2019-10-10 16:43:50 -03:00
vop_cfg_done ( vop ) ;
spin_unlock ( & vop - > reg_lock ) ;
2021-10-19 22:58:42 +01:00
if ( VOP_HAS_REG ( vop , common , update_gamma_lut ) ) {
ret = readx_poll_timeout ( vop_lut_buffer_index , vop ,
lut_idx , lut_idx ! = old_idx , 5 , 30 * 1000 ) ;
if ( ret ) {
DRM_DEV_ERROR ( vop - > dev , " gamma LUT update timeout! \n " ) ;
return ;
}
/*
* update_gamma_lut is auto cleared by HW , but write 0 to clear the bit
* in our backup of the regs .
*/
spin_lock ( & vop - > reg_lock ) ;
VOP_REG_SET ( vop , common , update_gamma_lut , 0 ) ;
spin_unlock ( & vop - > reg_lock ) ;
}
2019-10-10 16:43:50 -03:00
}
static void vop_crtc_atomic_begin ( struct drm_crtc * crtc ,
drm/atomic: Pass the full state to CRTC atomic begin and flush
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_begin and atomic_flush.
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 old_crtc_state, old_state;
identifier crtc;
identifier f;
@@
f(struct drm_crtc_state *old_crtc_state)
{
...
struct drm_atomic_state *old_state = old_crtc_state->state;
<...
- FUNCS->atomic_begin(crtc, old_crtc_state);
+ FUNCS->atomic_begin(crtc, old_state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier old_crtc_state, old_state;
identifier crtc;
identifier f;
@@
f(struct drm_crtc_state *old_crtc_state)
{
...
struct drm_atomic_state *old_state = old_crtc_state->state;
<...
- FUNCS->atomic_flush(crtc, old_crtc_state);
+ FUNCS->atomic_flush(crtc, old_state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state, ...)
{
<...
- FUNCS->atomic_begin(crtc, crtc_state);
+ FUNCS->atomic_begin(crtc, state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state, ...)
{
<...
- FUNCS->atomic_flush(crtc, crtc_state);
+ FUNCS->atomic_flush(crtc, state);
...>
}
@@
identifier crtc, old_state;
@@
struct drm_crtc_helper_funcs {
...
- void (*atomic_begin)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_begin)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
- void (*atomic_flush)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_flush)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_begin = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_flush = 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
...+>
}
@@
identifier old_state;
identifier crtc;
@@
void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
+ struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
...
}
@@
identifier old_state;
identifier crtc;
@@
void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
);
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_begin(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
...
}
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_begin(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
);
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
...
}
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *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>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-2-maxime@cerno.tech
2020-10-28 13:32:22 +01:00
struct drm_atomic_state * state )
2019-10-10 16:43:50 -03:00
{
drm: Use state helper instead of CRTC state pointer
Many drivers reference the crtc->pointer in order to get the current CRTC
state in their atomic_begin or atomic_flush hooks, which would be the new
CRTC state in the global atomic state since _swap_state happened when those
hooks are run.
Use the drm_atomic_get_new_crtc_state helper to get that state to make it
more obvious.
This was made using the coccinelle script below:
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_begin = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_flush = func,
...,
};
)
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct tegra_dc_state *crtc_state = e;
+ struct tegra_dc_state *dc_state = e;
<+...
- crtc_state
+ dc_state
...+>
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct mtk_crtc_state *crtc_state = e;
+ struct mtk_crtc_state *mtk_crtc_state = e;
<+...
- crtc_state
+ mtk_crtc_state
...+>
}
@ replaces_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct drm_crtc_state *crtc_state = crtc->state;
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ adds_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ include depends on adds_new_state || replaces_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && (adds_new_state || replaces_new_state) @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
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>
Cc: "James (Qian) Wang" <james.qian.wang@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Mihail Atanassov <mihail.atanassov@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201105164518.392891-1-maxime@cerno.tech
2020-11-05 17:45:18 +01:00
struct drm_crtc_state * crtc_state = drm_atomic_get_new_crtc_state ( state ,
crtc ) ;
drm/atomic: Pass the full state to CRTC atomic begin and flush
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_begin and atomic_flush.
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 old_crtc_state, old_state;
identifier crtc;
identifier f;
@@
f(struct drm_crtc_state *old_crtc_state)
{
...
struct drm_atomic_state *old_state = old_crtc_state->state;
<...
- FUNCS->atomic_begin(crtc, old_crtc_state);
+ FUNCS->atomic_begin(crtc, old_state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier old_crtc_state, old_state;
identifier crtc;
identifier f;
@@
f(struct drm_crtc_state *old_crtc_state)
{
...
struct drm_atomic_state *old_state = old_crtc_state->state;
<...
- FUNCS->atomic_flush(crtc, old_crtc_state);
+ FUNCS->atomic_flush(crtc, old_state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state, ...)
{
<...
- FUNCS->atomic_begin(crtc, crtc_state);
+ FUNCS->atomic_begin(crtc, state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state, ...)
{
<...
- FUNCS->atomic_flush(crtc, crtc_state);
+ FUNCS->atomic_flush(crtc, state);
...>
}
@@
identifier crtc, old_state;
@@
struct drm_crtc_helper_funcs {
...
- void (*atomic_begin)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_begin)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
- void (*atomic_flush)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_flush)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_begin = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_flush = 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
...+>
}
@@
identifier old_state;
identifier crtc;
@@
void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
+ struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
...
}
@@
identifier old_state;
identifier crtc;
@@
void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
);
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_begin(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
...
}
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_begin(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
);
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
...
}
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *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>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-2-maxime@cerno.tech
2020-10-28 13:32:22 +01:00
struct drm_crtc_state * old_crtc_state = drm_atomic_get_old_crtc_state ( state ,
crtc ) ;
2019-10-10 16:43:50 -03:00
struct vop * vop = to_vop ( crtc ) ;
/*
* Only update GAMMA if the ' active ' flag is not changed ,
* otherwise it ' s updated by . atomic_enable .
*/
drm: Use state helper instead of CRTC state pointer
Many drivers reference the crtc->pointer in order to get the current CRTC
state in their atomic_begin or atomic_flush hooks, which would be the new
CRTC state in the global atomic state since _swap_state happened when those
hooks are run.
Use the drm_atomic_get_new_crtc_state helper to get that state to make it
more obvious.
This was made using the coccinelle script below:
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_begin = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_flush = func,
...,
};
)
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct tegra_dc_state *crtc_state = e;
+ struct tegra_dc_state *dc_state = e;
<+...
- crtc_state
+ dc_state
...+>
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct mtk_crtc_state *crtc_state = e;
+ struct mtk_crtc_state *mtk_crtc_state = e;
<+...
- crtc_state
+ mtk_crtc_state
...+>
}
@ replaces_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct drm_crtc_state *crtc_state = crtc->state;
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ adds_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ include depends on adds_new_state || replaces_new_state @
@@
#include <drm/drm_atomic.h>
@ no_include depends on !include && (adds_new_state || replaces_new_state) @
@@
+ #include <drm/drm_atomic.h>
#include <drm/...>
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
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>
Cc: "James (Qian) Wang" <james.qian.wang@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Mihail Atanassov <mihail.atanassov@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201105164518.392891-1-maxime@cerno.tech
2020-11-05 17:45:18 +01:00
if ( crtc_state - > color_mgmt_changed & &
! crtc_state - > active_changed )
2019-10-10 16:43:50 -03:00
vop_crtc_gamma_set ( vop , crtc , old_crtc_state ) ;
}
2017-06-30 12:36:44 +03:00
static void vop_crtc_atomic_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 14:44:08 +02:00
struct drm_atomic_state * state )
2014-08-22 18:36:26 +08:00
{
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 14:44:08 +02:00
struct drm_crtc_state * old_state = drm_atomic_get_old_crtc_state ( state ,
crtc ) ;
2014-08-22 18:36:26 +08:00
struct vop * vop = to_vop ( crtc ) ;
2017-05-27 19:43:36 +08:00
const struct vop_data * vop_data = vop - > data ;
2016-04-20 10:41:42 +08:00
struct rockchip_crtc_state * s = to_rockchip_crtc_state ( crtc - > state ) ;
2015-11-30 18:22:42 +08:00
struct drm_display_mode * adjusted_mode = & crtc - > state - > adjusted_mode ;
2014-08-22 18:36:26 +08:00
u16 hsync_len = adjusted_mode - > hsync_end - adjusted_mode - > hsync_start ;
u16 hdisplay = adjusted_mode - > hdisplay ;
u16 htotal = adjusted_mode - > htotal ;
u16 hact_st = adjusted_mode - > htotal - adjusted_mode - > hsync_start ;
u16 hact_end = hact_st + hdisplay ;
u16 vdisplay = adjusted_mode - > vdisplay ;
u16 vtotal = adjusted_mode - > vtotal ;
u16 vsync_len = adjusted_mode - > vsync_end - adjusted_mode - > vsync_start ;
u16 vact_st = adjusted_mode - > vtotal - adjusted_mode - > vsync_start ;
u16 vact_end = vact_st + vdisplay ;
2016-04-20 14:18:16 +08:00
uint32_t pin_pol , val ;
2019-03-18 15:44:12 +00:00
int dither_bpc = s - > output_bpc ? s - > output_bpc : 10 ;
2016-08-15 16:12:29 -07:00
int ret ;
2014-08-22 18:36:26 +08:00
2019-06-11 12:08:24 -04:00
if ( old_state & & old_state - > self_refresh_active ) {
drm_crtc_vblank_on ( crtc ) ;
rockchip_drm_set_win_enabled ( crtc , true ) ;
return ;
}
2018-03-09 23:22:55 +01:00
mutex_lock ( & vop - > vop_lock ) ;
2016-06-08 14:19:12 +02:00
WARN_ON ( vop - > event ) ;
2019-06-11 12:08:22 -04:00
ret = vop_enable ( crtc , old_state ) ;
2016-08-15 16:12:29 -07:00
if ( ret ) {
2018-03-09 23:22:55 +01:00
mutex_unlock ( & vop - > vop_lock ) ;
2016-08-15 16:12:29 -07:00
DRM_DEV_ERROR ( vop - > dev , " Failed to enable vop (%d) \n " , ret ) ;
return ;
}
2019-10-10 11:44:52 +08:00
pin_pol = ( adjusted_mode - > flags & DRM_MODE_FLAG_PHSYNC ) ?
2017-02-24 12:55:03 +00:00
BIT ( HSYNC_POSITIVE ) : 0 ;
pin_pol | = ( adjusted_mode - > flags & DRM_MODE_FLAG_PVSYNC ) ?
BIT ( VSYNC_POSITIVE ) : 0 ;
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , output , pin_pol , pin_pol ) ;
2018-10-01 14:38:45 +02:00
VOP_REG_SET ( vop , output , mipi_dual_channel_en , 0 ) ;
2016-04-20 14:18:16 +08:00
2016-04-20 10:41:42 +08:00
switch ( s - > output_type ) {
case DRM_MODE_CONNECTOR_LVDS :
2019-10-10 11:44:52 +08:00
VOP_REG_SET ( vop , output , rgb_dclk_pol , 1 ) ;
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , output , rgb_pin_pol , pin_pol ) ;
2019-10-10 11:44:52 +08:00
VOP_REG_SET ( vop , output , rgb_en , 1 ) ;
2016-04-20 10:41:42 +08:00
break ;
case DRM_MODE_CONNECTOR_eDP :
2019-10-10 11:44:52 +08:00
VOP_REG_SET ( vop , output , edp_dclk_pol , 1 ) ;
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , output , edp_pin_pol , pin_pol ) ;
VOP_REG_SET ( vop , output , edp_en , 1 ) ;
2016-04-20 10:41:42 +08:00
break ;
case DRM_MODE_CONNECTOR_HDMIA :
2019-10-10 11:44:52 +08:00
VOP_REG_SET ( vop , output , hdmi_dclk_pol , 1 ) ;
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , output , hdmi_pin_pol , pin_pol ) ;
VOP_REG_SET ( vop , output , hdmi_en , 1 ) ;
2016-04-20 10:41:42 +08:00
break ;
case DRM_MODE_CONNECTOR_DSI :
2019-10-10 11:44:52 +08:00
VOP_REG_SET ( vop , output , mipi_dclk_pol , 1 ) ;
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , output , mipi_pin_pol , pin_pol ) ;
VOP_REG_SET ( vop , output , mipi_en , 1 ) ;
2018-10-01 14:38:45 +02:00
VOP_REG_SET ( vop , output , mipi_dual_channel_en ,
! ! ( s - > output_flags & ROCKCHIP_OUTPUT_DSI_DUAL ) ) ;
2016-04-20 10:41:42 +08:00
break ;
2017-02-05 15:54:56 +08:00
case DRM_MODE_CONNECTOR_DisplayPort :
2019-10-10 11:44:52 +08:00
VOP_REG_SET ( vop , output , dp_dclk_pol , 0 ) ;
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , output , dp_pin_pol , pin_pol ) ;
VOP_REG_SET ( vop , output , dp_en , 1 ) ;
2017-02-05 15:54:56 +08:00
break ;
2016-04-20 10:41:42 +08:00
default :
2016-08-12 13:00:54 -04:00
DRM_DEV_ERROR ( vop - > dev , " unsupported connector_type [%d] \n " ,
s - > output_type ) ;
2016-04-20 10:41:42 +08:00
}
2017-05-27 19:43:36 +08:00
/*
* if vop is not support RGB10 output , need force RGB10 to RGB888 .
*/
if ( s - > output_mode = = ROCKCHIP_OUT_MODE_AAAA & &
! ( vop_data - > feature & VOP_FEATURE_OUTPUT_RGB10 ) )
s - > output_mode = ROCKCHIP_OUT_MODE_P888 ;
2018-04-23 12:49:57 +02:00
2019-03-18 15:44:12 +00:00
if ( s - > output_mode = = ROCKCHIP_OUT_MODE_AAAA & & dither_bpc < = 8 )
2018-04-23 12:49:57 +02:00
VOP_REG_SET ( vop , common , pre_dither_down , 1 ) ;
else
VOP_REG_SET ( vop , common , pre_dither_down , 0 ) ;
2019-03-18 15:44:12 +00:00
if ( dither_bpc = = 6 ) {
VOP_REG_SET ( vop , common , dither_down_sel , DITHER_DOWN_ALLEGRO ) ;
VOP_REG_SET ( vop , common , dither_down_mode , RGB888_TO_RGB666 ) ;
VOP_REG_SET ( vop , common , dither_down_en , 1 ) ;
} else {
VOP_REG_SET ( vop , common , dither_down_en , 0 ) ;
}
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , common , out_mode , s - > output_mode ) ;
2014-08-22 18:36:26 +08:00
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , modeset , htotal_pw , ( htotal < < 16 ) | hsync_len ) ;
2014-08-22 18:36:26 +08:00
val = hact_st < < 16 ;
val | = hact_end ;
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , modeset , hact_st_end , val ) ;
VOP_REG_SET ( vop , modeset , hpost_st_end , val ) ;
2014-08-22 18:36:26 +08:00
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , modeset , vtotal_pw , ( vtotal < < 16 ) | vsync_len ) ;
2014-08-22 18:36:26 +08:00
val = vact_st < < 16 ;
val | = vact_end ;
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , modeset , vact_st_end , val ) ;
VOP_REG_SET ( vop , modeset , vpost_st_end , val ) ;
2014-08-22 18:36:26 +08:00
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , intr , line_flag_num [ 0 ] , vact_end ) ;
2017-04-27 14:54:17 +08:00
2014-08-22 18:36:26 +08:00
clk_set_rate ( vop - > dclk , adjusted_mode - > clock * 1000 ) ;
2015-12-16 18:08:17 +08:00
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , common , standby , 0 ) ;
2018-03-09 23:22:55 +01:00
mutex_unlock ( & vop - > vop_lock ) ;
2021-10-19 22:58:42 +01:00
/*
* If we have a GAMMA LUT in the state , then let ' s make sure
* it ' s updated . We might be coming out of suspend ,
* which means the LUT internal memory needs to be re - written .
*/
if ( crtc - > state - > gamma_lut )
vop_crtc_gamma_set ( vop , crtc , old_state ) ;
2014-08-22 18:36:26 +08:00
}
2016-09-14 21:54:56 +09:00
static bool vop_fs_irq_is_pending ( struct vop * vop )
{
return VOP_INTR_GET_TYPE ( vop , status , FS_INTR ) ;
}
static void vop_wait_for_irq_handler ( struct vop * vop )
{
bool pending ;
int ret ;
/*
* Spin until frame start interrupt status bit goes low , which means
* that interrupt handler was invoked and cleared it . The timeout of
* 10 msecs is really too long , but it is just a safety measure if
* something goes really wrong . The wait will only happen in the very
* unlikely case of a vblank happening exactly at the same time and
* shouldn ' t exceed microseconds range .
*/
ret = readx_poll_timeout_atomic ( vop_fs_irq_is_pending , vop , pending ,
! pending , 0 , 10 * 1000 ) ;
if ( ret )
DRM_DEV_ERROR ( vop - > dev , " VOP vblank IRQ stuck for 10 ms \n " ) ;
synchronize_irq ( vop - > irq ) ;
}
2019-10-10 16:43:50 -03:00
static int vop_crtc_atomic_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 13:32:21 +01:00
struct drm_atomic_state * state )
2019-10-10 16:43:50 -03:00
{
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 13:32:21 +01:00
struct drm_crtc_state * crtc_state = drm_atomic_get_new_crtc_state ( state ,
crtc ) ;
2019-10-10 16:43:50 -03:00
struct vop * vop = to_vop ( crtc ) ;
2020-03-11 15:55:41 +01:00
struct drm_plane * plane ;
struct drm_plane_state * plane_state ;
struct rockchip_crtc_state * s ;
int afbc_planes = 0 ;
2019-10-10 16:43:50 -03:00
if ( vop - > lut_regs & & crtc_state - > color_mgmt_changed & &
crtc_state - > gamma_lut ) {
unsigned int len ;
len = drm_color_lut_size ( crtc_state - > gamma_lut ) ;
if ( len ! = crtc - > gamma_size ) {
DRM_DEBUG_KMS ( " Invalid LUT size; got %d, expected %d \n " ,
len , crtc - > gamma_size ) ;
return - EINVAL ;
}
}
2020-03-11 15:55:41 +01:00
drm_atomic_crtc_state_for_each_plane ( plane , crtc_state ) {
plane_state =
drm_atomic_get_plane_state ( crtc_state - > state , plane ) ;
if ( IS_ERR ( plane_state ) ) {
DRM_DEBUG_KMS ( " Cannot get plane state for plane %s \n " ,
plane - > name ) ;
return PTR_ERR ( plane_state ) ;
}
if ( drm_is_afbc ( plane_state - > fb - > modifier ) )
+ + afbc_planes ;
}
if ( afbc_planes > 1 ) {
DRM_DEBUG_KMS ( " Invalid number of AFBC planes; got %d, expected at most 1 \n " , afbc_planes ) ;
return - EINVAL ;
}
s = to_rockchip_crtc_state ( crtc_state ) ;
s - > enable_afbc = afbc_planes > 0 ;
2019-10-10 16:43:50 -03:00
return 0 ;
}
2015-11-30 18:22:42 +08:00
static void vop_crtc_atomic_flush ( struct drm_crtc * crtc ,
drm/atomic: Pass the full state to CRTC atomic begin and flush
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_begin and atomic_flush.
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 old_crtc_state, old_state;
identifier crtc;
identifier f;
@@
f(struct drm_crtc_state *old_crtc_state)
{
...
struct drm_atomic_state *old_state = old_crtc_state->state;
<...
- FUNCS->atomic_begin(crtc, old_crtc_state);
+ FUNCS->atomic_begin(crtc, old_state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier old_crtc_state, old_state;
identifier crtc;
identifier f;
@@
f(struct drm_crtc_state *old_crtc_state)
{
...
struct drm_atomic_state *old_state = old_crtc_state->state;
<...
- FUNCS->atomic_flush(crtc, old_crtc_state);
+ FUNCS->atomic_flush(crtc, old_state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state, ...)
{
<...
- FUNCS->atomic_begin(crtc, crtc_state);
+ FUNCS->atomic_begin(crtc, state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state, ...)
{
<...
- FUNCS->atomic_flush(crtc, crtc_state);
+ FUNCS->atomic_flush(crtc, state);
...>
}
@@
identifier crtc, old_state;
@@
struct drm_crtc_helper_funcs {
...
- void (*atomic_begin)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_begin)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
- void (*atomic_flush)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_flush)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_begin = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_flush = 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
...+>
}
@@
identifier old_state;
identifier crtc;
@@
void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
+ struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
...
}
@@
identifier old_state;
identifier crtc;
@@
void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
);
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_begin(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
...
}
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_begin(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
);
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
...
}
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *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>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-2-maxime@cerno.tech
2020-10-28 13:32:22 +01:00
struct drm_atomic_state * state )
2014-08-22 18:36:26 +08:00
{
drm/atomic: Pass the full state to CRTC atomic begin and flush
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_begin and atomic_flush.
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 old_crtc_state, old_state;
identifier crtc;
identifier f;
@@
f(struct drm_crtc_state *old_crtc_state)
{
...
struct drm_atomic_state *old_state = old_crtc_state->state;
<...
- FUNCS->atomic_begin(crtc, old_crtc_state);
+ FUNCS->atomic_begin(crtc, old_state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
identifier old_crtc_state, old_state;
identifier crtc;
identifier f;
@@
f(struct drm_crtc_state *old_crtc_state)
{
...
struct drm_atomic_state *old_state = old_crtc_state->state;
<...
- FUNCS->atomic_flush(crtc, old_crtc_state);
+ FUNCS->atomic_flush(crtc, old_state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state, ...)
{
<...
- FUNCS->atomic_begin(crtc, crtc_state);
+ FUNCS->atomic_begin(crtc, state);
...>
}
@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier f;
@@
f(struct drm_device *dev, struct drm_atomic_state *state, ...)
{
<...
- FUNCS->atomic_flush(crtc, crtc_state);
+ FUNCS->atomic_flush(crtc, state);
...>
}
@@
identifier crtc, old_state;
@@
struct drm_crtc_helper_funcs {
...
- void (*atomic_begin)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_begin)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
- void (*atomic_flush)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+ void (*atomic_flush)(struct drm_crtc *crtc, struct drm_atomic_state *state);
...
}
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_begin = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_flush = 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
...+>
}
@@
identifier old_state;
identifier crtc;
@@
void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
+ struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
...
}
@@
identifier old_state;
identifier crtc;
@@
void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
);
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_begin(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
...
}
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_begin(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
);
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *state
)
{
...
}
@@
identifier old_state;
identifier crtc;
@@
void vmw_du_crtc_atomic_flush(struct drm_crtc *crtc,
- struct drm_crtc_state *old_state
+ struct drm_atomic_state *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>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-2-maxime@cerno.tech
2020-10-28 13:32:22 +01:00
struct drm_crtc_state * old_crtc_state = drm_atomic_get_old_crtc_state ( state ,
crtc ) ;
2016-09-14 21:54:57 +09:00
struct drm_atomic_state * old_state = old_crtc_state - > state ;
2017-07-12 10:13:37 +02:00
struct drm_plane_state * old_plane_state , * new_plane_state ;
2014-08-22 18:36:26 +08:00
struct vop * vop = to_vop ( crtc ) ;
2016-09-14 21:54:57 +09:00
struct drm_plane * plane ;
2020-03-11 15:55:41 +01:00
struct rockchip_crtc_state * s ;
2016-09-14 21:54:57 +09:00
int i ;
2014-08-22 18:36:26 +08:00
2015-11-30 18:22:42 +08:00
if ( WARN_ON ( ! vop - > is_enabled ) )
return ;
2014-08-22 18:36:26 +08:00
2015-11-30 18:22:42 +08:00
spin_lock ( & vop - > reg_lock ) ;
2014-08-22 18:36:26 +08:00
2020-03-11 15:55:41 +01:00
/* Enable AFBC if there is some AFBC window, disable otherwise. */
s = to_rockchip_crtc_state ( crtc - > state ) ;
VOP_AFBC_SET ( vop , enable , s - > enable_afbc ) ;
2015-11-30 18:22:42 +08:00
vop_cfg_done ( vop ) ;
2014-08-22 18:36:26 +08:00
2015-11-30 18:22:42 +08:00
spin_unlock ( & vop - > reg_lock ) ;
2016-09-14 21:54:56 +09:00
/*
* There is a ( rather unlikely ) possiblity that a vblank interrupt
* fired before we set the cfg_done bit . To avoid spuriously
* signalling flip completion we need to wait for it to finish .
*/
vop_wait_for_irq_handler ( vop ) ;
2016-09-14 21:54:57 +09:00
2016-09-14 21:55:00 +09:00
spin_lock_irq ( & crtc - > dev - > event_lock ) ;
if ( crtc - > state - > event ) {
WARN_ON ( drm_crtc_vblank_get ( crtc ) ! = 0 ) ;
WARN_ON ( vop - > event ) ;
vop - > event = crtc - > state - > event ;
crtc - > state - > event = NULL ;
}
spin_unlock_irq ( & crtc - > dev - > event_lock ) ;
2017-07-12 10:13:37 +02:00
for_each_oldnew_plane_in_state ( old_state , plane , old_plane_state ,
new_plane_state , i ) {
2016-09-14 21:54:57 +09:00
if ( ! old_plane_state - > fb )
continue ;
2017-07-12 10:13:37 +02:00
if ( old_plane_state - > fb = = new_plane_state - > fb )
2016-09-14 21:54:57 +09:00
continue ;
2017-08-11 15:33:06 +03:00
drm_framebuffer_get ( old_plane_state - > fb ) ;
2018-03-28 17:03:51 +01:00
WARN_ON ( drm_crtc_vblank_get ( crtc ) ! = 0 ) ;
2016-09-14 21:54:57 +09:00
drm_flip_work_queue ( & vop - > fb_unref_work , old_plane_state - > fb ) ;
set_bit ( VOP_PENDING_FB_UNREF , & vop - > pending ) ;
}
2014-08-22 18:36:26 +08:00
}
2015-11-30 18:22:42 +08:00
static const struct drm_crtc_helper_funcs vop_crtc_helper_funcs = {
. mode_fixup = vop_crtc_mode_fixup ,
2019-10-10 16:43:50 -03:00
. atomic_check = vop_crtc_atomic_check ,
. atomic_begin = vop_crtc_atomic_begin ,
2015-11-30 18:22:42 +08:00
. atomic_flush = vop_crtc_atomic_flush ,
2017-06-30 12:36:44 +03:00
. atomic_enable = vop_crtc_atomic_enable ,
2017-06-30 12:36:45 +03:00
. atomic_disable = vop_crtc_atomic_disable ,
2015-11-30 18:22:42 +08:00
} ;
2014-08-22 18:36:26 +08:00
static void vop_crtc_destroy ( struct drm_crtc * crtc )
{
drm_crtc_cleanup ( crtc ) ;
}
2016-04-20 10:41:42 +08:00
static struct drm_crtc_state * vop_crtc_duplicate_state ( struct drm_crtc * crtc )
{
struct rockchip_crtc_state * rockchip_state ;
2022-06-17 17:26:52 -07:00
if ( WARN_ON ( ! crtc - > state ) )
return NULL ;
2016-04-20 10:41:42 +08:00
rockchip_state = kzalloc ( sizeof ( * rockchip_state ) , GFP_KERNEL ) ;
if ( ! rockchip_state )
return NULL ;
__drm_atomic_helper_crtc_duplicate_state ( crtc , & rockchip_state - > base ) ;
return & rockchip_state - > base ;
}
static void vop_crtc_destroy_state ( struct drm_crtc * crtc ,
struct drm_crtc_state * state )
{
struct rockchip_crtc_state * s = to_rockchip_crtc_state ( state ) ;
2016-05-09 16:34:09 +02:00
__drm_atomic_helper_crtc_destroy_state ( & s - > base ) ;
2016-04-20 10:41:42 +08:00
kfree ( s ) ;
}
2019-03-01 13:56:23 +01:00
static void vop_crtc_reset ( struct drm_crtc * crtc )
{
struct rockchip_crtc_state * crtc_state =
kzalloc ( sizeof ( * crtc_state ) , GFP_KERNEL ) ;
if ( crtc - > state )
vop_crtc_destroy_state ( crtc , crtc - > state ) ;
__drm_atomic_helper_crtc_reset ( crtc , & crtc_state - > base ) ;
}
2017-03-06 15:02:26 -05:00
# ifdef CONFIG_DRM_ANALOGIX_DP
2017-03-03 14:39:36 +01:00
static struct drm_connector * vop_get_edp_connector ( struct vop * vop )
{
struct drm_connector * connector ;
2017-05-15 10:43:30 -03:00
struct drm_connector_list_iter conn_iter ;
2017-03-03 14:39:36 +01:00
2017-05-15 10:43:30 -03:00
drm_connector_list_iter_begin ( vop - > drm_dev , & conn_iter ) ;
drm_for_each_connector_iter ( connector , & conn_iter ) {
2017-03-03 14:39:36 +01:00
if ( connector - > connector_type = = DRM_MODE_CONNECTOR_eDP ) {
2017-05-15 10:43:30 -03:00
drm_connector_list_iter_end ( & conn_iter ) ;
2017-03-03 14:39:36 +01:00
return connector ;
}
2017-05-15 10:43:30 -03:00
}
drm_connector_list_iter_end ( & conn_iter ) ;
2017-03-03 14:39:36 +01:00
return NULL ;
}
static int vop_crtc_set_crc_source ( struct drm_crtc * crtc ,
2018-08-21 14:08:56 +05:30
const char * source_name )
2017-03-03 14:39:36 +01:00
{
struct vop * vop = to_vop ( crtc ) ;
struct drm_connector * connector ;
int ret ;
connector = vop_get_edp_connector ( vop ) ;
if ( ! connector )
return - EINVAL ;
if ( source_name & & strcmp ( source_name , " auto " ) = = 0 )
ret = analogix_dp_start_crc ( connector ) ;
else if ( ! source_name )
ret = analogix_dp_stop_crc ( connector ) ;
else
ret = - EINVAL ;
return ret ;
}
2018-07-13 19:29:35 +05:30
static int
vop_crtc_verify_crc_source ( struct drm_crtc * crtc , const char * source_name ,
size_t * values_cnt )
{
if ( source_name & & strcmp ( source_name , " auto " ) ! = 0 )
return - EINVAL ;
* values_cnt = 3 ;
return 0 ;
}
2017-03-06 15:02:26 -05:00
# else
static int vop_crtc_set_crc_source ( struct drm_crtc * crtc ,
2018-08-21 14:08:56 +05:30
const char * source_name )
2017-03-06 15:02:26 -05:00
{
return - ENODEV ;
}
2018-07-13 19:29:35 +05:30
static int
vop_crtc_verify_crc_source ( struct drm_crtc * crtc , const char * source_name ,
size_t * values_cnt )
{
return - ENODEV ;
}
2017-03-06 15:02:26 -05:00
# endif
2017-03-03 14:39:36 +01:00
2014-08-22 18:36:26 +08:00
static const struct drm_crtc_funcs vop_crtc_funcs = {
2015-11-30 18:22:42 +08:00
. set_config = drm_atomic_helper_set_config ,
. page_flip = drm_atomic_helper_page_flip ,
2014-08-22 18:36:26 +08:00
. destroy = vop_crtc_destroy ,
2016-07-14 16:29:15 +01:00
. reset = vop_crtc_reset ,
2016-04-20 10:41:42 +08:00
. atomic_duplicate_state = vop_crtc_duplicate_state ,
. atomic_destroy_state = vop_crtc_destroy_state ,
2017-02-07 17:16:29 +08:00
. enable_vblank = vop_crtc_enable_vblank ,
. disable_vblank = vop_crtc_disable_vblank ,
2017-03-03 14:39:36 +01:00
. set_crc_source = vop_crtc_set_crc_source ,
2018-07-13 19:29:35 +05:30
. verify_crc_source = vop_crtc_verify_crc_source ,
2014-08-22 18:36:26 +08:00
} ;
2016-09-14 21:54:57 +09:00
static void vop_fb_unref_worker ( struct drm_flip_work * work , void * val )
{
struct vop * vop = container_of ( work , struct vop , fb_unref_work ) ;
struct drm_framebuffer * fb = val ;
drm_crtc_vblank_put ( & vop - > crtc ) ;
2017-08-11 15:33:06 +03:00
drm_framebuffer_put ( fb ) ;
2016-09-14 21:54:57 +09:00
}
2015-11-30 18:22:42 +08:00
static void vop_handle_vblank ( struct vop * vop )
2014-08-22 18:36:26 +08:00
{
2015-11-30 18:22:42 +08:00
struct drm_device * drm = vop - > drm_dev ;
struct drm_crtc * crtc = & vop - > crtc ;
2014-08-22 18:36:26 +08:00
2018-02-20 13:01:20 +00:00
spin_lock ( & drm - > event_lock ) ;
2015-11-30 18:22:42 +08:00
if ( vop - > event ) {
drm_crtc_send_vblank_event ( crtc , vop - > event ) ;
2016-08-10 16:24:39 -04:00
drm_crtc_vblank_put ( crtc ) ;
2016-09-14 21:54:59 +09:00
vop - > event = NULL ;
2016-08-10 16:24:39 -04:00
}
2018-02-20 13:01:20 +00:00
spin_unlock ( & drm - > event_lock ) ;
2016-06-08 14:19:12 +02:00
2016-09-14 21:54:57 +09:00
if ( test_and_clear_bit ( VOP_PENDING_FB_UNREF , & vop - > pending ) )
drm_flip_work_commit ( & vop - > fb_unref_work , system_unbound_wq ) ;
2014-08-22 18:36:26 +08:00
}
static irqreturn_t vop_isr ( int irq , void * data )
{
struct vop * vop = data ;
2015-11-23 15:21:08 +08:00
struct drm_crtc * crtc = & vop - > crtc ;
2015-12-15 08:36:55 +08:00
uint32_t active_irqs ;
2015-02-04 13:10:31 +08:00
int ret = IRQ_NONE ;
2014-08-22 18:36:26 +08:00
2018-06-12 15:20:28 +02:00
/*
* The irq is shared with the iommu . If the runtime - pm state of the
* vop - device is disabled the irq has to be targeted at the iommu .
*/
if ( ! pm_runtime_get_if_in_use ( vop - > dev ) )
return IRQ_NONE ;
if ( vop_core_clks_enable ( vop ) ) {
DRM_DEV_ERROR_RATELIMITED ( vop - > dev , " couldn't enable clocks \n " ) ;
goto out ;
}
2014-08-22 18:36:26 +08:00
/*
2015-12-15 08:36:55 +08:00
* interrupt register has interrupt status , enable and clear bits , we
2014-08-22 18:36:26 +08:00
* must hold irq_lock to avoid a race with enable / disable_vblank ( ) .
*/
2018-02-20 13:01:20 +00:00
spin_lock ( & vop - > irq_lock ) ;
2015-12-15 08:36:55 +08:00
active_irqs = VOP_INTR_GET_TYPE ( vop , status , INTR_MASK ) ;
2014-08-22 18:36:26 +08:00
/* Clear all active interrupt sources */
if ( active_irqs )
2015-12-15 08:36:55 +08:00
VOP_INTR_SET_TYPE ( vop , clear , active_irqs , 1 ) ;
2018-02-20 13:01:20 +00:00
spin_unlock ( & vop - > irq_lock ) ;
2014-08-22 18:36:26 +08:00
/* This is expected for vop iommu irqs, since the irq is shared */
if ( ! active_irqs )
2018-06-12 15:20:28 +02:00
goto out_disable ;
2014-08-22 18:36:26 +08:00
2015-02-04 13:10:31 +08:00
if ( active_irqs & DSP_HOLD_VALID_INTR ) {
complete ( & vop - > dsp_hold_completion ) ;
active_irqs & = ~ DSP_HOLD_VALID_INTR ;
ret = IRQ_HANDLED ;
2014-08-22 18:36:26 +08:00
}
2016-07-24 14:57:40 +08:00
if ( active_irqs & LINE_FLAG_INTR ) {
complete ( & vop - > line_flag_completion ) ;
active_irqs & = ~ LINE_FLAG_INTR ;
ret = IRQ_HANDLED ;
}
2015-02-04 13:10:31 +08:00
if ( active_irqs & FS_INTR ) {
2015-11-23 15:21:08 +08:00
drm_crtc_handle_vblank ( crtc ) ;
2015-11-30 18:22:42 +08:00
vop_handle_vblank ( vop ) ;
2015-02-04 13:10:31 +08:00
active_irqs & = ~ FS_INTR ;
2015-11-30 18:22:42 +08:00
ret = IRQ_HANDLED ;
2015-02-04 13:10:31 +08:00
}
2014-08-22 18:36:26 +08:00
2015-02-04 13:10:31 +08:00
/* Unhandled irqs are spurious. */
if ( active_irqs )
2016-08-12 13:00:54 -04:00
DRM_DEV_ERROR ( vop - > dev , " Unknown VOP IRQs: %#02x \n " ,
active_irqs ) ;
2015-02-04 13:10:31 +08:00
2018-06-12 15:20:28 +02:00
out_disable :
vop_core_clks_disable ( vop ) ;
out :
pm_runtime_put ( vop - > dev ) ;
2015-02-04 13:10:31 +08:00
return ret ;
2014-08-22 18:36:26 +08:00
}
2019-01-09 15:56:39 -03:00
static void vop_plane_add_properties ( struct drm_plane * plane ,
const struct vop_win_data * win_data )
{
unsigned int flags = 0 ;
flags | = VOP_WIN_HAS_REG ( win_data , x_mir_en ) ? DRM_MODE_REFLECT_X : 0 ;
flags | = VOP_WIN_HAS_REG ( win_data , y_mir_en ) ? DRM_MODE_REFLECT_Y : 0 ;
if ( flags )
drm_plane_create_rotation_property ( plane , DRM_MODE_ROTATE_0 ,
DRM_MODE_ROTATE_0 | flags ) ;
}
2014-08-22 18:36:26 +08:00
static int vop_create_crtc ( struct vop * vop )
{
const struct vop_data * vop_data = vop - > data ;
struct device * dev = vop - > dev ;
struct drm_device * drm_dev = vop - > drm_dev ;
2016-03-07 14:00:52 -08:00
struct drm_plane * primary = NULL , * cursor = NULL , * plane , * tmp ;
2014-08-22 18:36:26 +08:00
struct drm_crtc * crtc = & vop - > crtc ;
struct device_node * port ;
int ret ;
int i ;
/*
* Create drm_plane for primary and cursor planes first , since we need
* to pass them to drm_crtc_init_with_planes , which sets the
* " possible_crtcs " to the newly initialized crtc .
*/
for ( i = 0 ; i < vop_data - > win_size ; i + + ) {
struct vop_win * vop_win = & vop - > win [ i ] ;
const struct vop_win_data * win_data = vop_win - > data ;
if ( win_data - > type ! = DRM_PLANE_TYPE_PRIMARY & &
win_data - > type ! = DRM_PLANE_TYPE_CURSOR )
continue ;
ret = drm_universal_plane_init ( vop - > drm_dev , & vop_win - > base ,
0 , & vop_plane_funcs ,
win_data - > phy - > data_formats ,
win_data - > phy - > nformats ,
2020-03-11 15:55:41 +01:00
win_data - > phy - > format_modifiers ,
win_data - > type , NULL ) ;
2014-08-22 18:36:26 +08:00
if ( ret ) {
2016-08-12 13:00:54 -04:00
DRM_DEV_ERROR ( vop - > dev , " failed to init plane %d \n " ,
ret ) ;
2014-08-22 18:36:26 +08:00
goto err_cleanup_planes ;
}
plane = & vop_win - > base ;
2015-11-30 18:22:42 +08:00
drm_plane_helper_add ( plane , & plane_helper_funcs ) ;
2019-01-09 15:56:39 -03:00
vop_plane_add_properties ( plane , win_data ) ;
2014-08-22 18:36:26 +08:00
if ( plane - > type = = DRM_PLANE_TYPE_PRIMARY )
primary = plane ;
else if ( plane - > type = = DRM_PLANE_TYPE_CURSOR )
cursor = plane ;
}
ret = drm_crtc_init_with_planes ( drm_dev , crtc , primary , cursor ,
drm: Pass 'name' to drm_crtc_init_with_planes()
Done with coccinelle for the most part. However, it thinks '...' is
part of the semantic patch, so I put an 'int DOTDOTDOT' placeholder
in its place and got rid of it with sed afterwards.
I didn't convert drm_crtc_init() since passing the varargs through
would mean either cpp macros or va_list, and I figured we don't
care about these legacy functions enough to warrant the extra pain.
@@
identifier dev, crtc, primary, cursor, funcs;
@@
int drm_crtc_init_with_planes(struct drm_device *dev,
struct drm_crtc *crtc,
struct drm_plane *primary, struct drm_plane *cursor,
const struct drm_crtc_funcs *funcs
+ ,const char *name, int DOTDOTDOT
)
{ ... }
@@
identifier dev, crtc, primary, cursor, funcs;
@@
int drm_crtc_init_with_planes(struct drm_device *dev,
struct drm_crtc *crtc,
struct drm_plane *primary, struct drm_plane *cursor,
const struct drm_crtc_funcs *funcs
+ ,const char *name, int DOTDOTDOT
);
@@
expression E1, E2, E3, E4, E5;
@@
drm_crtc_init_with_planes(E1, E2, E3, E4, E5
+ ,NULL
)
v2: Split crtc and plane changes apart
Pass NULL for no-name instead of ""
Leave drm_crtc_init() alone
v3: Add ', or NULL...' to @name kernel doc (Jani)
Annotate the function with __printf() attribute (Jani)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449670771-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-12-09 16:19:31 +02:00
& vop_crtc_funcs , NULL ) ;
2014-08-22 18:36:26 +08:00
if ( ret )
2016-03-07 14:00:52 -08:00
goto err_cleanup_planes ;
2014-08-22 18:36:26 +08:00
drm_crtc_helper_add ( crtc , & vop_crtc_helper_funcs ) ;
2019-10-10 16:43:50 -03:00
if ( vop - > lut_regs ) {
drm_mode_crtc_set_gamma_size ( crtc , vop_data - > lut_size ) ;
drm_crtc_enable_color_mgmt ( crtc , 0 , false , vop_data - > lut_size ) ;
}
2014-08-22 18:36:26 +08:00
/*
* Create drm_planes for overlay windows with possible_crtcs restricted
* to the newly created crtc .
*/
for ( i = 0 ; i < vop_data - > win_size ; i + + ) {
struct vop_win * vop_win = & vop - > win [ i ] ;
const struct vop_win_data * win_data = vop_win - > data ;
2018-06-26 22:47:13 +03:00
unsigned long possible_crtcs = drm_crtc_mask ( crtc ) ;
2014-08-22 18:36:26 +08:00
if ( win_data - > type ! = DRM_PLANE_TYPE_OVERLAY )
continue ;
ret = drm_universal_plane_init ( vop - > drm_dev , & vop_win - > base ,
possible_crtcs ,
& vop_plane_funcs ,
win_data - > phy - > data_formats ,
win_data - > phy - > nformats ,
2020-03-11 15:55:41 +01:00
win_data - > phy - > format_modifiers ,
win_data - > type , NULL ) ;
2014-08-22 18:36:26 +08:00
if ( ret ) {
2016-08-12 13:00:54 -04:00
DRM_DEV_ERROR ( vop - > dev , " failed to init overlay %d \n " ,
ret ) ;
2014-08-22 18:36:26 +08:00
goto err_cleanup_crtc ;
}
2015-11-30 18:22:42 +08:00
drm_plane_helper_add ( & vop_win - > base , & plane_helper_funcs ) ;
2019-01-09 15:56:39 -03:00
vop_plane_add_properties ( & vop_win - > base , win_data ) ;
2014-08-22 18:36:26 +08:00
}
port = of_get_child_by_name ( dev - > of_node , " port " ) ;
if ( ! port ) {
2017-07-18 16:43:04 -05:00
DRM_DEV_ERROR ( vop - > dev , " no port node found in %pOF \n " ,
dev - > of_node ) ;
2016-03-07 14:00:52 -08:00
ret = - ENOENT ;
2014-08-22 18:36:26 +08:00
goto err_cleanup_crtc ;
}
2016-09-14 21:54:57 +09:00
drm_flip_work_init ( & vop - > fb_unref_work , " fb_unref " ,
vop_fb_unref_worker ) ;
2015-02-04 13:10:31 +08:00
init_completion ( & vop - > dsp_hold_completion ) ;
2016-07-24 14:57:40 +08:00
init_completion ( & vop - > line_flag_completion ) ;
2014-08-22 18:36:26 +08:00
crtc - > port = port ;
2019-09-18 16:07:29 -04:00
ret = drm_self_refresh_helper_init ( crtc ) ;
2019-06-11 12:08:22 -04:00
if ( ret )
DRM_DEV_DEBUG_KMS ( vop - > dev ,
" Failed to init %s with SR helpers %d, ignoring \n " ,
crtc - > name , ret ) ;
2014-08-22 18:36:26 +08:00
return 0 ;
err_cleanup_crtc :
drm_crtc_cleanup ( crtc ) ;
err_cleanup_planes :
2016-03-07 14:00:52 -08:00
list_for_each_entry_safe ( plane , tmp , & drm_dev - > mode_config . plane_list ,
head )
2014-08-22 18:36:26 +08:00
drm_plane_cleanup ( plane ) ;
return ret ;
}
static void vop_destroy_crtc ( struct vop * vop )
{
struct drm_crtc * crtc = & vop - > crtc ;
2016-03-07 14:00:52 -08:00
struct drm_device * drm_dev = vop - > drm_dev ;
struct drm_plane * plane , * tmp ;
2014-08-22 18:36:26 +08:00
2019-06-11 12:08:22 -04:00
drm_self_refresh_helper_cleanup ( crtc ) ;
2014-08-22 18:36:26 +08:00
of_node_put ( crtc - > port ) ;
2016-03-07 14:00:52 -08:00
/*
* We need to cleanup the planes now . Why ?
*
* The planes are " &vop->win[i].base " . That means the memory is
* all part of the big " struct vop " chunk of memory . That memory
* was devm allocated and associated with this component . We need to
* free it ourselves before vop_unbind ( ) finishes .
*/
list_for_each_entry_safe ( plane , tmp , & drm_dev - > mode_config . plane_list ,
head )
vop_plane_destroy ( plane ) ;
/*
* Destroy CRTC after vop_plane_destroy ( ) since vop_disable_plane ( )
* references the CRTC .
*/
2014-08-22 18:36:26 +08:00
drm_crtc_cleanup ( crtc ) ;
2016-09-14 21:54:57 +09:00
drm_flip_work_cleanup ( & vop - > fb_unref_work ) ;
2014-08-22 18:36:26 +08:00
}
static int vop_initial ( struct vop * vop )
{
struct reset_control * ahb_rst ;
int i , ret ;
vop - > hclk = devm_clk_get ( vop - > dev , " hclk_vop " ) ;
if ( IS_ERR ( vop - > hclk ) ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev , " failed to get hclk source \n " ) ;
2014-08-22 18:36:26 +08:00
return PTR_ERR ( vop - > hclk ) ;
}
vop - > aclk = devm_clk_get ( vop - > dev , " aclk_vop " ) ;
if ( IS_ERR ( vop - > aclk ) ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev , " failed to get aclk source \n " ) ;
2014-08-22 18:36:26 +08:00
return PTR_ERR ( vop - > aclk ) ;
}
vop - > dclk = devm_clk_get ( vop - > dev , " dclk_vop " ) ;
if ( IS_ERR ( vop - > dclk ) ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev , " failed to get dclk source \n " ) ;
2014-08-22 18:36:26 +08:00
return PTR_ERR ( vop - > dclk ) ;
}
2022-06-15 06:26:44 +00:00
ret = pm_runtime_resume_and_get ( vop - > dev ) ;
2017-04-06 20:31:20 +08:00
if ( ret < 0 ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev , " failed to get pm runtime: %d \n " , ret ) ;
2017-04-06 20:31:20 +08:00
return ret ;
}
2014-08-22 18:36:26 +08:00
ret = clk_prepare ( vop - > dclk ) ;
if ( ret < 0 ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev , " failed to prepare dclk \n " ) ;
2017-04-06 20:31:20 +08:00
goto err_put_pm_runtime ;
2014-08-22 18:36:26 +08:00
}
2015-11-06 13:22:24 +01:00
/* Enable both the hclk and aclk to setup the vop */
ret = clk_prepare_enable ( vop - > hclk ) ;
2014-08-22 18:36:26 +08:00
if ( ret < 0 ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev , " failed to prepare/enable hclk \n " ) ;
2014-08-22 18:36:26 +08:00
goto err_unprepare_dclk ;
}
2015-11-06 13:22:24 +01:00
ret = clk_prepare_enable ( vop - > aclk ) ;
2014-08-22 18:36:26 +08:00
if ( ret < 0 ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev , " failed to prepare/enable aclk \n " ) ;
2015-11-06 13:22:24 +01:00
goto err_disable_hclk ;
2014-08-22 18:36:26 +08:00
}
2015-11-06 13:22:24 +01:00
2014-08-22 18:36:26 +08:00
/*
* do hclk_reset , reset all vop registers .
*/
ahb_rst = devm_reset_control_get ( vop - > dev , " ahb " ) ;
if ( IS_ERR ( ahb_rst ) ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev , " failed to get ahb reset \n " ) ;
2014-08-22 18:36:26 +08:00
ret = PTR_ERR ( ahb_rst ) ;
2015-11-06 13:22:24 +01:00
goto err_disable_aclk ;
2014-08-22 18:36:26 +08:00
}
reset_control_assert ( ahb_rst ) ;
usleep_range ( 10 , 20 ) ;
reset_control_deassert ( ahb_rst ) ;
2018-02-20 13:01:18 +00:00
VOP_INTR_SET_TYPE ( vop , clear , INTR_MASK , 1 ) ;
VOP_INTR_SET_TYPE ( vop , enable , INTR_MASK , 0 ) ;
2018-02-20 13:01:19 +00:00
for ( i = 0 ; i < vop - > len ; i + = sizeof ( u32 ) )
vop - > regsbak [ i / 4 ] = readl_relaxed ( vop - > regs + i ) ;
2014-08-22 18:36:26 +08:00
2017-07-28 14:06:25 +08:00
VOP_REG_SET ( vop , misc , global_regdone_en , 1 ) ;
VOP_REG_SET ( vop , common , dsp_blank , 0 ) ;
2014-08-22 18:36:26 +08:00
2019-06-11 12:08:23 -04:00
for ( i = 0 ; i < vop - > data - > win_size ; i + + ) {
struct vop_win * vop_win = & vop - > win [ i ] ;
const struct vop_win_data * win = vop_win - > data ;
2017-07-26 14:19:39 +08:00
int channel = i * 2 + 1 ;
2014-08-22 18:36:26 +08:00
2017-07-26 14:19:39 +08:00
VOP_WIN_SET ( vop , win , channel , ( channel + 1 ) < < 4 | channel ) ;
2019-06-11 12:08:23 -04:00
vop_win_disable ( vop , vop_win ) ;
2017-07-26 14:19:05 +08:00
VOP_WIN_SET ( vop , win , gate , 1 ) ;
2014-08-22 18:36:26 +08:00
}
vop_cfg_done ( vop ) ;
/*
* do dclk_reset , let all config take affect .
*/
vop - > dclk_rst = devm_reset_control_get ( vop - > dev , " dclk " ) ;
if ( IS_ERR ( vop - > dclk_rst ) ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev , " failed to get dclk reset \n " ) ;
2014-08-22 18:36:26 +08:00
ret = PTR_ERR ( vop - > dclk_rst ) ;
2015-11-06 13:22:24 +01:00
goto err_disable_aclk ;
2014-08-22 18:36:26 +08:00
}
reset_control_assert ( vop - > dclk_rst ) ;
usleep_range ( 10 , 20 ) ;
reset_control_deassert ( vop - > dclk_rst ) ;
clk_disable ( vop - > hclk ) ;
2015-11-06 13:22:24 +01:00
clk_disable ( vop - > aclk ) ;
2014-08-22 18:36:26 +08:00
2015-01-22 14:37:56 +08:00
vop - > is_enabled = false ;
2014-08-22 18:36:26 +08:00
2017-04-06 20:31:20 +08:00
pm_runtime_put_sync ( vop - > dev ) ;
2014-08-22 18:36:26 +08:00
return 0 ;
2015-11-06 13:22:24 +01:00
err_disable_aclk :
clk_disable_unprepare ( vop - > aclk ) ;
2014-08-22 18:36:26 +08:00
err_disable_hclk :
2015-11-06 13:22:24 +01:00
clk_disable_unprepare ( vop - > hclk ) ;
2014-08-22 18:36:26 +08:00
err_unprepare_dclk :
clk_unprepare ( vop - > dclk ) ;
2017-04-06 20:31:20 +08:00
err_put_pm_runtime :
pm_runtime_put_sync ( vop - > dev ) ;
2014-08-22 18:36:26 +08:00
return ret ;
}
/*
* Initialize the vop - > win array elements .
*/
static void vop_win_init ( struct vop * vop )
{
const struct vop_data * vop_data = vop - > data ;
unsigned int i ;
for ( i = 0 ; i < vop_data - > win_size ; i + + ) {
struct vop_win * vop_win = & vop - > win [ i ] ;
const struct vop_win_data * win_data = & vop_data - > win [ i ] ;
vop_win - > data = win_data ;
vop_win - > vop = vop ;
2019-01-26 01:24:37 +01:00
if ( vop_data - > win_yuv2yuv )
vop_win - > yuv2yuv_data = & vop_data - > win_yuv2yuv [ i ] ;
2014-08-22 18:36:26 +08:00
}
}
2016-07-24 14:57:40 +08:00
/**
2017-04-27 14:54:17 +08:00
* rockchip_drm_wait_vact_end
2016-07-24 14:57:40 +08:00
* @ crtc : CRTC to enable line flag
* @ mstimeout : millisecond for timeout
*
2017-04-27 14:54:17 +08:00
* Wait for vact_end line flag irq or timeout .
2016-07-24 14:57:40 +08:00
*
* Returns :
* Zero on success , negative errno on failure .
*/
2017-04-27 14:54:17 +08:00
int rockchip_drm_wait_vact_end ( struct drm_crtc * crtc , unsigned int mstimeout )
2016-07-24 14:57:40 +08:00
{
struct vop * vop = to_vop ( crtc ) ;
unsigned long jiffies_left ;
2018-03-09 23:22:55 +01:00
int ret = 0 ;
2016-07-24 14:57:40 +08:00
if ( ! crtc | | ! vop - > is_enabled )
return - ENODEV ;
2018-03-09 23:22:55 +01:00
mutex_lock ( & vop - > vop_lock ) ;
if ( mstimeout < = 0 ) {
ret = - EINVAL ;
goto out ;
}
2016-07-24 14:57:40 +08:00
2018-03-09 23:22:55 +01:00
if ( vop_line_flag_irq_is_enabled ( vop ) ) {
ret = - EBUSY ;
goto out ;
}
2016-07-24 14:57:40 +08:00
reinit_completion ( & vop - > line_flag_completion ) ;
2017-04-27 14:54:17 +08:00
vop_line_flag_irq_enable ( vop ) ;
2016-07-24 14:57:40 +08:00
jiffies_left = wait_for_completion_timeout ( & vop - > line_flag_completion ,
msecs_to_jiffies ( mstimeout ) ) ;
vop_line_flag_irq_disable ( vop ) ;
if ( jiffies_left = = 0 ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( vop - > dev , " Timeout waiting for IRQ \n " ) ;
2018-03-09 23:22:55 +01:00
ret = - ETIMEDOUT ;
goto out ;
2016-07-24 14:57:40 +08:00
}
2018-03-09 23:22:55 +01:00
out :
mutex_unlock ( & vop - > vop_lock ) ;
return ret ;
2016-07-24 14:57:40 +08:00
}
2017-04-27 14:54:17 +08:00
EXPORT_SYMBOL ( rockchip_drm_wait_vact_end ) ;
2016-07-24 14:57:40 +08:00
2014-08-22 18:36:26 +08:00
static int vop_bind ( struct device * dev , struct device * master , void * data )
{
struct platform_device * pdev = to_platform_device ( dev ) ;
const struct vop_data * vop_data ;
struct drm_device * drm_dev = data ;
struct vop * vop ;
struct resource * res ;
2015-04-20 01:00:53 +02:00
int ret , irq ;
2014-08-22 18:36:26 +08:00
2015-12-15 08:58:26 +08:00
vop_data = of_device_get_match_data ( dev ) ;
2014-08-22 18:36:26 +08:00
if ( ! vop_data )
return - ENODEV ;
/* Allocate vop struct and its vop_win array */
drm/rockchip: Use struct_size() in devm_kzalloc()
One of the more common cases of allocation size calculations is finding
the size of a structure that has a zero-sized array at the end, along
with memory for some number of elements for that array. For example:
struct foo {
int stuff;
void *entry[];
};
instance = devm_kzalloc(dev, sizeof(struct foo) + sizeof(void *) * count, GFP_KERNEL);
or, like in this particular case:
size = sizeof(struct foo) + sizeof(void *) * count;
instance = devm_kzalloc(dev, size, GFP_KERNEL);
Instead of leaving these open-coded and prone to type mistakes, we can
now use the new struct_size() helper:
instance = devm_kzalloc(dev, struct_size(instance, entry, count),
GFP_KERNEL);
This issue was detected with the help of Coccinelle.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180826184712.GA9330@embeddedor.com
2018-08-26 13:47:12 -05:00
vop = devm_kzalloc ( dev , struct_size ( vop , win , vop_data - > win_size ) ,
GFP_KERNEL ) ;
2014-08-22 18:36:26 +08:00
if ( ! vop )
return - ENOMEM ;
vop - > dev = dev ;
vop - > data = vop_data ;
vop - > drm_dev = drm_dev ;
dev_set_drvdata ( dev , vop ) ;
vop_win_init ( vop ) ;
res = platform_get_resource ( pdev , IORESOURCE_MEM , 0 ) ;
vop - > regs = devm_ioremap_resource ( dev , res ) ;
if ( IS_ERR ( vop - > regs ) )
return PTR_ERR ( vop - > regs ) ;
2022-04-22 11:28:54 +08:00
vop - > len = resource_size ( res ) ;
2014-08-22 18:36:26 +08:00
2019-10-10 16:43:50 -03:00
res = platform_get_resource ( pdev , IORESOURCE_MEM , 1 ) ;
if ( res ) {
2021-10-19 22:58:42 +01:00
if ( vop_data - > lut_size ! = 1024 & & vop_data - > lut_size ! = 256 ) {
DRM_DEV_ERROR ( dev , " unsupported gamma LUT size %d \n " , vop_data - > lut_size ) ;
2019-10-10 16:43:50 -03:00
return - EINVAL ;
}
vop - > lut_regs = devm_ioremap_resource ( dev , res ) ;
if ( IS_ERR ( vop - > lut_regs ) )
return PTR_ERR ( vop - > lut_regs ) ;
}
2014-08-22 18:36:26 +08:00
vop - > regsbak = devm_kzalloc ( dev , vop - > len , GFP_KERNEL ) ;
if ( ! vop - > regsbak )
return - ENOMEM ;
2015-04-20 01:00:53 +02:00
irq = platform_get_irq ( pdev , 0 ) ;
if ( irq < 0 ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( dev , " cannot find irq for vop \n " ) ;
2015-04-20 01:00:53 +02:00
return irq ;
2014-08-22 18:36:26 +08:00
}
2015-04-20 01:00:53 +02:00
vop - > irq = ( unsigned int ) irq ;
2014-08-22 18:36:26 +08:00
spin_lock_init ( & vop - > reg_lock ) ;
spin_lock_init ( & vop - > irq_lock ) ;
2018-03-09 23:22:55 +01:00
mutex_init ( & vop - > vop_lock ) ;
2014-08-22 18:36:26 +08:00
ret = vop_create_crtc ( vop ) ;
if ( ret )
2018-02-20 13:01:18 +00:00
return ret ;
2014-08-22 18:36:26 +08:00
pm_runtime_enable ( & pdev - > dev ) ;
2016-07-24 14:57:44 +08:00
2017-04-06 20:31:20 +08:00
ret = vop_initial ( vop ) ;
if ( ret < 0 ) {
2017-09-15 02:36:03 -06:00
DRM_DEV_ERROR ( & pdev - > dev ,
" cannot initial vop dev - err %d \n " , ret ) ;
2017-04-06 20:31:20 +08:00
goto err_disable_pm_runtime ;
}
2018-02-20 13:01:18 +00:00
ret = devm_request_irq ( dev , vop - > irq , vop_isr ,
IRQF_SHARED , dev_name ( dev ) , vop ) ;
if ( ret )
goto err_disable_pm_runtime ;
2018-08-30 23:12:06 +02:00
if ( vop - > data - > feature & VOP_FEATURE_INTERNAL_RGB ) {
vop - > rgb = rockchip_rgb_init ( dev , & vop - > crtc , vop - > drm_dev ) ;
if ( IS_ERR ( vop - > rgb ) ) {
ret = PTR_ERR ( vop - > rgb ) ;
goto err_disable_pm_runtime ;
}
}
2022-04-05 15:32:50 +01:00
rockchip_drm_dma_init_device ( drm_dev , dev ) ;
2014-08-22 18:36:26 +08:00
return 0 ;
2016-09-16 14:22:03 -04:00
2017-04-06 20:31:20 +08:00
err_disable_pm_runtime :
pm_runtime_disable ( & pdev - > dev ) ;
vop_destroy_crtc ( vop ) ;
2016-09-16 14:22:03 -04:00
return ret ;
2014-08-22 18:36:26 +08:00
}
static void vop_unbind ( struct device * dev , struct device * master , void * data )
{
struct vop * vop = dev_get_drvdata ( dev ) ;
2018-08-30 23:12:06 +02:00
if ( vop - > rgb )
rockchip_rgb_fini ( vop - > rgb ) ;
2014-08-22 18:36:26 +08:00
pm_runtime_disable ( dev ) ;
vop_destroy_crtc ( vop ) ;
2017-04-06 20:31:21 +08:00
clk_unprepare ( vop - > aclk ) ;
clk_unprepare ( vop - > hclk ) ;
clk_unprepare ( vop - > dclk ) ;
2014-08-22 18:36:26 +08:00
}
2015-12-15 08:58:26 +08:00
const struct component_ops vop_component_ops = {
2014-08-22 18:36:26 +08:00
. bind = vop_bind ,
. unbind = vop_unbind ,
} ;
2015-12-31 13:40:11 +11:00
EXPORT_SYMBOL_GPL ( vop_component_ops ) ;