| Message ID | 20240921222007.2301868-4-jonas@kwiboo.se (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | rockchip: Split rk3288-vop compatible into big and lit | expand |
On 22/09/2024 00:20, Jonas Karlman wrote: > The Rockchip RK3288 SoC contain two different Visual Output Processor > (VOP) blocks, VOP_BIG and VOP_LIT. The VOP blocks support different max > output resolution, 3840x2160 and 2560x1600. > > Add support for the compatible used to differentiate between VOP_BIG and > VOP_LIT, support for the old compatible is kept for compatibility with > older device tree. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> > --- > drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 27 +++++++++++++++------ > 1 file changed, 20 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c > index e2c6ba26f437..978db93cda33 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c > +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c > @@ -762,7 +762,7 @@ static const struct vop_intr rk3288_vop_intr = { > .clear = VOP_REG(RK3288_INTR_CTRL0, 0xf, 8), > }; > > -static const struct vop_data rk3288_vop = { > +static const struct vop_data rk3288_vop_big = { > .version = VOP_VERSION(3, 1), > .feature = VOP_FEATURE_OUTPUT_RGB10, > .intr = &rk3288_vop_intr, > @@ -772,14 +772,22 @@ static const struct vop_data rk3288_vop = { > .win = rk3288_vop_win_data, > .win_size = ARRAY_SIZE(rk3288_vop_win_data), > .lut_size = 1024, > - /* > - * This is the maximum resolution for the VOPB, the VOPL can only do > - * 2560x1600, but we can't distinguish them as they have the same > - * compatible. > - */ > .max_output = { 3840, 2160 }, > }; > > +static const struct vop_data rk3288_vop_lit = { > + .version = VOP_VERSION(3, 1), > + .feature = VOP_FEATURE_OUTPUT_RGB10, > + .intr = &rk3288_vop_intr, > + .common = &rk3288_common, > + .modeset = &rk3288_modeset, > + .output = &rk3288_output, > + .win = rk3288_vop_win_data, > + .win_size = ARRAY_SIZE(rk3288_vop_win_data), > + .lut_size = 1024, > + .max_output = { 2560, 1600 }, > +}; > + > static const int rk3368_vop_intrs[] = { > FS_INTR, > 0, 0, > @@ -1245,8 +1253,13 @@ static const struct of_device_id vop_driver_dt_match[] = { > .data = &rk3066_vop }, > { .compatible = "rockchip,rk3188-vop", > .data = &rk3188_vop }, > + { .compatible = "rockchip,rk3288-vop-big", > + .data = &rk3288_vop_big }, Hm... that's not really needed. Instead of having three compatibles, you could keep "rk3288-vop" as big and then my comment on bindings patch could be ignored (you keep the compatible). Best regards, Krzysztof
Hi Krzysztof, On 2024-09-22 10:15, Krzysztof Kozlowski wrote: > On 22/09/2024 00:20, Jonas Karlman wrote: >> The Rockchip RK3288 SoC contain two different Visual Output Processor >> (VOP) blocks, VOP_BIG and VOP_LIT. The VOP blocks support different max >> output resolution, 3840x2160 and 2560x1600. >> >> Add support for the compatible used to differentiate between VOP_BIG and >> VOP_LIT, support for the old compatible is kept for compatibility with >> older device tree. >> >> Signed-off-by: Jonas Karlman <jonas@kwiboo.se> >> --- >> drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 27 +++++++++++++++------ >> 1 file changed, 20 insertions(+), 7 deletions(-) >> >> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c >> index e2c6ba26f437..978db93cda33 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c >> +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c >> @@ -762,7 +762,7 @@ static const struct vop_intr rk3288_vop_intr = { >> .clear = VOP_REG(RK3288_INTR_CTRL0, 0xf, 8), >> }; >> >> -static const struct vop_data rk3288_vop = { >> +static const struct vop_data rk3288_vop_big = { >> .version = VOP_VERSION(3, 1), >> .feature = VOP_FEATURE_OUTPUT_RGB10, >> .intr = &rk3288_vop_intr, >> @@ -772,14 +772,22 @@ static const struct vop_data rk3288_vop = { >> .win = rk3288_vop_win_data, >> .win_size = ARRAY_SIZE(rk3288_vop_win_data), >> .lut_size = 1024, >> - /* >> - * This is the maximum resolution for the VOPB, the VOPL can only do >> - * 2560x1600, but we can't distinguish them as they have the same >> - * compatible. >> - */ >> .max_output = { 3840, 2160 }, >> }; >> >> +static const struct vop_data rk3288_vop_lit = { >> + .version = VOP_VERSION(3, 1), >> + .feature = VOP_FEATURE_OUTPUT_RGB10, >> + .intr = &rk3288_vop_intr, >> + .common = &rk3288_common, >> + .modeset = &rk3288_modeset, >> + .output = &rk3288_output, >> + .win = rk3288_vop_win_data, >> + .win_size = ARRAY_SIZE(rk3288_vop_win_data), >> + .lut_size = 1024, >> + .max_output = { 2560, 1600 }, >> +}; >> + >> static const int rk3368_vop_intrs[] = { >> FS_INTR, >> 0, 0, >> @@ -1245,8 +1253,13 @@ static const struct of_device_id vop_driver_dt_match[] = { >> .data = &rk3066_vop }, >> { .compatible = "rockchip,rk3188-vop", >> .data = &rk3188_vop }, >> + { .compatible = "rockchip,rk3288-vop-big", >> + .data = &rk3288_vop_big }, > > Hm... that's not really needed. Instead of having three compatibles, you > could keep "rk3288-vop" as big and then my comment on bindings patch > could be ignored (you keep the compatible). Thanks, I guess that just adding a new compatible for vop-lit should be enough. VOP_BIG: rockchip,rk3288-vop VOP_LIT: rockchip,rk3288-vop-lit, rockchip,rk3288-vop That should ensure backward/forward compatibility with any mix of old/new boot-firmware, DTs and kernels. Will change to use that in v2. Regards, Jonas > > > > Best regards, > Krzysztof >
On 23/09/2024 11:01, Jonas Karlman wrote: >>> 0, 0, >>> @@ -1245,8 +1253,13 @@ static const struct of_device_id vop_driver_dt_match[] = { >>> .data = &rk3066_vop }, >>> { .compatible = "rockchip,rk3188-vop", >>> .data = &rk3188_vop }, >>> + { .compatible = "rockchip,rk3288-vop-big", >>> + .data = &rk3288_vop_big }, >> >> Hm... that's not really needed. Instead of having three compatibles, you >> could keep "rk3288-vop" as big and then my comment on bindings patch >> could be ignored (you keep the compatible). > > Thanks, I guess that just adding a new compatible for vop-lit should be > enough. > > VOP_BIG: rockchip,rk3288-vop > VOP_LIT: rockchip,rk3288-vop-lit, rockchip,rk3288-vop > > That should ensure backward/forward compatibility with any mix of > old/new boot-firmware, DTs and kernels. > > Will change to use that in v2. Yes, thanks. Best regards, Krzysztof
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index e2c6ba26f437..978db93cda33 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -762,7 +762,7 @@ static const struct vop_intr rk3288_vop_intr = { .clear = VOP_REG(RK3288_INTR_CTRL0, 0xf, 8), }; -static const struct vop_data rk3288_vop = { +static const struct vop_data rk3288_vop_big = { .version = VOP_VERSION(3, 1), .feature = VOP_FEATURE_OUTPUT_RGB10, .intr = &rk3288_vop_intr, @@ -772,14 +772,22 @@ static const struct vop_data rk3288_vop = { .win = rk3288_vop_win_data, .win_size = ARRAY_SIZE(rk3288_vop_win_data), .lut_size = 1024, - /* - * This is the maximum resolution for the VOPB, the VOPL can only do - * 2560x1600, but we can't distinguish them as they have the same - * compatible. - */ .max_output = { 3840, 2160 }, }; +static const struct vop_data rk3288_vop_lit = { + .version = VOP_VERSION(3, 1), + .feature = VOP_FEATURE_OUTPUT_RGB10, + .intr = &rk3288_vop_intr, + .common = &rk3288_common, + .modeset = &rk3288_modeset, + .output = &rk3288_output, + .win = rk3288_vop_win_data, + .win_size = ARRAY_SIZE(rk3288_vop_win_data), + .lut_size = 1024, + .max_output = { 2560, 1600 }, +}; + static const int rk3368_vop_intrs[] = { FS_INTR, 0, 0, @@ -1245,8 +1253,13 @@ static const struct of_device_id vop_driver_dt_match[] = { .data = &rk3066_vop }, { .compatible = "rockchip,rk3188-vop", .data = &rk3188_vop }, + { .compatible = "rockchip,rk3288-vop-big", + .data = &rk3288_vop_big }, + { .compatible = "rockchip,rk3288-vop-lit", + .data = &rk3288_vop_lit }, + /* rockchip,rk3288-vop kept for backward compatibility */ { .compatible = "rockchip,rk3288-vop", - .data = &rk3288_vop }, + .data = &rk3288_vop_big }, { .compatible = "rockchip,rk3368-vop", .data = &rk3368_vop }, { .compatible = "rockchip,rk3366-vop",
The Rockchip RK3288 SoC contain two different Visual Output Processor (VOP) blocks, VOP_BIG and VOP_LIT. The VOP blocks support different max output resolution, 3840x2160 and 2560x1600. Add support for the compatible used to differentiate between VOP_BIG and VOP_LIT, support for the old compatible is kept for compatibility with older device tree. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 27 +++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-)