[PATCH 07/18] drm/amd/display: Use drm_connector in create_validate_stream_for_sink
Alex Hung
alex.hung at amd.com
Tue Sep 5 18:48:29 UTC 2023
Reviewed-by: Alex Hung <alex.hung at amd.com>
On 2023-08-16 15:26, Alex Hung wrote:
> From: Harry Wentland <harry.wentland at amd.com>
>
> [WHAT]
> Again, we need to use this function for writeback connectors,
> which are not of type amdgpu_dm_connector. Use the common base
> drm_connector instead.
>
> Signed-off-by: Harry Wentland <harry.wentland at amd.com>
> Signed-off-by: Alex Hung <alex.hung at amd.com>
> ---
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++++++++++-----
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +-
> .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 ++---
> 3 files changed, 19 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index a7d2a3f35f74..33e7c463a0d0 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -6546,18 +6546,21 @@ static enum dc_status dm_validate_stream_and_context(struct dc *dc,
> }
>
> struct dc_stream_state *
> -create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,
> +create_validate_stream_for_sink(struct drm_connector *connector,
> const struct drm_display_mode *drm_mode,
> const struct dm_connector_state *dm_state,
> const struct dc_stream_state *old_stream)
> {
> - struct drm_connector *connector = &aconnector->base;
> + struct amdgpu_dm_connector *aconnector = NULL;
> struct amdgpu_device *adev = drm_to_adev(connector->dev);
> struct dc_stream_state *stream;
> const struct drm_connector_state *drm_state = dm_state ? &dm_state->base : NULL;
> int requested_bpc = drm_state ? drm_state->max_requested_bpc : 8;
> enum dc_status dc_result = DC_OK;
>
> + if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
> + aconnector = to_amdgpu_dm_connector(connector);
> +
> do {
> stream = create_stream_for_sink(connector, drm_mode,
> dm_state, old_stream,
> @@ -6568,10 +6571,14 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,
> }
>
> dc_result = dc_validate_stream(adev->dm.dc, stream);
> +
> + if (!aconnector) /* writeback connector */
> + return stream;
> +
> if (dc_result == DC_OK && stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST)
> dc_result = dm_dp_mst_is_port_support_mode(aconnector, stream);
>
> - if (dc_result == DC_OK)
> + if (dc_result == DC_OK && connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK)
> dc_result = dm_validate_stream_and_context(adev->dm.dc, stream);
>
> if (dc_result != DC_OK) {
> @@ -6593,7 +6600,7 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,
> DRM_DEBUG_KMS("Retry forcing YCbCr420 encoding\n");
>
> aconnector->force_yuv420_output = true;
> - stream = create_validate_stream_for_sink(aconnector, drm_mode,
> + stream = create_validate_stream_for_sink(connector, drm_mode,
> dm_state, old_stream);
> aconnector->force_yuv420_output = false;
> }
> @@ -6608,6 +6615,9 @@ enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connec
> struct dc_sink *dc_sink;
> /* TODO: Unhardcode stream count */
> struct dc_stream_state *stream;
> + /* we always have an amdgpu_dm_connector here since we got
> + * here via the amdgpu_dm_connector_helper_funcs
> + */
> struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
>
> if ((mode->flags & DRM_MODE_FLAG_INTERLACE) ||
> @@ -6630,7 +6640,7 @@ enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connec
> goto fail;
> }
>
> - stream = create_validate_stream_for_sink(aconnector, mode,
> + stream = create_validate_stream_for_sink(connector, mode,
> to_dm_connector_state(connector->state),
> NULL);
> if (stream) {
> @@ -9304,7 +9314,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
> if (!drm_atomic_crtc_needs_modeset(new_crtc_state))
> goto skip_modeset;
>
> - new_stream = create_validate_stream_for_sink(aconnector,
> + new_stream = create_validate_stream_for_sink(connector,
> &new_crtc_state->mode,
> dm_new_conn_state,
> dm_old_crtc_state->stream);
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> index 5a8d07a27e9b..a2d0ab881c44 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> @@ -828,7 +828,7 @@ int amdgpu_dm_process_dmub_set_config_sync(struct dc_context *ctx, unsigned int
> bool check_seamless_boot_capability(struct amdgpu_device *adev);
>
> struct dc_stream_state *
> - create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,
> + create_validate_stream_for_sink(struct drm_connector *connector,
> const struct drm_display_mode *drm_mode,
> const struct dm_connector_state *dm_state,
> const struct dc_stream_state *old_stream);
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> index 1975b9d96cb8..687dba32cde3 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> @@ -1495,7 +1495,6 @@ int pre_validate_dsc(struct drm_atomic_state *state,
>
> if (ind >= 0) {
> struct drm_connector *connector;
> - struct amdgpu_dm_connector *aconnector;
> struct drm_connector_state *drm_new_conn_state;
> struct dm_connector_state *dm_new_conn_state;
> struct dm_crtc_state *dm_old_crtc_state;
> @@ -1503,15 +1502,14 @@ int pre_validate_dsc(struct drm_atomic_state *state,
> connector =
> amdgpu_dm_find_first_crtc_matching_connector(state,
> state->crtcs[ind].ptr);
> - aconnector = to_amdgpu_dm_connector(connector);
> drm_new_conn_state =
> drm_atomic_get_new_connector_state(state,
> - &aconnector->base);
> + connector);
> dm_new_conn_state = to_dm_connector_state(drm_new_conn_state);
> dm_old_crtc_state = to_dm_crtc_state(state->crtcs[ind].old_state);
>
> local_dc_state->streams[i] =
> - create_validate_stream_for_sink(aconnector,
> + create_validate_stream_for_sink(connector,
> &state->crtcs[ind].new_state->mode,
> dm_new_conn_state,
> dm_old_crtc_state->stream);
More information about the amd-gfx
mailing list