drm/rockchip: vop2: Use macro for window phys_id

Change-Id: I91ff9d169f5713e38c994f56980dfcf0cba0fe40
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
This commit is contained in:
Andy Yan
2021-09-02 11:31:20 +08:00
parent 55462060b2
commit bcd4aed392

View File

@@ -7,6 +7,7 @@
#include <drm/drmP.h>
#include <linux/kernel.h>
#include <linux/component.h>
#include <dt-bindings/display/rockchip_vop.h>
#include "rockchip_drm_vop.h"
#include "rockchip_vop_reg.h"
@@ -1006,7 +1007,7 @@ static const struct vop2_win_regs rk3568_esmart_win_data = {
static const struct vop2_win_data rk3568_vop_win_data[] = {
{
.name = "Smart0-win0",
.phys_id = 4,
.phys_id = ROCKCHIP_VOP2_SMART0,
.base = 0x400,
.formats = formats_win_lite,
.nformats = ARRAY_SIZE(formats_win_lite),
@@ -1029,7 +1030,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = {
{
.name = "Smart1-win0",
.phys_id = 5,
.phys_id = ROCKCHIP_VOP2_SMART1,
.formats = formats_win_lite,
.nformats = ARRAY_SIZE(formats_win_lite),
.format_modifiers = format_modifiers,
@@ -1052,7 +1053,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = {
{
.name = "Esmart1-win0",
.phys_id = 3,
.phys_id = ROCKCHIP_VOP2_ESMART1,
.formats = formats_win_full_10bit_yuyv,
.nformats = ARRAY_SIZE(formats_win_full_10bit_yuyv),
.format_modifiers = format_modifiers,
@@ -1075,7 +1076,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = {
{
.name = "Esmart0-win0",
.phys_id = 2,
.phys_id = ROCKCHIP_VOP2_ESMART0,
.formats = formats_win_full_10bit_yuyv,
.nformats = ARRAY_SIZE(formats_win_full_10bit_yuyv),
.format_modifiers = format_modifiers,
@@ -1098,7 +1099,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = {
{
.name = "Cluster0-win0",
.phys_id = 0,
.phys_id = ROCKCHIP_VOP2_CLUSTER0,
.base = 0x00,
.formats = formats_win_full_10bit,
.nformats = ARRAY_SIZE(formats_win_full_10bit),
@@ -1120,7 +1121,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = {
{
.name = "Cluster0-win1",
.phys_id = 0,
.phys_id = ROCKCHIP_VOP2_CLUSTER0,
.base = 0x80,
.layer_sel_id = -1,
.formats = formats_win_full_10bit,
@@ -1140,7 +1141,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = {
{
.name = "Cluster1-win0",
.phys_id = 1,
.phys_id = ROCKCHIP_VOP2_CLUSTER1,
.base = 0x00,
.formats = formats_win_full_10bit,
.nformats = ARRAY_SIZE(formats_win_full_10bit),
@@ -1162,7 +1163,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = {
{
.name = "Cluster1-win1",
.phys_id = 1,
.phys_id = ROCKCHIP_VOP2_CLUSTER1,
.layer_sel_id = -1,
.formats = formats_win_full_10bit,
.nformats = ARRAY_SIZE(formats_win_full_10bit),