diff options
| author |   Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2020-10-22 16:16:55 +0300 |
|---|---|---|
| committer |   Rob Clark <robdclark@chromium.org> | 2020-11-04 08:26:26 -0800 |
| commit | 4369c93cf36bc57d0b317ae0529a440e71d25280 (patch) | |
| tree | 956767454972ee8d03e2265460ba5136cd7e1f51 /drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | |
| parent | drm/msm/dpu: simplify interface flush handling (diff) | |
| download | linux-dev-4369c93cf36bc57d0b317ae0529a440e71d25280.tar.xz linux-dev-4369c93cf36bc57d0b317ae0529a440e71d25280.zip | |
drm/msm/dpu: initial support for merge3D hardware block
Add initial support for merge3D hardware block on SM8[12]50. Merge3D is
reposible for merging contents of two LMs (two PPs) into single
interface.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h index 979fd2c60aa0..09a3fb3e89f5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h @@ -96,6 +96,7 @@ enum dpu_hw_blk_type { DPU_HW_BLK_INTF, DPU_HW_BLK_WB, DPU_HW_BLK_DSPP, + DPU_HW_BLK_MERGE_3D, DPU_HW_BLK_MAX, }; @@ -186,6 +187,13 @@ enum dpu_pingpong { PINGPONG_MAX }; +enum dpu_merge_3d { + MERGE_3D_0 = 1, + MERGE_3D_1, + MERGE_3D_2, + MERGE_3D_MAX +}; + enum dpu_intf { INTF_0 = 1, INTF_1, |