drm/msm/mdp5: Add plane blending operation support for MDP5
Subsystems (4)
cover drm/msm/mdp5: Add plane blending operation support for MDP5
Jilai Wang (3):
drm/doc: Add description of drm properties in msm drm/msm/mdp5: Update generated header files drm/msm/mdp5: Add plane blending operation support for MDP5
Documentation/DocBook/drm.tmpl | 23 +++++++ drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 58 +++++++++++++--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 110 +++++++++++++++++++++--------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 66 ++++++++++++++++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 32 ++------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 16 ++--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 107 ++++++++++++++++++++++++++--- drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 4 ++ drivers/gpu/drm/msm/msm_drv.h | 10 +++ 9 files changed, 331 insertions(+), 95 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 1/3 drm/doc: Add description of drm properties in msm
Add plane properties "premultiplied/zpos/alpha" used in msm MDP driver to perform proper blending operation.
--- Documentation/DocBook/drm.tmpl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
Documentation/DocBook/drm.tmpl +23 -0
@@ -3500,6 +3500,29 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >Plane</td> <td valign="top" >TBD</td> </tr> + <tr> + <td rowspan="3" valign="top" >msm</td> + <td rowspan="3" valign="top" >Generic</td> + <td valign="top" >"premultiplied"</td> + <td valign="top" >RANGE</td> + <td valign="top" >Min=0, Max=1</td> + <td valign="top" >Plane</td> + <td valign="top" >property to indicate the framebuffer used by this plane is alpha pre-multiplied</td> + </tr> + <tr> + <td valign="top" >"alpha"</td> + <td valign="top" >RANGE</td> + <td valign="top" >Min=0, Max=255</td> + <td valign="top" >Plane</td> + <td valign="top" >property to set plane's global alpha value</td> + </tr> + <tr> + <td valign="top" >"zpos"</td> + <td valign="top" >RANGE</td> + <td valign="top" >Min=1, Max=255</td> + <td valign="top" >Plane</td> + <td valign="top" >property to set plane's z position during blending</td> + </tr> </tbody> </table> </sect2>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 1/3] drm/doc: Add description of drm properties in msm
Quoted 13 lines · Jilai Wang
Add plane properties "premultiplied/zpos/alpha" used in msm MDP driver to perform proper blending operation.
Signed-off-by Jilai Wang <[email protected]>--- Documentation/DocBook/drm.tmpl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)Documentation/DocBook/drm.tmpl +0
-0
Documentation/DocBook/drm.tmpl void intel_crt_init(struct drm_device *dev) · line 3507
Quoted 8 lines
Documentation/DocBook/drm.tmpl +5
-0@@ -3500,6 +3500,29 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >Plane</td> <td valign="top" >TBD</td> </tr> + <tr> + <td rowspan="3" valign="top" >msm</td> + <td rowspan="3" valign="top" >Generic</td> + <td valign="top" >"premultiplied"</td> + <td valign="top" >RANGE</td>
probably an ENUM property for this?
Quoted 7 lines
Documentation/DocBook/drm.tmpl +7
-0+ <td valign="top" >Min=0, Max=1</td> + <td valign="top" >Plane</td> + <td valign="top" >property to indicate the framebuffer used by this plane is alpha pre-multiplied</td> + </tr> + <tr> + <td valign="top" >"alpha"</td> + <td valign="top" >RANGE</td>
Documentation/DocBook/drm.tmpl void intel_crt_init(struct drm_device *dev) · line 3524
Quoted 10 lines
Documentation/DocBook/drm.tmpl +10
-0+ <td valign="top" >Min=0, Max=255</td> + <td valign="top" >Plane</td> + <td valign="top" >property to set plane's global alpha value</td> + </tr> + <tr> + <td valign="top" >"zpos"</td> + <td valign="top" >RANGE</td> + <td valign="top" >Min=1, Max=255</td> + <td valign="top" >Plane</td> + <td valign="top" >property to set plane's z position during blending</td>
looks like we already have alpha and zpos props.. although it wouldn't hurt to copy your description over for those props, since it is a bit more complete than "TBD" that we have currently
BR,
-R
Quoted 8 lines
Documentation/DocBook/drm.tmpl +1
-1+ </tr> </tbody> </table> </sect2> --The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/3 drm/doc: Add description of drm properties in msm(V2)
Add plane properties "premultiplied/zpos/alpha" used in msm MDP driver to perform proper blending operation.
V1: Initial change
V2: Change "premultiplied" property to enum (Rob's comment)
--- Documentation/DocBook/drm.tmpl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
Documentation/DocBook/drm.tmpl +23 -0
@@ -3500,6 +3500,29 @@ void intel_crt_init(struct drm_device *dev) <td valign="top" >Plane</td> <td valign="top" >TBD</td> </tr> + <tr> + <td rowspan="3" valign="top" >msm</td> + <td rowspan="3" valign="top" >Generic</td> + <td valign="top" >"premultiplied"</td> + <td valign="top" >ENUM</td> + <td valign="top" >{ "false", "true" }</td> + <td valign="top" >Plane</td> + <td valign="top" >property to indicate the framebuffer used by this plane is alpha pre-multiplied</td> + </tr> + <tr> + <td valign="top" >"alpha"</td> + <td valign="top" >RANGE</td> + <td valign="top" >Min=0, Max=255</td> + <td valign="top" >Plane</td> + <td valign="top" >property to set plane's global alpha value</td> + </tr> + <tr> + <td valign="top" >"zpos"</td> + <td valign="top" >RANGE</td> + <td valign="top" >Min=1, Max=255</td> + <td valign="top" >Plane</td> + <td valign="top" >property to set plane's z position during blending</td> + </tr> </tbody> </table> </sect2>
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/3 drm/msm/mdp5: Update generated header files
In reply to Jilai WangTo support mdp5 blending for mdp5 v1.5 and later
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 58 ++++++++++++++++++++++++++------ drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 4 +++ 2 files changed, 52 insertions(+), 10 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h +48 -10
@@ -381,49 +381,49 @@ static inline uint32_t REG_MDP5_CTL_LAYER(uint32_t i0, uint32_t i1) { return 0x0static inline uint32_t REG_MDP5_CTL_LAYER_REG (uint32_t i0,uint32_t i1) {return 0x00000000 +__offset_CTL (i0) +__offset_LAYER (i1); }#define MDP5_CTL_LAYER_REG_VIG0__MASK 0x00000007#define MDP5_CTL_LAYER_REG_VIG0__SHIFT 0 -static inline uint32_t MDP5_CTL_LAYER_REG_VIG0 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_VIG0 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_VIG0__SHIFT ) &MDP5_CTL_LAYER_REG_VIG0__MASK ; }#define MDP5_CTL_LAYER_REG_VIG1__MASK 0x00000038#define MDP5_CTL_LAYER_REG_VIG1__SHIFT 3 -static inline uint32_t MDP5_CTL_LAYER_REG_VIG1 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_VIG1 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_VIG1__SHIFT ) &MDP5_CTL_LAYER_REG_VIG1__MASK ; }#define MDP5_CTL_LAYER_REG_VIG2__MASK 0x000001c0#define MDP5_CTL_LAYER_REG_VIG2__SHIFT 6 -static inline uint32_t MDP5_CTL_LAYER_REG_VIG2 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_VIG2 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_VIG2__SHIFT ) &MDP5_CTL_LAYER_REG_VIG2__MASK ; }#define MDP5_CTL_LAYER_REG_RGB0__MASK 0x00000e00#define MDP5_CTL_LAYER_REG_RGB0__SHIFT 9 -static inline uint32_t MDP5_CTL_LAYER_REG_RGB0 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_RGB0 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_RGB0__SHIFT ) &MDP5_CTL_LAYER_REG_RGB0__MASK ; }#define MDP5_CTL_LAYER_REG_RGB1__MASK 0x00007000#define MDP5_CTL_LAYER_REG_RGB1__SHIFT 12 -static inline uint32_t MDP5_CTL_LAYER_REG_RGB1 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_RGB1 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_RGB1__SHIFT ) &MDP5_CTL_LAYER_REG_RGB1__MASK ; }#define MDP5_CTL_LAYER_REG_RGB2__MASK 0x00038000#define MDP5_CTL_LAYER_REG_RGB2__SHIFT 15 -static inline uint32_t MDP5_CTL_LAYER_REG_RGB2 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_RGB2 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_RGB2__SHIFT ) &MDP5_CTL_LAYER_REG_RGB2__MASK ; }#define MDP5_CTL_LAYER_REG_DMA0__MASK 0x001c0000#define MDP5_CTL_LAYER_REG_DMA0__SHIFT 18 -static inline uint32_t MDP5_CTL_LAYER_REG_DMA0 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_DMA0 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_DMA0__SHIFT ) &MDP5_CTL_LAYER_REG_DMA0__MASK ; }#define MDP5_CTL_LAYER_REG_DMA1__MASK 0x00e00000#define MDP5_CTL_LAYER_REG_DMA1__SHIFT 21 -static inline uint32_t MDP5_CTL_LAYER_REG_DMA1 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_DMA1 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_DMA1__SHIFT ) &MDP5_CTL_LAYER_REG_DMA1__MASK ; }
@@ -431,13 +431,13 @@ static inline uint32_t MDP5_CTL_LAYER_REG_DMA1(enum mdp_mixer_stage_id val)#define MDP5_CTL_LAYER_REG_CURSOR_OUT 0x02000000#define MDP5_CTL_LAYER_REG_VIG3__MASK 0x1c000000#define MDP5_CTL_LAYER_REG_VIG3__SHIFT 26 -static inline uint32_t MDP5_CTL_LAYER_REG_VIG3 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_VIG3 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_VIG3__SHIFT ) &MDP5_CTL_LAYER_REG_VIG3__MASK ; }#define MDP5_CTL_LAYER_REG_RGB3__MASK 0xe0000000#define MDP5_CTL_LAYER_REG_RGB3__SHIFT 29 -static inline uint32_t MDP5_CTL_LAYER_REG_RGB3 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_RGB3 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_RGB3__SHIFT ) &MDP5_CTL_LAYER_REG_RGB3__MASK ; }
@@ -499,6 +499,44 @@ static inline uint32_t REG_MDP5_CTL_START(uint32_t i0) { return 0x0000001c + __ostatic inline uint32_t REG_MDP5_CTL_PACK_3D (uint32_t i0) {return 0x00000020 +__offset_CTL (i0); } +static inline uint32_t __offset_LAYER_EXT (uint32_t idx) +{ +switch (idx) { +case 0 :return 0x00000040 ; +case 1 :return 0x00000044 ; +case 2 :return 0x00000048 ; +case 3 :return 0x0000004c ; +case 4 :return 0x00000050 ; +case 5 :return 0x00000054 ; +default :return INVALID_IDX (idx); + } +} +static inline uint32_t REG_MDP5_CTL_LAYER_EXT (uint32_t i0,uint32_t i1) {return 0x00000000 +__offset_CTL (i0) +__offset_LAYER_EXT (i1); } + +static inline uint32_t REG_MDP5_CTL_LAYER_EXT_REG (uint32_t i0,uint32_t i1) {return 0x00000000 +__offset_CTL (i0) +__offset_LAYER_EXT (i1); } +#define MDP5_CTL_LAYER_EXT_REG_VIG0_BIT3 0x00000001 +#define MDP5_CTL_LAYER_EXT_REG_VIG1_BIT3 0x00000004 +#define MDP5_CTL_LAYER_EXT_REG_VIG2_BIT3 0x00000010 +#define MDP5_CTL_LAYER_EXT_REG_VIG3_BIT3 0x00000040 +#define MDP5_CTL_LAYER_EXT_REG_RGB0_BIT3 0x00000100 +#define MDP5_CTL_LAYER_EXT_REG_RGB1_BIT3 0x00000400 +#define MDP5_CTL_LAYER_EXT_REG_RGB2_BIT3 0x00001000 +#define MDP5_CTL_LAYER_EXT_REG_RGB3_BIT3 0x00004000 +#define MDP5_CTL_LAYER_EXT_REG_DMA0_BIT3 0x00010000 +#define MDP5_CTL_LAYER_EXT_REG_DMA1_BIT3 0x00040000 +#define MDP5_CTL_LAYER_EXT_REG_CURSOR0__MASK 0x00f00000 +#define MDP5_CTL_LAYER_EXT_REG_CURSOR0__SHIFT 20 +static inline uint32_t MDP5_CTL_LAYER_EXT_REG_CURSOR0 (enum mdp_mixer_stage_id val) +{ +return ((val) <<MDP5_CTL_LAYER_EXT_REG_CURSOR0__SHIFT ) &MDP5_CTL_LAYER_EXT_REG_CURSOR0__MASK ; +} +#define MDP5_CTL_LAYER_EXT_REG_CURSOR1__MASK 0x3c000000 +#define MDP5_CTL_LAYER_EXT_REG_CURSOR1__SHIFT 26 +static inline uint32_t MDP5_CTL_LAYER_EXT_REG_CURSOR1 (enum mdp_mixer_stage_id val) +{ +return ((val) <<MDP5_CTL_LAYER_EXT_REG_CURSOR1__SHIFT ) &MDP5_CTL_LAYER_EXT_REG_CURSOR1__MASK ; +} +static inline uint32_t __offset_PIPE (enum mdp5_pipe idx) {switch (idx) {
drivers/gpu/drm/msm/mdp/mdp_common.xml.h +4 -0
@@ -65,6 +65,10 @@ enum mdp_mixer_stage_id {STAGE1 =3 ,STAGE2 =4 ,STAGE3 =5 , +STAGE4 =6 , +STAGE5 =7 , +STAGE6 =8 , + STAGE_MAX = 8, }; enum mdp_alpha_type {
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/3 drm/msm/mdp5: Update generated header files(V2)
To support mdp5 blending for mdp5 v1.5 and later
V1: Initial change
V2: After the stage number is increased to 7, BLENDx registers are
not continuous now. Using the offset for each BLEND stage to fix it.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 95 ++++++++++++++++++++++++-------- drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 4 ++ 2 files changed, 77 insertions(+), 22 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h +73 -22
@@ -381,49 +381,49 @@ static inline uint32_t REG_MDP5_CTL_LAYER(uint32_t i0, uint32_t i1) { return 0x0static inline uint32_t REG_MDP5_CTL_LAYER_REG (uint32_t i0,uint32_t i1) {return 0x00000000 +__offset_CTL (i0) +__offset_LAYER (i1); }#define MDP5_CTL_LAYER_REG_VIG0__MASK 0x00000007#define MDP5_CTL_LAYER_REG_VIG0__SHIFT 0 -static inline uint32_t MDP5_CTL_LAYER_REG_VIG0 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_VIG0 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_VIG0__SHIFT ) &MDP5_CTL_LAYER_REG_VIG0__MASK ; }#define MDP5_CTL_LAYER_REG_VIG1__MASK 0x00000038#define MDP5_CTL_LAYER_REG_VIG1__SHIFT 3 -static inline uint32_t MDP5_CTL_LAYER_REG_VIG1 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_VIG1 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_VIG1__SHIFT ) &MDP5_CTL_LAYER_REG_VIG1__MASK ; }#define MDP5_CTL_LAYER_REG_VIG2__MASK 0x000001c0#define MDP5_CTL_LAYER_REG_VIG2__SHIFT 6 -static inline uint32_t MDP5_CTL_LAYER_REG_VIG2 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_VIG2 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_VIG2__SHIFT ) &MDP5_CTL_LAYER_REG_VIG2__MASK ; }#define MDP5_CTL_LAYER_REG_RGB0__MASK 0x00000e00#define MDP5_CTL_LAYER_REG_RGB0__SHIFT 9 -static inline uint32_t MDP5_CTL_LAYER_REG_RGB0 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_RGB0 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_RGB0__SHIFT ) &MDP5_CTL_LAYER_REG_RGB0__MASK ; }#define MDP5_CTL_LAYER_REG_RGB1__MASK 0x00007000#define MDP5_CTL_LAYER_REG_RGB1__SHIFT 12 -static inline uint32_t MDP5_CTL_LAYER_REG_RGB1 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_RGB1 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_RGB1__SHIFT ) &MDP5_CTL_LAYER_REG_RGB1__MASK ; }#define MDP5_CTL_LAYER_REG_RGB2__MASK 0x00038000#define MDP5_CTL_LAYER_REG_RGB2__SHIFT 15 -static inline uint32_t MDP5_CTL_LAYER_REG_RGB2 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_RGB2 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_RGB2__SHIFT ) &MDP5_CTL_LAYER_REG_RGB2__MASK ; }#define MDP5_CTL_LAYER_REG_DMA0__MASK 0x001c0000#define MDP5_CTL_LAYER_REG_DMA0__SHIFT 18 -static inline uint32_t MDP5_CTL_LAYER_REG_DMA0 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_DMA0 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_DMA0__SHIFT ) &MDP5_CTL_LAYER_REG_DMA0__MASK ; }#define MDP5_CTL_LAYER_REG_DMA1__MASK 0x00e00000#define MDP5_CTL_LAYER_REG_DMA1__SHIFT 21 -static inline uint32_t MDP5_CTL_LAYER_REG_DMA1 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_DMA1 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_DMA1__SHIFT ) &MDP5_CTL_LAYER_REG_DMA1__MASK ; }
@@ -431,13 +431,13 @@ static inline uint32_t MDP5_CTL_LAYER_REG_DMA1(enum mdp_mixer_stage_id val)#define MDP5_CTL_LAYER_REG_CURSOR_OUT 0x02000000#define MDP5_CTL_LAYER_REG_VIG3__MASK 0x1c000000#define MDP5_CTL_LAYER_REG_VIG3__SHIFT 26 -static inline uint32_t MDP5_CTL_LAYER_REG_VIG3 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_VIG3 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_VIG3__SHIFT ) &MDP5_CTL_LAYER_REG_VIG3__MASK ; }#define MDP5_CTL_LAYER_REG_RGB3__MASK 0xe0000000#define MDP5_CTL_LAYER_REG_RGB3__SHIFT 29 -static inline uint32_t MDP5_CTL_LAYER_REG_RGB3 (enum mdp_mixer_stage_id val) +static inline uint32_t MDP5_CTL_LAYER_REG_RGB3 (uint32_t val) {return ((val) <<MDP5_CTL_LAYER_REG_RGB3__SHIFT ) &MDP5_CTL_LAYER_REG_RGB3__MASK ; }
@@ -499,6 +499,44 @@ static inline uint32_t REG_MDP5_CTL_START(uint32_t i0) { return 0x0000001c + __ostatic inline uint32_t REG_MDP5_CTL_PACK_3D (uint32_t i0) {return 0x00000020 +__offset_CTL (i0); } +static inline uint32_t __offset_LAYER_EXT (uint32_t idx) +{ +switch (idx) { +case 0 :return 0x00000040 ; +case 1 :return 0x00000044 ; +case 2 :return 0x00000048 ; +case 3 :return 0x0000004c ; +case 4 :return 0x00000050 ; +case 5 :return 0x00000054 ; +default :return INVALID_IDX (idx); + } +} +static inline uint32_t REG_MDP5_CTL_LAYER_EXT (uint32_t i0,uint32_t i1) {return 0x00000000 +__offset_CTL (i0) +__offset_LAYER_EXT (i1); } + +static inline uint32_t REG_MDP5_CTL_LAYER_EXT_REG (uint32_t i0,uint32_t i1) {return 0x00000000 +__offset_CTL (i0) +__offset_LAYER_EXT (i1); } +#define MDP5_CTL_LAYER_EXT_REG_VIG0_BIT3 0x00000001 +#define MDP5_CTL_LAYER_EXT_REG_VIG1_BIT3 0x00000004 +#define MDP5_CTL_LAYER_EXT_REG_VIG2_BIT3 0x00000010 +#define MDP5_CTL_LAYER_EXT_REG_VIG3_BIT3 0x00000040 +#define MDP5_CTL_LAYER_EXT_REG_RGB0_BIT3 0x00000100 +#define MDP5_CTL_LAYER_EXT_REG_RGB1_BIT3 0x00000400 +#define MDP5_CTL_LAYER_EXT_REG_RGB2_BIT3 0x00001000 +#define MDP5_CTL_LAYER_EXT_REG_RGB3_BIT3 0x00004000 +#define MDP5_CTL_LAYER_EXT_REG_DMA0_BIT3 0x00010000 +#define MDP5_CTL_LAYER_EXT_REG_DMA1_BIT3 0x00040000 +#define MDP5_CTL_LAYER_EXT_REG_CURSOR0__MASK 0x00f00000 +#define MDP5_CTL_LAYER_EXT_REG_CURSOR0__SHIFT 20 +static inline uint32_t MDP5_CTL_LAYER_EXT_REG_CURSOR0 (enum mdp_mixer_stage_id val) +{ +return ((val) <<MDP5_CTL_LAYER_EXT_REG_CURSOR0__SHIFT ) &MDP5_CTL_LAYER_EXT_REG_CURSOR0__MASK ; +} +#define MDP5_CTL_LAYER_EXT_REG_CURSOR1__MASK 0x3c000000 +#define MDP5_CTL_LAYER_EXT_REG_CURSOR1__SHIFT 26 +static inline uint32_t MDP5_CTL_LAYER_EXT_REG_CURSOR1 (enum mdp_mixer_stage_id val) +{ +return ((val) <<MDP5_CTL_LAYER_EXT_REG_CURSOR1__SHIFT ) &MDP5_CTL_LAYER_EXT_REG_CURSOR1__MASK ; +} +static inline uint32_t __offset_PIPE (enum mdp5_pipe idx) {switch (idx) {
@@ -984,9 +1022,22 @@ static inline uint32_t REG_MDP5_LM_BORDER_COLOR_0(uint32_t i0) { return 0x000000static inline uint32_t REG_MDP5_LM_BORDER_COLOR_1 (uint32_t i0) {return 0x00000010 +__offset_LM (i0); } -static inline uint32_t REG_MDP5_LM_BLEND (uint32_t i0,uint32_t i1) {return 0x00000020 +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t __offset_BLEND (uint32_t idx) +{ +switch (idx) { +case 0 :return 0x00000020 ; +case 1 :return 0x00000050 ; +case 2 :return 0x00000080 ; +case 3 :return 0x000000b0 ; +case 4 :return 0x00000230 ; +case 5 :return 0x00000260 ; +case 6 :return 0x00000290 ; +default :return INVALID_IDX (idx); + } +} +static inline uint32_t REG_MDP5_LM_BLEND (uint32_t i0,uint32_t i1) {return 0x00000000 +__offset_LM (i0) +__offset_BLEND (i1); } -static inline uint32_t REG_MDP5_LM_BLEND_OP_MODE (uint32_t i0,uint32_t i1) {return 0x00000020 +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t REG_MDP5_LM_BLEND_OP_MODE (uint32_t i0,uint32_t i1) {return 0x00000000 +__offset_LM (i0) +__offset_BLEND (i1); }#define MDP5_LM_BLEND_OP_MODE_FG_ALPHA__MASK 0x00000003#define MDP5_LM_BLEND_OP_MODE_FG_ALPHA__SHIFT 0static inline uint32_t MDP5_LM_BLEND_OP_MODE_FG_ALPHA (enum mdp_alpha_type val)
@@ -1008,25 +1059,25 @@ static inline uint32_t MDP5_LM_BLEND_OP_MODE_BG_ALPHA(enum mdp_alpha_type val)#define MDP5_LM_BLEND_OP_MODE_BG_INV_MOD_ALPHA 0x00001000#define MDP5_LM_BLEND_OP_MODE_BG_TRANSP_EN 0x00002000 -static inline uint32_t REG_MDP5_LM_BLEND_FG_ALPHA (uint32_t i0,uint32_t i1) {return 0x00000024 +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t REG_MDP5_LM_BLEND_FG_ALPHA (uint32_t i0,uint32_t i1) {return 0x00000004 +__offset_LM (i0) +__offset_BLEND (i1); } -static inline uint32_t REG_MDP5_LM_BLEND_BG_ALPHA (uint32_t i0,uint32_t i1) {return 0x00000028 +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t REG_MDP5_LM_BLEND_BG_ALPHA (uint32_t i0,uint32_t i1) {return 0x00000008 +__offset_LM (i0) +__offset_BLEND (i1); } -static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_LOW0 (uint32_t i0,uint32_t i1) {return 0x0000002c +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_LOW0 (uint32_t i0,uint32_t i1) {return 0x0000000c +__offset_LM (i0) +__offset_BLEND (i1); } -static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_LOW1 (uint32_t i0,uint32_t i1) {return 0x00000030 +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_LOW1 (uint32_t i0,uint32_t i1) {return 0x00000010 +__offset_LM (i0) +__offset_BLEND (i1); } -static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_HIGH0 (uint32_t i0,uint32_t i1) {return 0x00000034 +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_HIGH0 (uint32_t i0,uint32_t i1) {return 0x00000014 +__offset_LM (i0) +__offset_BLEND (i1); } -static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_HIGH1 (uint32_t i0,uint32_t i1) {return 0x00000038 +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_HIGH1 (uint32_t i0,uint32_t i1) {return 0x00000018 +__offset_LM (i0) +__offset_BLEND (i1); } -static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_LOW0 (uint32_t i0,uint32_t i1) {return 0x0000003c +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_LOW0 (uint32_t i0,uint32_t i1) {return 0x0000001c +__offset_LM (i0) +__offset_BLEND (i1); } -static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_LOW1 (uint32_t i0,uint32_t i1) {return 0x00000040 +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_LOW1 (uint32_t i0,uint32_t i1) {return 0x00000020 +__offset_LM (i0) +__offset_BLEND (i1); } -static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_HIGH0 (uint32_t i0,uint32_t i1) {return 0x00000044 +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_HIGH0 (uint32_t i0,uint32_t i1) {return 0x00000024 +__offset_LM (i0) +__offset_BLEND (i1); } -static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_HIGH1 (uint32_t i0,uint32_t i1) {return 0x00000048 +__offset_LM (i0) +0x30 *i1; } +static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_HIGH1 (uint32_t i0,uint32_t i1) {return 0x00000028 +__offset_LM (i0) +__offset_BLEND (i1); }static inline uint32_t REG_MDP5_LM_CURSOR_IMG_SIZE (uint32_t i0) {return 0x000000e0 +__offset_LM (i0); }#define MDP5_LM_CURSOR_IMG_SIZE_SRC_W__MASK 0x0000ffff
drivers/gpu/drm/msm/mdp/mdp_common.xml.h +4 -0
@@ -65,6 +65,10 @@ enum mdp_mixer_stage_id {STAGE1 =3 ,STAGE2 =4 ,STAGE3 =5 , +STAGE4 =6 , +STAGE5 =7 , +STAGE6 =8 , + STAGE_MAX = 8, }; enum mdp_alpha_type {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 3/3 drm/msm/mdp5: Add plane blending operation support for MDP5
In reply to Jilai WangThis change is to add properties alpha/zpos/premultiplied to mdp5 plane for alpha blending operation to generate the blended output.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 110 +++++++++++++++++++++--------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 66 ++++++++++++++++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 32 ++------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 16 ++--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 107 ++++++++++++++++++++++++++--- drivers/gpu/drm/msm/msm_drv.h | 10 +++ 6 files changed, 256 insertions(+), 85 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +76 -34
@@ -160,7 +160,7 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)if (mdp5_crtc->ctl && !crtc->state->enable) {/* set STAGE_UNUSED for all layers */ -mdp5_ctl_blend (mdp5_crtc->ctl, mdp5_crtc->lm,0x00000000 ); +mdp5_ctl_blend (mdp5_crtc->ctl, mdp5_crtc->lm,NULL ,0 ,0 );mdp5_ctl_release (mdp5_crtc->ctl); mdp5_crtc->ctl =NULL ; }
@@ -196,13 +196,9 @@ static bool mdp5_crtc_mode_fixup(struct drm_crtc *crtc,/* * blend_setup() - blend all the planes of a CRTC * -* When border is enabled, the border color will ALWAYS be the base layer. -* Therefore, the first plane (private RGB pipe) will start at STAGE0. -* If disabled, the first plane starts at STAGE_BASE. -* -* Note: -* Border is not enabled here because the private plane is exactly -* the CRTC resolution. +* If no base layer is available, border will be enabled as the base layer. +* Otherwise all layers will be blended based on their stage calculated +* in mdp5_crtc_atomic_check. */ static void blend_setup (struct drm_crtc *crtc) {
@@ -210,9 +206,14 @@ static void blend_setup(struct drm_crtc *crtc)struct mdp5_kms *mdp5_kms =get_kms (crtc);struct drm_plane *plane;const struct mdp5_cfg_hw *hw_cfg; -uint32_t lm = mdp5_crtc->lm, blend_cfg =0 ; +struct mdp5_plane_state *pstate, *pstates[STAGE_MAX +1 ] = {NULL }; +const struct mdp_format *format; +uint32_t lm = mdp5_crtc->lm; +uint32_t blend_op, fg_alpha, bg_alpha, ctl_blend_flags =0 ;unsigned long flags; -#define blender (stage) ((stage) - STAGE_BASE) +uint8_t stage[STAGE_MAX +1 ]; +int i, plane_cnt =0 ; +#define blender (stage) ((stage) - STAGE0) hw_cfg =mdp5_cfg_get_hw_config (mdp5_kms->cfg);
@@ -222,33 +223,73 @@ static void blend_setup(struct drm_crtc *crtc)if (!mdp5_crtc->ctl) goto out; +/* Collect all plane information */ drm_atomic_crtc_for_each_plane (plane, crtc) { -enum mdp_mixer_stage_id stage = -to_mdp5_plane_state (plane->state)->stage; + pstate =to_mdp5_plane_state (plane->state); + pstates[pstate->stage] = pstate; + stage[pstate->stage] =mdp5_plane_pipe (plane); + plane_cnt++; + } -/* -* Note: This cannot happen with current implementation but -* we need to check this condition once z property is added -*/ -BUG_ON (stage > hw_cfg->lm.nb_stages); +/* +* If there is no base layer, enable border color. +* Although it's not possbile in current blend logic, +* put it here as a reminder. +*/ +if (!pstates[STAGE_BASE ] && plane_cnt) { + ctl_blend_flags |=MDP5_CTL_BLEND_OP_FLAG_BORDER_OUT ; +DBG ("Border Color is enabled" ); + } -/* LM */ -mdp5_write (mdp5_kms, -REG_MDP5_LM_BLEND_OP_MODE (lm,blender (stage)), -MDP5_LM_BLEND_OP_MODE_FG_ALPHA (FG_CONST ) | -MDP5_LM_BLEND_OP_MODE_BG_ALPHA (BG_CONST )); +/* The reset for blending */ +for (i =STAGE0 ; i <=STAGE_MAX ; i++) { +if (!pstates[i]) +continue ; + + format =to_mdp_format ( +msm_framebuffer_format (pstates[i]->base.fb)); + plane = pstates[i]->base.plane; + blend_op =MDP5_LM_BLEND_OP_MODE_FG_ALPHA (FG_CONST ) | +MDP5_LM_BLEND_OP_MODE_BG_ALPHA (BG_CONST ); + fg_alpha = pstates[i]->alpha; + bg_alpha =0xFF - pstates[i]->alpha; +DBG ("Stage %d fg_alpha %x bg_alpha %x" , i, fg_alpha, bg_alpha); + +if (format->alpha_enable && pstates[i]->premultiplied) { + blend_op =MDP5_LM_BLEND_OP_MODE_FG_ALPHA (FG_CONST ) | +MDP5_LM_BLEND_OP_MODE_BG_ALPHA (FG_PIXEL ); +if (fg_alpha !=0xff ) { + bg_alpha = fg_alpha; + blend_op |= +MDP5_LM_BLEND_OP_MODE_BG_MOD_ALPHA | +MDP5_LM_BLEND_OP_MODE_BG_INV_MOD_ALPHA ; + }else { + blend_op |=MDP5_LM_BLEND_OP_MODE_BG_INV_ALPHA ; + } + }else if (format->alpha_enable) { + blend_op =MDP5_LM_BLEND_OP_MODE_FG_ALPHA (FG_PIXEL ) | +MDP5_LM_BLEND_OP_MODE_BG_ALPHA (FG_PIXEL ); +if (fg_alpha !=0xff ) { + bg_alpha = fg_alpha; + blend_op |= +MDP5_LM_BLEND_OP_MODE_FG_MOD_ALPHA | +MDP5_LM_BLEND_OP_MODE_FG_INV_MOD_ALPHA | +MDP5_LM_BLEND_OP_MODE_BG_MOD_ALPHA | +MDP5_LM_BLEND_OP_MODE_BG_INV_MOD_ALPHA ; + }else { + blend_op |=MDP5_LM_BLEND_OP_MODE_BG_INV_ALPHA ; + } + } + +mdp5_write (mdp5_kms,REG_MDP5_LM_BLEND_OP_MODE (lm, +blender (i)), blend_op);mdp5_write (mdp5_kms,REG_MDP5_LM_BLEND_FG_ALPHA (lm, -blender (stage)),0xff ); +blender (i)), fg_alpha);mdp5_write (mdp5_kms,REG_MDP5_LM_BLEND_BG_ALPHA (lm, -blender (stage)),0x00 ); -/* CTL */ - blend_cfg |=mdp_ctl_blend_mask (mdp5_plane_pipe (plane), stage); -DBG ("%s: blending pipe %s on stage=%d" , mdp5_crtc->name, -pipe2name (mdp5_plane_pipe (plane)), stage); +blender (i)), bg_alpha); } -DBG ("%s: lm%d: blend config = 0x%08x" , mdp5_crtc->name, lm, blend_cfg); -mdp5_ctl_blend (mdp5_crtc->ctl, lm, blend_cfg); +mdp5_ctl_blend (mdp5_crtc->ctl, lm, stage, plane_cnt, ctl_blend_flags); out:spin_unlock_irqrestore (&mdp5_crtc->lm_lock, flags);
@@ -339,7 +380,8 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,struct mdp5_kms *mdp5_kms =get_kms (crtc);struct drm_plane *plane;struct drm_device *dev = crtc->dev; -struct plane_state pstates[STAGE3 +1 ]; +struct plane_state pstates[STAGE_MAX +1 ]; +const struct mdp5_cfg_hw *hw_cfg;int cnt =0 , i;DBG ("%s: check" , mdp5_crtc->name);
@@ -354,10 +396,10 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,/* verify that there are not too many planes attached to crtc * and that we don't have conflicting mixer stages: */ + hw_cfg =mdp5_cfg_get_hw_config (mdp5_kms->cfg);drm_atomic_crtc_state_for_each_plane (plane, state) {struct drm_plane_state *pstate; - -if (cnt >=ARRAY_SIZE (pstates)) { +if (cnt >= (hw_cfg->lm.nb_stages)) {dev_err (dev->dev,"too many planes!\n" );return -EINVAL ; }
@@ -369,13 +411,13 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,*/ if (!pstate) pstate = plane->state; - pstates[cnt].plane = plane; pstates[cnt].state =to_mdp5_plane_state (pstate); cnt++; } +/* assign a stage based on sorted zpos property */ sort (pstates, cnt,sizeof (pstates[0 ]), pstate_cmp,NULL );for (i =0 ; i < cnt; i++) {
drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c +61 -5
91 lines not on this page · raw message
drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h +6 -26
@@ -42,39 +42,19 @@ int mdp5_ctl_set_encoder_state(struct mdp5_ctl *ctl, bool enabled);int mdp5_ctl_set_cursor (struct mdp5_ctl *ctl,int cursor_id,bool enable);/* -* blend_cfg (LM blender config): -* -* The function below allows the caller of mdp5_ctl_blend() to specify how pipes -* are being blended according to their stage (z-order), through @blend_cfg arg. -*/ -static inline u32 mdp_ctl_blend_mask (enum mdp5_pipe pipe, -enum mdp_mixer_stage_id stage) -{ -switch (pipe) { -case SSPP_VIG0 :return MDP5_CTL_LAYER_REG_VIG0 (stage); -case SSPP_VIG1 :return MDP5_CTL_LAYER_REG_VIG1 (stage); -case SSPP_VIG2 :return MDP5_CTL_LAYER_REG_VIG2 (stage); -case SSPP_RGB0 :return MDP5_CTL_LAYER_REG_RGB0 (stage); -case SSPP_RGB1 :return MDP5_CTL_LAYER_REG_RGB1 (stage); -case SSPP_RGB2 :return MDP5_CTL_LAYER_REG_RGB2 (stage); -case SSPP_DMA0 :return MDP5_CTL_LAYER_REG_DMA0 (stage); -case SSPP_DMA1 :return MDP5_CTL_LAYER_REG_DMA1 (stage); -case SSPP_VIG3 :return MDP5_CTL_LAYER_REG_VIG3 (stage); -case SSPP_RGB3 :return MDP5_CTL_LAYER_REG_RGB3 (stage); -default :return 0 ; - } -} - -/* * mdp5_ctl_blend() - Blend multiple layers on a Layer Mixer (LM) * -* @blend_cfg: see LM blender config definition below +* @stage: array to contain the pipe num for each stage +* @stage_cnt: valid stage number in stage array +* @ctl_blend_op_flags: blender operation mode flags * * Note: * CTL registers need to be flushed after calling this function * (call mdp5_ctl_commit() with mdp_ctl_flush_mask_ctl() mask) */ -int mdp5_ctl_blend (struct mdp5_ctl *ctl,u32 lm,u32 blend_cfg); +#define MDP5_CTL_BLEND_OP_FLAG_BORDER_OUT BIT(0) +int mdp5_ctl_blend (struct mdp5_ctl *ctl,u32 lm,u8 *stage,u32 stage_cnt, +u32 ctl_blend_op_flags);/** * mdp_ctl_flush_mask...() - Register FLUSH masks
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +5 -11
@@ -70,18 +70,12 @@ struct mdp5_kms {struct mdp5_plane_state {struct drm_plane_state base; -/* "virtual" zpos.. we calculate actual mixer-stage at runtime -* by sorting the attached planes by zpos and then assigning -* mixer stage lowest to highest. Private planes get default -* zpos of zero, and public planes a unique value that is -* greater than zero. This way, things work out if a naive -* userspace assigns planes to a crtc without setting zpos. -*/ -int zpos; +/* aligned with property */ +uint8_t premultiplied; +uint8_t zpos; +uint8_t alpha; -/* the actual mixer stage, calculated in crtc->atomic_check() -* NOTE: this should move to mdp5_crtc_state, when that exists -*/ +/* assigned by crtc blender */ enum mdp_mixer_stage_id stage;/* some additional transactional status to help us know in the
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +98 -9
129 lines not on this page · raw message
drivers/gpu/drm/msm/msm_drv.h +10 -0
@@ -64,6 +64,13 @@ struct msm_file_private {int dummy; }; +enum msm_mdp_plane_property { +PLANE_PROP_ZPOS , +PLANE_PROP_ALPHA , +PLANE_PROP_PREMULTIPLIED , +PLANE_PROP_MAX_NUM +}; +struct msm_drm_private {struct msm_kms *kms;
@@ -128,6 +135,9 @@ struct msm_drm_private {unsigned int num_connectors;struct drm_connector *connectors[8 ]; +/* Properties */ +struct drm_property *plane_property[PLANE_PROP_MAX_NUM ]; +/* VRAM carveout, used when no IOMMU: */ struct {unsigned long size;
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/3 drm/msm/mdp5: Add plane blending operation support for MDP5(V2)
This change is to add properties alpha/zpos/blend_mode to mdp5 plane for alpha blending operation to generate the blended output.
V1: Initial change
V2: Change "premultilied" property to enum (Rob's comment)
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 110 ++++++++++++++++++-------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 66 ++++++++++++++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 32 ++------ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 16 ++-- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 124 +++++++++++++++++++++++++++--- drivers/gpu/drm/msm/msm_drv.h | 10 +++ 6 files changed, 273 insertions(+), 85 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +76 -34
@@ -160,7 +160,7 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)if (mdp5_crtc->ctl && !crtc->state->enable) {/* set STAGE_UNUSED for all layers */ -mdp5_ctl_blend (mdp5_crtc->ctl, mdp5_crtc->lm,0x00000000 ); +mdp5_ctl_blend (mdp5_crtc->ctl, mdp5_crtc->lm,NULL ,0 ,0 );mdp5_ctl_release (mdp5_crtc->ctl); mdp5_crtc->ctl =NULL ; }
@@ -196,13 +196,9 @@ static bool mdp5_crtc_mode_fixup(struct drm_crtc *crtc,/* * blend_setup() - blend all the planes of a CRTC * -* When border is enabled, the border color will ALWAYS be the base layer. -* Therefore, the first plane (private RGB pipe) will start at STAGE0. -* If disabled, the first plane starts at STAGE_BASE. -* -* Note: -* Border is not enabled here because the private plane is exactly -* the CRTC resolution. +* If no base layer is available, border will be enabled as the base layer. +* Otherwise all layers will be blended based on their stage calculated +* in mdp5_crtc_atomic_check. */ static void blend_setup (struct drm_crtc *crtc) {
@@ -210,9 +206,14 @@ static void blend_setup(struct drm_crtc *crtc)struct mdp5_kms *mdp5_kms =get_kms (crtc);struct drm_plane *plane;const struct mdp5_cfg_hw *hw_cfg; -uint32_t lm = mdp5_crtc->lm, blend_cfg =0 ; +struct mdp5_plane_state *pstate, *pstates[STAGE_MAX +1 ] = {NULL }; +const struct mdp_format *format; +uint32_t lm = mdp5_crtc->lm; +uint32_t blend_op, fg_alpha, bg_alpha, ctl_blend_flags =0 ;unsigned long flags; -#define blender (stage) ((stage) - STAGE_BASE) +uint8_t stage[STAGE_MAX +1 ]; +int i, plane_cnt =0 ; +#define blender (stage) ((stage) - STAGE0) hw_cfg =mdp5_cfg_get_hw_config (mdp5_kms->cfg);
@@ -222,33 +223,73 @@ static void blend_setup(struct drm_crtc *crtc)if (!mdp5_crtc->ctl) goto out; +/* Collect all plane information */ drm_atomic_crtc_for_each_plane (plane, crtc) { -enum mdp_mixer_stage_id stage = -to_mdp5_plane_state (plane->state)->stage; + pstate =to_mdp5_plane_state (plane->state); + pstates[pstate->stage] = pstate; + stage[pstate->stage] =mdp5_plane_pipe (plane); + plane_cnt++; + } -/* -* Note: This cannot happen with current implementation but -* we need to check this condition once z property is added -*/ -BUG_ON (stage > hw_cfg->lm.nb_stages); +/* +* If there is no base layer, enable border color. +* Although it's not possbile in current blend logic, +* put it here as a reminder. +*/ +if (!pstates[STAGE_BASE ] && plane_cnt) { + ctl_blend_flags |=MDP5_CTL_BLEND_OP_FLAG_BORDER_OUT ; +DBG ("Border Color is enabled" ); + } -/* LM */ -mdp5_write (mdp5_kms, -REG_MDP5_LM_BLEND_OP_MODE (lm,blender (stage)), -MDP5_LM_BLEND_OP_MODE_FG_ALPHA (FG_CONST ) | -MDP5_LM_BLEND_OP_MODE_BG_ALPHA (BG_CONST )); +/* The reset for blending */ +for (i =STAGE0 ; i <=STAGE_MAX ; i++) { +if (!pstates[i]) +continue ; + + format =to_mdp_format ( +msm_framebuffer_format (pstates[i]->base.fb)); + plane = pstates[i]->base.plane; + blend_op =MDP5_LM_BLEND_OP_MODE_FG_ALPHA (FG_CONST ) | +MDP5_LM_BLEND_OP_MODE_BG_ALPHA (BG_CONST ); + fg_alpha = pstates[i]->alpha; + bg_alpha =0xFF - pstates[i]->alpha; +DBG ("Stage %d fg_alpha %x bg_alpha %x" , i, fg_alpha, bg_alpha); + +if (format->alpha_enable && pstates[i]->premultiplied) { + blend_op =MDP5_LM_BLEND_OP_MODE_FG_ALPHA (FG_CONST ) | +MDP5_LM_BLEND_OP_MODE_BG_ALPHA (FG_PIXEL ); +if (fg_alpha !=0xff ) { + bg_alpha = fg_alpha; + blend_op |= +MDP5_LM_BLEND_OP_MODE_BG_MOD_ALPHA | +MDP5_LM_BLEND_OP_MODE_BG_INV_MOD_ALPHA ; + }else { + blend_op |=MDP5_LM_BLEND_OP_MODE_BG_INV_ALPHA ; + } + }else if (format->alpha_enable) { + blend_op =MDP5_LM_BLEND_OP_MODE_FG_ALPHA (FG_PIXEL ) | +MDP5_LM_BLEND_OP_MODE_BG_ALPHA (FG_PIXEL ); +if (fg_alpha !=0xff ) { + bg_alpha = fg_alpha; + blend_op |= +MDP5_LM_BLEND_OP_MODE_FG_MOD_ALPHA | +MDP5_LM_BLEND_OP_MODE_FG_INV_MOD_ALPHA | +MDP5_LM_BLEND_OP_MODE_BG_MOD_ALPHA | +MDP5_LM_BLEND_OP_MODE_BG_INV_MOD_ALPHA ; + }else { + blend_op |=MDP5_LM_BLEND_OP_MODE_BG_INV_ALPHA ; + } + } + +mdp5_write (mdp5_kms,REG_MDP5_LM_BLEND_OP_MODE (lm, +blender (i)), blend_op);mdp5_write (mdp5_kms,REG_MDP5_LM_BLEND_FG_ALPHA (lm, -blender (stage)),0xff ); +blender (i)), fg_alpha);mdp5_write (mdp5_kms,REG_MDP5_LM_BLEND_BG_ALPHA (lm, -blender (stage)),0x00 ); -/* CTL */ - blend_cfg |=mdp_ctl_blend_mask (mdp5_plane_pipe (plane), stage); -DBG ("%s: blending pipe %s on stage=%d" , mdp5_crtc->name, -pipe2name (mdp5_plane_pipe (plane)), stage); +blender (i)), bg_alpha); } -DBG ("%s: lm%d: blend config = 0x%08x" , mdp5_crtc->name, lm, blend_cfg); -mdp5_ctl_blend (mdp5_crtc->ctl, lm, blend_cfg); +mdp5_ctl_blend (mdp5_crtc->ctl, lm, stage, plane_cnt, ctl_blend_flags); out:spin_unlock_irqrestore (&mdp5_crtc->lm_lock, flags);
@@ -339,7 +380,8 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,struct mdp5_kms *mdp5_kms =get_kms (crtc);struct drm_plane *plane;struct drm_device *dev = crtc->dev; -struct plane_state pstates[STAGE3 +1 ]; +struct plane_state pstates[STAGE_MAX +1 ]; +const struct mdp5_cfg_hw *hw_cfg;int cnt =0 , i;DBG ("%s: check" , mdp5_crtc->name);
@@ -354,10 +396,10 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,/* verify that there are not too many planes attached to crtc * and that we don't have conflicting mixer stages: */ + hw_cfg =mdp5_cfg_get_hw_config (mdp5_kms->cfg);drm_atomic_crtc_state_for_each_plane (plane, state) {struct drm_plane_state *pstate; - -if (cnt >=ARRAY_SIZE (pstates)) { +if (cnt >= (hw_cfg->lm.nb_stages)) {dev_err (dev->dev,"too many planes!\n" );return -EINVAL ; }
@@ -369,13 +411,13 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,*/ if (!pstate) pstate = plane->state; - pstates[cnt].plane = plane; pstates[cnt].state =to_mdp5_plane_state (pstate); cnt++; } +/* assign a stage based on sorted zpos property */ sort (pstates, cnt,sizeof (pstates[0 ]), pstate_cmp,NULL );for (i =0 ; i < cnt; i++) {
drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c +61 -5
91 lines not on this page · raw message
drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h +6 -26
@@ -42,39 +42,19 @@ int mdp5_ctl_set_encoder_state(struct mdp5_ctl *ctl, bool enabled);int mdp5_ctl_set_cursor (struct mdp5_ctl *ctl,int cursor_id,bool enable);/* -* blend_cfg (LM blender config): -* -* The function below allows the caller of mdp5_ctl_blend() to specify how pipes -* are being blended according to their stage (z-order), through @blend_cfg arg. -*/ -static inline u32 mdp_ctl_blend_mask (enum mdp5_pipe pipe, -enum mdp_mixer_stage_id stage) -{ -switch (pipe) { -case SSPP_VIG0 :return MDP5_CTL_LAYER_REG_VIG0 (stage); -case SSPP_VIG1 :return MDP5_CTL_LAYER_REG_VIG1 (stage); -case SSPP_VIG2 :return MDP5_CTL_LAYER_REG_VIG2 (stage); -case SSPP_RGB0 :return MDP5_CTL_LAYER_REG_RGB0 (stage); -case SSPP_RGB1 :return MDP5_CTL_LAYER_REG_RGB1 (stage); -case SSPP_RGB2 :return MDP5_CTL_LAYER_REG_RGB2 (stage); -case SSPP_DMA0 :return MDP5_CTL_LAYER_REG_DMA0 (stage); -case SSPP_DMA1 :return MDP5_CTL_LAYER_REG_DMA1 (stage); -case SSPP_VIG3 :return MDP5_CTL_LAYER_REG_VIG3 (stage); -case SSPP_RGB3 :return MDP5_CTL_LAYER_REG_RGB3 (stage); -default :return 0 ; - } -} - -/* * mdp5_ctl_blend() - Blend multiple layers on a Layer Mixer (LM) * -* @blend_cfg: see LM blender config definition below +* @stage: array to contain the pipe num for each stage +* @stage_cnt: valid stage number in stage array +* @ctl_blend_op_flags: blender operation mode flags * * Note: * CTL registers need to be flushed after calling this function * (call mdp5_ctl_commit() with mdp_ctl_flush_mask_ctl() mask) */ -int mdp5_ctl_blend (struct mdp5_ctl *ctl,u32 lm,u32 blend_cfg); +#define MDP5_CTL_BLEND_OP_FLAG_BORDER_OUT BIT(0) +int mdp5_ctl_blend (struct mdp5_ctl *ctl,u32 lm,u8 *stage,u32 stage_cnt, +u32 ctl_blend_op_flags);/** * mdp_ctl_flush_mask...() - Register FLUSH masks
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +5 -11
@@ -70,18 +70,12 @@ struct mdp5_kms {struct mdp5_plane_state {struct drm_plane_state base; -/* "virtual" zpos.. we calculate actual mixer-stage at runtime -* by sorting the attached planes by zpos and then assigning -* mixer stage lowest to highest. Private planes get default -* zpos of zero, and public planes a unique value that is -* greater than zero. This way, things work out if a naive -* userspace assigns planes to a crtc without setting zpos. -*/ -int zpos; +/* aligned with property */ +uint8_t premultiplied; +uint8_t zpos; +uint8_t alpha; -/* the actual mixer stage, calculated in crtc->atomic_check() -* NOTE: this should move to mdp5_crtc_state, when that exists -*/ +/* assigned by crtc blender */ enum mdp_mixer_stage_id stage;/* some additional transactional status to help us know in the
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +115 -9
150 lines not on this page · raw message
drivers/gpu/drm/msm/msm_drv.h +10 -0
@@ -64,6 +64,13 @@ struct msm_file_private {int dummy; }; +enum msm_mdp_plane_property { +PLANE_PROP_ZPOS , +PLANE_PROP_ALPHA , +PLANE_PROP_PREMULTIPLIED , +PLANE_PROP_MAX_NUM +}; +struct msm_drm_private {struct msm_kms *kms;
@@ -128,6 +135,9 @@ struct msm_drm_private {unsigned int num_connectors;struct drm_connector *connectors[8 ]; +/* Properties */ +struct drm_property *plane_property[PLANE_PROP_MAX_NUM ]; +/* VRAM carveout, used when no IOMMU: */ struct {unsigned long size;
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel