From 6b20b47257bb689a573e852b4d96702b67612ad5 Mon Sep 17 00:00:00 2001 From: Wyon Bi Date: Mon, 27 Aug 2018 16:18:04 +0800 Subject: [PATCH] drm/rockchip: vop: Don't create an instances of struct vop_win for dummy vop_win_data Change-Id: I49d9d4f0f4dacb39042d9714f2a50af7462341ea Signed-off-by: Wyon Bi --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index f23cf80b9764..d313cdb52e0b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -4316,8 +4316,6 @@ static int vop_win_init(struct vop *vop) } } - vop->num_wins = num_wins; - prop = drm_property_create_range(vop->drm_dev, DRM_MODE_PROP_ATOMIC, "ZPOS", 0, vop->data->win_size); if (!prop) { @@ -4446,6 +4444,9 @@ static int vop_bind(struct device *dev, struct device *master, void *data) for (i = 0; i < vop_data->win_size; i++) { const struct vop_win_data *win_data = &vop_data->win[i]; + if (!win_data->phy) + continue; + num_wins += win_data->area_size + 1; }