shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: vop3: alloc hdr gem object when first use it

Browse Source 
the vop is binded before iommu init, if alloc hdr gem object in
vop bind stage, which may get the wrong dma address. To fix this
issue, alloc hdr gem object when first used it.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I99359cc345cb49aee1ce34ff6d5ee33d04ac2283
This commit is contained in:
Zhang Yubing
2023-02-10 17:03:27 +08:00
committed by Tao Huang
parent 390dee5bd8
commit cb9f78f78e
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View File

@@ -7911,6 +7911,7 @@ static void vop3_setup_hdrvivid(struct vop2_video_port *vp, uint8_t win_phys_id)
int phys_id;
struct hdrvivid_regs *hdrvivid_data;
struct hdr_extend *hdr_data;
struct rockchip_gem_object *lut_gem_obj;
bool have_sdr_layer = false;
uint32_t hdr_mode;
int i;
@@ -8025,6 +8026,16 @@ static void vop3_setup_hdrvivid(struct vop2_video_port *vp, uint8_t win_phys_id)
vop2_writel(vop2, RK3528_HDR_CSC_COE20_21, hdrvivid_data->hdr_csc_coe20_21);
vop2_writel(vop2, RK3528_HDR_CSC_COE22, hdrvivid_data->hdr_csc_coe22);
if (!vp->hdr_lut_gem_obj) {
lut_gem_obj = rockchip_gem_create_object(vop2->drm_dev,
RK_HDRVIVID_TONE_SCA_AXI_TAB_LENGTH * 4, true, 0);
if (IS_ERR(lut_gem_obj)) {
DRM_ERROR("create hdr lut obj failed\n");
return;
}
vp->hdr_lut_gem_obj = lut_gem_obj;
}
tone_lut_kvaddr = (u32 *)vp->hdr_lut_gem_obj->kvaddr;
tone_lut_mst = vp->hdr_lut_gem_obj->dma_addr;
@@ -10948,15 +10959,8 @@ static int vop2_create_crtc(struct vop2 *vop2)
"Failed to init %s with SR helpers %d, ignoring\n",
crtc->name, ret);
if (vp_data->feature & VOP_FEATURE_VIVID_HDR) {
if (vp_data->feature & VOP_FEATURE_VIVID_HDR)
vop2_crtc_create_hdr_property(vop2, crtc);
vp->hdr_lut_gem_obj = rockchip_gem_create_object(vop2->drm_dev,
RK_HDRVIVID_TONE_SCA_AXI_TAB_LENGTH * 4, true, 0);
if (IS_ERR(vp->hdr_lut_gem_obj)) {
DRM_ERROR("create hdr lut obj failed\n");
return -ENOMEM;
}
}
if (vp_data->feature & VOP_FEATURE_POST_ACM)
vop2_crtc_create_post_acm_property(vop2, crtc);
if (vp_data->feature & VOP_FEATURE_POST_CSC)