korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-29 14:05:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] v4l: vsp1: Always setup the display list

Browse Source 
Make sure display list usage is correctly disabled by always setting up
the corresponding registers, including when the display list feature
isn't used.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Laurent Pinchart 2015-11-01 10:53:22 -02:00 committed by Mauro Carvalho Chehab
parent aa380ea0c5
commit 7939fef4d3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/platform/vsp1/vsp1_dl.c
View File

@ -243,15 +243,14 @@ done:
void vsp1_dl_setup(struct vsp1_device *vsp1) void vsp1_dl_setup(struct vsp1_device *vsp1)
{ {
u32 ctrl = (256 << VI6_DL_CTRL_AR_WAIT_SHIFT) u32 ctrl = (256 << VI6_DL_CTRL_AR_WAIT_SHIFT);
| VI6_DL_CTRL_DC2 | VI6_DL_CTRL_DC1 | VI6_DL_CTRL_DC0
| VI6_DL_CTRL_DLE;
/* The DRM pipeline operates with header-less display lists in /* The DRM pipeline operates with header-less display lists in
* Continuous Frame Mode. * Continuous Frame Mode.
*/ */
if (vsp1->drm) if (vsp1->drm)
ctrl |= VI6_DL_CTRL_CFM0 | VI6_DL_CTRL_NH0; ctrl |= VI6_DL_CTRL_DC2 | VI6_DL_CTRL_DC1 | VI6_DL_CTRL_DC0
| VI6_DL_CTRL_DLE | VI6_DL_CTRL_CFM0 | VI6_DL_CTRL_NH0;
vsp1_write(vsp1, VI6_DL_CTRL, ctrl); vsp1_write(vsp1, VI6_DL_CTRL, ctrl);
vsp1_write(vsp1, VI6_DL_SWAP, VI6_DL_SWAP_LWS); vsp1_write(vsp1, VI6_DL_SWAP, VI6_DL_SWAP_LWS);

1
drivers/media/platform/vsp1/vsp1_drv.c
View File

@ -462,7 +462,6 @@ static int vsp1_device_init(struct vsp1_device *vsp1)
vsp1_write(vsp1, VI6_DPR_HGT_SMPPT, (7 << VI6_DPR_SMPPT_TGW_SHIFT) | vsp1_write(vsp1, VI6_DPR_HGT_SMPPT, (7 << VI6_DPR_SMPPT_TGW_SHIFT) |
(VI6_DPR_NODE_UNUSED << VI6_DPR_SMPPT_PT_SHIFT)); (VI6_DPR_NODE_UNUSED << VI6_DPR_SMPPT_PT_SHIFT));
if (!vsp1->info->uapi)
vsp1_dl_setup(vsp1); vsp1_dl_setup(vsp1);
return 0; return 0;