The field holds the mask of the CRTCs that can drive the output, and is assigned as-is to drm_encoder.possible_crtcs. Its name says the opposite of what it contains. Rename it to possible_crtcs, matching the R-Car DU field it was derived from.
No functional change. Signed-off-by: Tommaso Merciai <[email protected]> --- v7->v8 - New patch. drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 16 ++++++++-------- drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h | 4 ++-- drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c index 3b868d4ef8bc..0c08701b1502 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c @@ -31,7 +31,7 @@ static const struct rzg2l_du_device_info rzg2l_du_r9a07g043u_info = { .channels_mask = BIT(0), .routes = { [RZG2L_DU_OUTPUT_DPAD0] = { - .possible_outputs = BIT(0), + .possible_crtcs = BIT(0), .port = 0, }, }, @@ -43,11 +43,11 @@ static const struct rzg2l_du_device_info rzg2l_du_r9a07g044_info = { .channels_mask = BIT(0), .routes = { [RZG2L_DU_OUTPUT_DSI0] = { - .possible_outputs = BIT(0), + .possible_crtcs = BIT(0), .port = 0, }, [RZG2L_DU_OUTPUT_DPAD0] = { - .possible_outputs = BIT(0), + .possible_crtcs = BIT(0), .port = 1, } }, @@ -59,15 +59,15 @@ static const struct rzg2l_du_device_info rzg2l_du_r9a08g046_info = { .channels_mask = BIT(0), .routes = { [RZG2L_DU_OUTPUT_DSI0] = { - .possible_outputs = BIT(0), + .possible_crtcs = BIT(0), .port = 0, }, [RZG2L_DU_OUTPUT_DPAD0] = { - .possible_outputs = BIT(0), + .possible_crtcs = BIT(0), .port = 1, }, [RZG2L_DU_OUTPUT_LVDS0] = { - .possible_outputs = BIT(0), + .possible_crtcs = BIT(0), .port = 2, }, }, @@ -79,7 +79,7 @@ static const struct rzg2l_du_device_info rzg2l_du_r9a09g057_info = { .channels_mask = BIT(0), .routes = { [RZG2L_DU_OUTPUT_DSI0] = { - .possible_outputs = BIT(0), + .possible_crtcs = BIT(0), .port = 0, }, }, @@ -89,7 +89,7 @@ static const struct rzg2l_du_device_info rzg2l_du_r9a09g077_info = { .channels_mask = BIT(0), .routes = { [RZG2L_DU_OUTPUT_DPAD0] = { - .possible_outputs = BIT(0), + .possible_crtcs = BIT(0), .port = 0, }, }, diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h index 6e1e4222d2f4..66ebcbaf0687 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h @@ -32,7 +32,7 @@ enum rzg2l_du_output { /* * struct rzg2l_du_output_routing - Output routing specification - * @possible_outputs: bitmask of possible outputs + * @possible_crtcs: bitmask of possible CRTCs for the output * @port: device tree port number corresponding to this output route * * The DU has 3 possible outputs (DPAD0, DSI0, LVDS0). Output routing data @@ -40,7 +40,7 @@ enum rzg2l_du_output { * of in-SoC encoder for the output. */ struct rzg2l_du_output_routing { - unsigned int possible_outputs; + unsigned int possible_crtcs; unsigned int port; }; diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c index 04f51b9d1dd8..21e34d99b12d 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c @@ -290,7 +290,7 @@ static int rzg2l_du_encoders_init(struct rzg2l_du_device *rcdu) /* Find the output route corresponding to the port number. */ for (i = 0; i < RZG2L_DU_OUTPUT_MAX; ++i) { - if (rcdu->info->routes[i].possible_outputs && + if (rcdu->info->routes[i].possible_crtcs && rcdu->info->routes[i].port == ep.port) { output = i; break; @@ -475,7 +475,7 @@ int rzg2l_du_modeset_init(struct rzg2l_du_device *rcdu) const struct rzg2l_du_output_routing *route = &rcdu->info->routes[renc->output]; - encoder->possible_crtcs = route->possible_outputs; + encoder->possible_crtcs = route->possible_crtcs; encoder->possible_clones = (1 << num_encoders) - 1; } -- 2.54.0
