Commit 9d7fe770 authored by Andy Yan's avatar Andy Yan Committed by Heiko Stuebner

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: default avatarAndy Yan <andy.yan@rock-chips.com>
Reviewed-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231211115931.1785495-1-andyshrk@163.com
parent 5a028e8f
...@@ -1995,7 +1995,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, ...@@ -1995,7 +1995,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc,
return; return;
if (vcstate->output_mode == ROCKCHIP_OUT_MODE_AAAA && 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; out_mode = ROCKCHIP_OUT_MODE_P888;
else else
out_mode = vcstate->output_mode; out_mode = vcstate->output_mode;
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <drm/drm_modes.h> #include <drm/drm_modes.h>
#include "rockchip_drm_vop.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_SYS_GRF BIT(0)
#define VOP2_FEATURE_HAS_VO0_GRF BIT(1) #define VOP2_FEATURE_HAS_VO0_GRF BIT(1)
......
...@@ -136,7 +136,7 @@ static const uint64_t format_modifiers_afbc[] = { ...@@ -136,7 +136,7 @@ static const uint64_t format_modifiers_afbc[] = {
static const struct vop2_video_port_data rk3568_vop_video_ports[] = { static const struct vop2_video_port_data rk3568_vop_video_ports[] = {
{ {
.id = 0, .id = 0,
.feature = VOP_FEATURE_OUTPUT_10BIT, .feature = VOP2_VP_FEATURE_OUTPUT_10BIT,
.gamma_lut_len = 1024, .gamma_lut_len = 1024,
.cubic_lut_len = 9 * 9 * 9, .cubic_lut_len = 9 * 9 * 9,
.max_output = { 4096, 2304 }, .max_output = { 4096, 2304 },
...@@ -263,7 +263,7 @@ static const struct vop2_win_data rk3568_vop_win_data[] = { ...@@ -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[] = { static const struct vop2_video_port_data rk3588_vop_video_ports[] = {
{ {
.id = 0, .id = 0,
.feature = VOP_FEATURE_OUTPUT_10BIT, .feature = VOP2_VP_FEATURE_OUTPUT_10BIT,
.gamma_lut_len = 1024, .gamma_lut_len = 1024,
.cubic_lut_len = 9 * 9 * 9, /* 9x9x9 */ .cubic_lut_len = 9 * 9 * 9, /* 9x9x9 */
.max_output = { 4096, 2304 }, .max_output = { 4096, 2304 },
...@@ -272,7 +272,7 @@ static const struct vop2_video_port_data rk3588_vop_video_ports[] = { ...@@ -272,7 +272,7 @@ static const struct vop2_video_port_data rk3588_vop_video_ports[] = {
.offset = 0xc00, .offset = 0xc00,
}, { }, {
.id = 1, .id = 1,
.feature = VOP_FEATURE_OUTPUT_10BIT, .feature = VOP2_VP_FEATURE_OUTPUT_10BIT,
.gamma_lut_len = 1024, .gamma_lut_len = 1024,
.cubic_lut_len = 729, /* 9x9x9 */ .cubic_lut_len = 729, /* 9x9x9 */
.max_output = { 4096, 2304 }, .max_output = { 4096, 2304 },
...@@ -280,7 +280,7 @@ static const struct vop2_video_port_data rk3588_vop_video_ports[] = { ...@@ -280,7 +280,7 @@ static const struct vop2_video_port_data rk3588_vop_video_ports[] = {
.offset = 0xd00, .offset = 0xd00,
}, { }, {
.id = 2, .id = 2,
.feature = VOP_FEATURE_OUTPUT_10BIT, .feature = VOP2_VP_FEATURE_OUTPUT_10BIT,
.gamma_lut_len = 1024, .gamma_lut_len = 1024,
.cubic_lut_len = 17 * 17 * 17, /* 17x17x17 */ .cubic_lut_len = 17 * 17 * 17, /* 17x17x17 */
.max_output = { 4096, 2304 }, .max_output = { 4096, 2304 },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment