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

drm/rockchip: vop2: add active_display_mask to mask active display

Browse Source 
active_vp_mask mask the active vp, and at rk3588 splice mode, vp0 and
vp1 will be mask, it can't indicate display number, so we add the
active_display_mask to record it.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I7bebf21b4d844d92956d6e7427162cdbe694fe7a
This commit is contained in:
Sandy Huang
2024-08-06 17:08:51 +08:00
parent b675f0608e
commit 0ab8cd7ddb
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -914,6 +914,11 @@ struct vop2 {
* @active_vp_mask: Bitmask of active video ports;
*/
uint8_t active_vp_mask;
/**
* @active_display_mask: Bitmask of active display;
*/
uint8_t active_display_mask;
uint16_t port_mux_cfg;
uint32_t *regsbak;
@@ -2329,7 +2334,7 @@ static enum vop2_wb_format vop2_convert_wb_format(uint32_t format)
static void vop2_set_system_status(struct vop2 *vop2, bool is_enabled)
{
unsigned int nports = hweight8(vop2->active_vp_mask);
unsigned int nports = hweight8(vop2->active_display_mask);
if (is_enabled) {
if (nports == 2)
@@ -5130,6 +5135,7 @@ static void vop2_crtc_atomic_disable(struct drm_crtc *crtc,
vop2->active_vp_mask &= ~BIT(vp->id);
if (vcstate->splice_mode)
vop2->active_vp_mask &= ~BIT(splice_vp->id);
vop2->active_display_mask &= ~BIT(vp->id);
vcstate->splice_mode = false;
vcstate->output_flags = 0;
vp->splice_mode_right = false;
@@ -7049,6 +7055,7 @@ static int vop2_crtc_loader_protect(struct drm_crtc *crtc, bool on, void *data)
if (on) {
vp->loader_protect = true;
vop2->active_vp_mask |= BIT(vp->id);
vop2->active_display_mask |= BIT(vp->id);
vop2_set_system_status(vop2, true);
vop2_initial(crtc);
if (crtc->primary) {
@@ -9163,6 +9170,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_sta
}
vop2->active_vp_mask |= BIT(vp->id);
vop2->active_display_mask |= BIT(vp->id);
vop2_set_system_status(vop2, true);
rockchip_request_late_resume();