drm/rockchip: vop2: rename VOP_FEATURE_OUTPUT_10BIT to VOP2_VP_FEATURE_OUTPUT_10BIT

VOP2 has multiple independent video ports with different
feature, so rename VOP_FEATURE_OUTPUT_10BIT to
VOP2_VP_FEATURE_OUTPUT_10BIT for more clearly meaning.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231211115931.1785495-1-andyshrk@163.com

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index 8c74af3fa6a85b3dbaabf878de78b1d1f85b08e5..44508c2dd61455943613bc002e52e3c2cdf25ae8 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -1995,7 +1995,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc,
                return;
 
        if (vcstate->output_mode == ROCKCHIP_OUT_MODE_AAAA &&
-           !(vp_data->feature & VOP_FEATURE_OUTPUT_10BIT))
+           !(vp_data->feature & VOP2_VP_FEATURE_OUTPUT_10BIT))
                out_mode = ROCKCHIP_OUT_MODE_P888;
        else
                out_mode = vcstate->output_mode;

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
index 2763e54350a942e31fe4f9903a2a8fc78b12d978..615a16196aff6b3a7fd26dc3083c0fd07b5f3dc7 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
@@ -11,7 +11,7 @@
 #include <drm/drm_modes.h>
 #include "rockchip_drm_vop.h"
 
-#define VOP_FEATURE_OUTPUT_10BIT        BIT(0)
+#define VOP2_VP_FEATURE_OUTPUT_10BIT        BIT(0)
 
 #define VOP2_FEATURE_HAS_SYS_GRF       BIT(0)
 #define VOP2_FEATURE_HAS_VO0_GRF       BIT(1)

diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
index 275d265891dbf6caa1bda4010a56b163db6ba7c9..48170694ac6b89335fd40f00c668ab9df7f2d824 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
@@ -136,7 +136,7 @@ static const uint64_t format_modifiers_afbc[] = {
 static const struct vop2_video_port_data rk3568_vop_video_ports[] = {
        {
                .id = 0,
-               .feature = VOP_FEATURE_OUTPUT_10BIT,
+               .feature = VOP2_VP_FEATURE_OUTPUT_10BIT,
                .gamma_lut_len = 1024,
                .cubic_lut_len = 9 * 9 * 9,
                .max_output = { 4096, 2304 },
@@ -263,7 +263,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = {
 static const struct vop2_video_port_data rk3588_vop_video_ports[] = {
        {
                .id = 0,
-               .feature = VOP_FEATURE_OUTPUT_10BIT,
+               .feature = VOP2_VP_FEATURE_OUTPUT_10BIT,
                .gamma_lut_len = 1024,
                .cubic_lut_len = 9 * 9 * 9, /* 9x9x9 */
                .max_output = { 4096, 2304 },
@@ -272,7 +272,7 @@ static const struct vop2_video_port_data rk3588_vop_video_ports[] = {
                .offset = 0xc00,
        }, {
                .id = 1,
-               .feature = VOP_FEATURE_OUTPUT_10BIT,
+               .feature = VOP2_VP_FEATURE_OUTPUT_10BIT,
                .gamma_lut_len = 1024,
                .cubic_lut_len = 729, /* 9x9x9 */
                .max_output = { 4096, 2304 },
@@ -280,7 +280,7 @@ static const struct vop2_video_port_data rk3588_vop_video_ports[] = {
                .offset = 0xd00,
        }, {
                .id = 2,
-               .feature = VOP_FEATURE_OUTPUT_10BIT,
+               .feature = VOP2_VP_FEATURE_OUTPUT_10BIT,
                .gamma_lut_len = 1024,
                .cubic_lut_len = 17 * 17 * 17, /* 17x17x17 */
                .max_output = { 4096, 2304 },