From: Harry Wentland <harry.wentland@amd.com> To: <dri-devel@lists.freedesktop.org>, <amd-gfx@lists.freedesktop.org> Cc: Sebastian Wick <sebastian.wick@redhat.com>, Melissa Wen <mwen@igalia.com>, Pekka Paalanen <ppaalanen@gmail.com>, Vitaly.Prosyak@amd.com, Joshua Ashton <joshua@froggi.es> Subject: [PATCH v6 07/13] drm/amd/display: Always pass connector_state to stream validation Date: Wed, 7 Jun 2023 11:26:11 -0400 [thread overview] Message-ID: <20230607152617.997573-8-harry.wentland@amd.com> (raw) In-Reply-To: <20230607152617.997573-1-harry.wentland@amd.com> We need the connector_state for colorspace and scaling information and can get it from connector->state. Signed-off-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Joshua Ashton <joshua@froggi.es> Cc: Pekka Paalanen <ppaalanen@gmail.com> Cc: Sebastian Wick <sebastian.wick@redhat.com> Cc: Vitaly.Prosyak@amd.com Cc: Joshua Ashton <joshua@froggi.es> Cc: Simon Ser <contact@emersion.fr> Cc: Melissa Wen <mwen@igalia.com> Cc: dri-devel@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 90de0d37f1d2..27868dbb09f6 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5954,15 +5954,14 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, { struct drm_display_mode *preferred_mode = NULL; struct drm_connector *drm_connector; - const struct drm_connector_state *con_state = - dm_state ? &dm_state->base : NULL; + const struct drm_connector_state *con_state = &dm_state->base; struct dc_stream_state *stream = NULL; struct drm_display_mode mode; struct drm_display_mode saved_mode; struct drm_display_mode *freesync_mode = NULL; bool native_mode_found = false; bool recalculate_timing = false; - bool scale = dm_state ? (dm_state->scaling != RMX_OFF) : false; + bool scale = dm_state->scaling != RMX_OFF; int mode_refresh; int preferred_refresh = 0; enum color_transfer_func tf = TRANSFER_FUNC_UNKNOWN; @@ -6604,7 +6603,9 @@ enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connec goto fail; } - stream = create_validate_stream_for_sink(aconnector, mode, NULL, NULL); + stream = create_validate_stream_for_sink(aconnector, mode, + to_dm_connector_state(connector->state), + NULL); if (stream) { dc_stream_release(stream); result = MODE_OK; -- 2.41.0
WARNING: multiple messages have this Message-ID (diff)
From: Harry Wentland <harry.wentland@amd.com> To: <dri-devel@lists.freedesktop.org>, <amd-gfx@lists.freedesktop.org> Cc: Sebastian Wick <sebastian.wick@redhat.com>, Simon Ser <contact@emersion.fr>, Melissa Wen <mwen@igalia.com>, Pekka Paalanen <ppaalanen@gmail.com>, Vitaly.Prosyak@amd.com, Harry Wentland <harry.wentland@amd.com>, Joshua Ashton <joshua@froggi.es> Subject: [PATCH v6 07/13] drm/amd/display: Always pass connector_state to stream validation Date: Wed, 7 Jun 2023 11:26:11 -0400 [thread overview] Message-ID: <20230607152617.997573-8-harry.wentland@amd.com> (raw) In-Reply-To: <20230607152617.997573-1-harry.wentland@amd.com> We need the connector_state for colorspace and scaling information and can get it from connector->state. Signed-off-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Joshua Ashton <joshua@froggi.es> Cc: Pekka Paalanen <ppaalanen@gmail.com> Cc: Sebastian Wick <sebastian.wick@redhat.com> Cc: Vitaly.Prosyak@amd.com Cc: Joshua Ashton <joshua@froggi.es> Cc: Simon Ser <contact@emersion.fr> Cc: Melissa Wen <mwen@igalia.com> Cc: dri-devel@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 90de0d37f1d2..27868dbb09f6 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5954,15 +5954,14 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector, { struct drm_display_mode *preferred_mode = NULL; struct drm_connector *drm_connector; - const struct drm_connector_state *con_state = - dm_state ? &dm_state->base : NULL; + const struct drm_connector_state *con_state = &dm_state->base; struct dc_stream_state *stream = NULL; struct drm_display_mode mode; struct drm_display_mode saved_mode; struct drm_display_mode *freesync_mode = NULL; bool native_mode_found = false; bool recalculate_timing = false; - bool scale = dm_state ? (dm_state->scaling != RMX_OFF) : false; + bool scale = dm_state->scaling != RMX_OFF; int mode_refresh; int preferred_refresh = 0; enum color_transfer_func tf = TRANSFER_FUNC_UNKNOWN; @@ -6604,7 +6603,9 @@ enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connec goto fail; } - stream = create_validate_stream_for_sink(aconnector, mode, NULL, NULL); + stream = create_validate_stream_for_sink(aconnector, mode, + to_dm_connector_state(connector->state), + NULL); if (stream) { dc_stream_release(stream); result = MODE_OK; -- 2.41.0
next prev parent reply other threads:[~2023-06-07 15:26 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-06-07 15:26 [PATCH v6 00/13] Enable Colorspace connector property in amdgpu Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` [PATCH v6 01/13] drm/connector: Convert DRM_MODE_COLORIMETRY to enum Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` [PATCH v6 02/13] drm/connector: Add enum documentation to drm_colorspace Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` [PATCH v6 03/13] drm/connector: Pull out common create_colorspace_property code Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` [PATCH v6 04/13] drm/connector: Use common colorspace_names array Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` [PATCH v6 05/13] drm/connector: Print connector colorspace in state debugfs Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` [PATCH v6 06/13] drm/connector: Allow drivers to pass list of supported colorspaces Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` Harry Wentland [this message] 2023-06-07 15:26 ` [PATCH v6 07/13] drm/amd/display: Always pass connector_state to stream validation Harry Wentland 2023-06-07 15:26 ` [PATCH v6 08/13] drm/amd/display: Register Colorspace property for DP and HDMI Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` [PATCH v6 09/13] drm/amd/display: Signal mode_changed if colorspace changed Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` [PATCH v6 10/13] drm/amd/display: Send correct DP colorspace infopacket Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` [PATCH v6 11/13] drm/amd/display: Always set crtcinfo from create_stream_for_sink Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` [PATCH v6 12/13] drm/amd/display: Add debugfs for testing output colorspace Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 15:26 ` [PATCH v6 13/13] drm/amd/display: Refactor avi_info_frame colorimetry determination Harry Wentland 2023-06-07 15:26 ` Harry Wentland 2023-06-07 16:04 ` [PATCH v6 00/13] Enable Colorspace connector property in amdgpu Simon Ser 2023-06-07 16:04 ` Simon Ser
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230607152617.997573-8-harry.wentland@amd.com \ --to=harry.wentland@amd.com \ --cc=Vitaly.Prosyak@amd.com \ --cc=amd-gfx@lists.freedesktop.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=joshua@froggi.es \ --cc=mwen@igalia.com \ --cc=ppaalanen@gmail.com \ --cc=sebastian.wick@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.