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

drm/rockchip: vop2: Assign plane for vp by plane_mask

Browse Source 
Change-Id: I6cbd87a5c4ecab7a54f30f0a6bfdd8721f86cce9
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
This commit is contained in:
Andy Yan
2021-09-06 19:56:08 +08:00
committed by Tao Huang
parent 054249037d
commit e013d2544c
1 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2561,35 +2561,39 @@ err:
*/ */
static void vop2_layer_map_initial(struct vop2 *vop2, uint32_t current_vp_id) static void vop2_layer_map_initial(struct vop2 *vop2, uint32_t current_vp_id)
{ {
const struct vop2_data *vop2_data = vop2->data;
struct vop2_layer *layer = &vop2->layers[0]; struct vop2_layer *layer = &vop2->layers[0];
struct vop2_video_port *vp = &vop2->vps[0]; struct vop2_video_port *vp = &vop2->vps[0];
struct vop2_win *win; struct vop2_win *win;
const struct vop2_win_data *win_data = NULL; unsigned long win_mask;
uint32_t used_layers = 0; uint32_t used_layers = 0;
uint32_t layer_map, sel;
uint32_t win_map, vp_id;
uint16_t port_mux_cfg = 0; uint16_t port_mux_cfg = 0;
uint16_t port_mux; uint16_t port_mux;
uint32_t shift; uint16_t vp_id;
uint8_t nr_layers;
int phys_id;
int i, j; int i, j;
layer_map = vop2_readl(vop2, layer->regs->layer_sel.offset);
win_map = vop2_readl(vop2, vp->regs->port_mux.offset);
for (i = 0; i < vop2->data->nr_vps; i++) { for (i = 0; i < vop2->data->nr_vps; i++) {
vp = &vop2->vps[i]; vp_id = i;
vp->win_mask = 0; j = 0;
for (j = 0; j < vop2_data->nr_layers; j++) { vp = &vop2->vps[vp_id];
win = vop2_find_win_by_phys_id(vop2, j); vp->win_mask = vp->plane_mask;
shift = vop2->data->ctrl->win_vp_id[j].shift; nr_layers = hweight32(vp->win_mask);
vp_id = (win_map >> shift) & 0x3; win_mask = vp->win_mask;
if (vp_id == i) { for_each_set_bit(phys_id, &win_mask, ROCKCHIP_MAX_LAYER) {
vp->win_mask |= BIT(j); layer = &vop2->layers[used_layers + j];
win->vp_mask = BIT(vp_id); win = vop2_find_win_by_phys_id(vop2, phys_id);
win->old_vp_mask = win->vp_mask; VOP_CTRL_SET(vop2, win_vp_id[phys_id], vp_id);
} VOP_MODULE_SET(vop2, layer, layer_sel, win->layer_sel_id);
win->vp_mask = BIT(i);
win->old_vp_mask = win->vp_mask;
layer->win_phys_id = win->phys_id;
win->layer_id = layer->id;
j++;
DRM_DEV_DEBUG(vop2->dev, "layer%d select %s for vp%d phys_id: %d\n",
layer->id, win->name, vp_id, phys_id);
} }
used_layers += nr_layers;
} }
/* /*
@@ -2613,25 +2617,6 @@ static void vop2_layer_map_initial(struct vop2 *vop2, uint32_t current_vp_id)
vop2->port_mux_cfg = port_mux_cfg; vop2->port_mux_cfg = port_mux_cfg;
VOP_CTRL_SET(vop2, ovl_port_mux_cfg, port_mux_cfg); VOP_CTRL_SET(vop2, ovl_port_mux_cfg, port_mux_cfg);
for (i = 0; i < vop2->data->nr_layers; i++) {
sel = (layer_map >> (4 * i)) & 0xf;
layer = &vop2->layers[i];
for (j = 0; j < vop2_data->win_size; j++) {
win_data = &vop2_data->win[j];
if (sel == win_data->layer_sel_id)
break;
win_data = NULL;
}
if (!win_data) {
DRM_DEV_ERROR(vop2->dev, "invalid layer map :0x%x\n", layer_map);
return;
}
win = vop2_find_win_by_phys_id(vop2, win_data->phys_id);
layer->win_phys_id = win->phys_id;
win->layer_id = layer->id;
DRM_DEV_DEBUG(vop2->dev, "layer%d select %s\n", layer->id, win->name);
}
} }
static void vop2_initial(struct drm_crtc *crtc) static void vop2_initial(struct drm_crtc *crtc)