From: Andy Yan <andyshrk@163.com>
To: linux-rockchip@lists.infradead.org,
dri-devel@lists.freedesktop.org, heiko@sntech.de
Cc: s.hauer@pengutronix.de, hjc@rock-chips.com,
sebastian.reichel@collabora.com, sjoerd.simons@collabora.com,
Andy Yan <andy.yan@rock-chips.com>
Subject: [PATCH 2/3] drm/rockchip: remove NR_LAYERS macro on vop2
Date: Thu, 12 Oct 2023 10:36:30 +0800 [thread overview]
Message-ID: <20231012023630.1497499-1-andyshrk@163.com> (raw)
In-Reply-To: <20231012023439.1497304-1-andyshrk@163.com>
From: Andy Yan <andy.yan@rock-chips.com>
There are 8 layers on rk3588, so a fix defined macro is
not appropriate.
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
---
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index 3c524ca23d53..57c05c6b246c 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -2251,8 +2251,6 @@ static struct vop2_video_port *find_vp_without_primary(struct vop2 *vop2)
return NULL;
}
-#define NR_LAYERS 6
-
static int vop2_create_crtcs(struct vop2 *vop2)
{
const struct vop2_data *vop2_data = vop2->data;
@@ -2371,7 +2369,7 @@ static int vop2_create_crtcs(struct vop2 *vop2)
struct vop2_video_port *vp = &vop2->vps[i];
if (vp->crtc.port)
- vp->nlayers = NR_LAYERS / nvps;
+ vp->nlayers = vop2_data->win_size / nvps;
}
return 0;
--
2.34.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
WARNING: multiple messages have this Message-ID (diff)
From: Andy Yan <andyshrk@163.com>
To: linux-rockchip@lists.infradead.org,
dri-devel@lists.freedesktop.org, heiko@sntech.de
Cc: Andy Yan <andy.yan@rock-chips.com>,
s.hauer@pengutronix.de, sjoerd.simons@collabora.com,
hjc@rock-chips.com, sebastian.reichel@collabora.com
Subject: [PATCH 2/3] drm/rockchip: remove NR_LAYERS macro on vop2
Date: Thu, 12 Oct 2023 10:36:30 +0800 [thread overview]
Message-ID: <20231012023630.1497499-1-andyshrk@163.com> (raw)
In-Reply-To: <20231012023439.1497304-1-andyshrk@163.com>
From: Andy Yan <andy.yan@rock-chips.com>
There are 8 layers on rk3588, so a fix defined macro is
not appropriate.
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
---
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index 3c524ca23d53..57c05c6b246c 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -2251,8 +2251,6 @@ static struct vop2_video_port *find_vp_without_primary(struct vop2 *vop2)
return NULL;
}
-#define NR_LAYERS 6
-
static int vop2_create_crtcs(struct vop2 *vop2)
{
const struct vop2_data *vop2_data = vop2->data;
@@ -2371,7 +2369,7 @@ static int vop2_create_crtcs(struct vop2 *vop2)
struct vop2_video_port *vp = &vop2->vps[i];
if (vp->crtc.port)
- vp->nlayers = NR_LAYERS / nvps;
+ vp->nlayers = vop2_data->win_size / nvps;
}
return 0;
--
2.34.1
next prev parent reply other threads:[~2023-10-12 2:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 2:34 [PATCH 0/3] Some cleanup of vop2 driver Andy Yan
2023-10-12 2:34 ` Andy Yan
2023-10-12 2:36 ` Andy Yan [this message]
2023-10-12 2:36 ` [PATCH 2/3] drm/rockchip: remove NR_LAYERS macro on vop2 Andy Yan
2023-10-13 6:11 ` Sascha Hauer
2023-10-13 6:11 ` Sascha Hauer
2023-10-12 2:36 ` [PATCH 1/3] drm/rockchip: remove unused struct in vop2 Andy Yan
2023-10-12 2:36 ` Andy Yan
2023-10-13 6:13 ` Sascha Hauer
2023-10-13 6:13 ` Sascha Hauer
2023-10-12 2:37 ` [PATCH 3/3] drm/rockchip: fix the plane format defination of rk3568/6 Andy Yan
2023-10-12 2:37 ` Andy Yan
2023-10-13 6:11 ` Sascha Hauer
2023-10-13 6:11 ` Sascha Hauer
2023-10-13 6:43 ` Andy Yan
2023-10-13 6:43 ` Andy Yan
2023-10-13 8:12 ` Sascha Hauer
2023-10-13 8:12 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231012023630.1497499-1-andyshrk@163.com \
--to=andyshrk@163.com \
--cc=andy.yan@rock-chips.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=linux-rockchip@lists.infradead.org \
--cc=s.hauer@pengutronix.de \
--cc=sebastian.reichel@collabora.com \
--cc=sjoerd.simons@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.