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_rm.h | |
| parent | d8199c85f3e447717cfc530ce114f7c8fbc0982c (diff) | |
| download | linux-stable-4369c93cf36bc57d0b317ae0529a440e71d25280.tar.gz linux-stable-4369c93cf36bc57d0b317ae0529a440e71d25280.tar.bz2 linux-stable-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_rm.h')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h index 08726bb1063a..1f12c8d5b8aa 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h @@ -29,6 +29,7 @@ struct dpu_rm { struct dpu_hw_blk *ctl_blks[CTL_MAX - CTL_0]; struct dpu_hw_blk *intf_blks[INTF_MAX - INTF_0]; struct dpu_hw_blk *dspp_blks[DSPP_MAX - DSPP_0]; + struct dpu_hw_blk *merge_3d_blks[MERGE_3D_MAX - MERGE_3D_0]; uint32_t lm_max_width; }; |