With the recent cleanups, the data in dispc_am62a7_feats is identical to dispc_am625_feats, except the subrevision, and the only place where we have a difference of behavior wrt. the subrevision is in a debug print.
Drop the dispc_am62a7_feats and use dispc_am625_feats for AM62A7. The debug print will print a few extra OLDI status bits for AM62A7, which are not relevant as AM62A7 doesn't have OLDI, but that is harmless. Signed-off-by: Tomi Valkeinen <[email protected]> --- drivers/gpu/drm/tidss/tidss_dispc.c | 59 ------------------------------------- drivers/gpu/drm/tidss/tidss_dispc.h | 2 -- drivers/gpu/drm/tidss/tidss_drv.c | 2 +- 3 files changed, 1 insertion(+), 62 deletions(-) diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c index 028cf78df3fe..17390f0c3913 100644 --- a/drivers/gpu/drm/tidss/tidss_dispc.c +++ b/drivers/gpu/drm/tidss/tidss_dispc.c @@ -350,60 +350,6 @@ const struct dispc_features dispc_am625_feats = { .vid_order = {1, 0}, }; -const struct dispc_features dispc_am62a7_feats = { - .scaling = { - .in_width_max_5tap_rgb = 1280, - .in_width_max_3tap_rgb = 2560, - .in_width_max_5tap_yuv = 2560, - .in_width_max_3tap_yuv = 4096, - .upscale_limit = 16, - .downscale_limit_5tap = 4, - .downscale_limit_3tap = 2, - /* - * The max supported pixel inc value is 255. The value - * of pixel inc is calculated like this: 1+(xinc-1)*bpp. - * The maximum bpp of all formats supported by the HW - * is 8. So the maximum supported xinc value is 32, - * because 1+(32-1)*8 < 255 < 1+(33-1)*4. - */ - .xinc_max = 32, - }, - - .subrev = DISPC_AM62A7, - - .common = "common", - .common_regs = tidss_am65x_common_regs, - - .num_vps = 2, - .vp_name = { "vp1", "vp2" }, - .ovr_name = { "ovr1", "ovr2" }, - .vpclk_name = { "vp1", "vp2" }, - - .vp_feat = { .color = { - .has_ctm = true, - .gamma_size = 256, - .gamma_type = TIDSS_GAMMA_8BIT, - }, - }, - - .num_vids = 2, - - .vid_info = { - { - .name = "vid", - .is_lite = false, - .hw_id = 0, - }, - { - .name = "vidl1", - .is_lite = true, - .hw_id = 1, - } - }, - - .vid_order = {1, 0}, -}; - const struct dispc_features dispc_am62l_feats = { .subrev = DISPC_AM62L, @@ -945,7 +891,6 @@ dispc_irq_t dispc_read_and_clear_irqstatus(struct dispc_device *dispc) case DISPC_K2G: return dispc_k2g_read_and_clear_irqstatus(dispc); case DISPC_AM625: - case DISPC_AM62A7: case DISPC_AM62L: case DISPC_AM65X: case DISPC_J721E: @@ -963,7 +908,6 @@ void dispc_set_irqenable(struct dispc_device *dispc, dispc_irq_t mask) dispc_k2g_set_irqenable(dispc, mask); break; case DISPC_AM625: - case DISPC_AM62A7: case DISPC_AM62L: case DISPC_AM65X: case DISPC_J721E: @@ -1479,7 +1423,6 @@ void dispc_ovr_set_plane(struct dispc_device *dispc, u32 hw_plane, x, y, layer); break; case DISPC_AM625: - case DISPC_AM62A7: case DISPC_AM62L: case DISPC_AM65X: dispc_am65x_ovr_set_plane(dispc, hw_plane, hw_videoport, @@ -2384,7 +2327,6 @@ static void dispc_plane_init(struct dispc_device *dispc) dispc_k2g_plane_init(dispc); break; case DISPC_AM625: - case DISPC_AM62A7: case DISPC_AM62L: case DISPC_AM65X: case DISPC_J721E: @@ -2501,7 +2443,6 @@ static void dispc_vp_write_gamma_table(struct dispc_device *dispc, dispc_k2g_vp_write_gamma_table(dispc, hw_videoport); break; case DISPC_AM625: - case DISPC_AM62A7: case DISPC_AM62L: case DISPC_AM65X: dispc_am65x_vp_write_gamma_table(dispc, hw_videoport); diff --git a/drivers/gpu/drm/tidss/tidss_dispc.h b/drivers/gpu/drm/tidss/tidss_dispc.h index ebaf559d56e5..d07352f7b2bd 100644 --- a/drivers/gpu/drm/tidss/tidss_dispc.h +++ b/drivers/gpu/drm/tidss/tidss_dispc.h @@ -63,7 +63,6 @@ enum dispc_dss_subrevision { DISPC_K2G, DISPC_AM625, DISPC_AM62L, - DISPC_AM62A7, DISPC_AM65X, DISPC_J721E, }; @@ -96,7 +95,6 @@ static inline bool dispc_vp_is_am65x_oldi(const struct dispc_features *feat, extern const struct dispc_features dispc_k2g_feats; extern const struct dispc_features dispc_am625_feats; -extern const struct dispc_features dispc_am62a7_feats; extern const struct dispc_features dispc_am62l_feats; extern const struct dispc_features dispc_am65x_feats; extern const struct dispc_features dispc_j721e_feats; diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c index 44b0b009c29a..7e7f2ba6ae82 100644 --- a/drivers/gpu/drm/tidss/tidss_drv.c +++ b/drivers/gpu/drm/tidss/tidss_drv.c @@ -238,7 +238,7 @@ static void tidss_shutdown(struct platform_device *pdev) static const struct of_device_id tidss_of_table[] = { { .compatible = "ti,k2g-dss", .data = &dispc_k2g_feats, }, { .compatible = "ti,am625-dss", .data = &dispc_am625_feats, }, - { .compatible = "ti,am62a7-dss", .data = &dispc_am62a7_feats, }, + { .compatible = "ti,am62a7-dss", .data = &dispc_am625_feats, }, { .compatible = "ti,am62l-dss", .data = &dispc_am62l_feats, }, { .compatible = "ti,am65x-dss", .data = &dispc_am65x_feats, }, { .compatible = "ti,j721e-dss", .data = &dispc_j721e_feats, }, -- 2.43.0
