From: "Heiko Stübner" <heiko@sntech.de>
To: dri-devel@lists.freedesktop.org, Jani Nikula <jani.nikula@intel.com>
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org,
Sandy Huang <hjc@rock-chips.com>
Subject: Re: [PATCH 11/12] drm/rockchip: convert to using has_audio from display_info
Date: Thu, 30 Mar 2023 18:39:12 +0200 [thread overview]
Message-ID: <2628105.X9hSmTKtgW@diego> (raw)
In-Reply-To: <a7eba2b4d00765b668937cb2430fd23057e6a873.1680190534.git.jani.nikula@intel.com>
Am Donnerstag, 30. März 2023, 17:39:48 CEST schrieb Jani Nikula:
> Prefer the parsed results for has_audio in display info over calling
> drm_detect_monitor_audio().
>
> Cc: Sandy Huang <hjc@rock-chips.com>
> Cc: Heiko Stübner <heiko@sntech.de>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
> ---
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 ++--
> drivers/gpu/drm/rockchip/inno_hdmi.c | 3 ++-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> index b6afe3786b74..4a4cf4354e27 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -272,10 +272,10 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
> DRM_DEV_DEBUG_KMS(dp->dev, "got edid: width[%d] x height[%d]\n",
> edid->width_cm, edid->height_cm);
>
> - dp->sink_has_audio = drm_detect_monitor_audio(edid);
> -
> drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> +
> + dp->sink_has_audio = connector->display_info.has_audio;
> }
> mutex_unlock(&dp->lock);
>
> diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
> index f51774866f41..98691aef1be5 100644
> --- a/drivers/gpu/drm/rockchip/inno_hdmi.c
> +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
> @@ -564,10 +564,11 @@ static int inno_hdmi_connector_get_modes(struct drm_connector *connector)
>
> edid = drm_get_edid(connector, hdmi->ddc);
> if (edid) {
> - hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid);
> drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> +
> + hdmi->hdmi_data.sink_has_audio = connector->display_info.has_audio;
> }
>
> return ret;
>
WARNING: multiple messages have this Message-ID (diff)
From: "Heiko Stübner" <heiko@sntech.de>
To: dri-devel@lists.freedesktop.org, Jani Nikula <jani.nikula@intel.com>
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org,
Sandy Huang <hjc@rock-chips.com>
Subject: Re: [Intel-gfx] [PATCH 11/12] drm/rockchip: convert to using has_audio from display_info
Date: Thu, 30 Mar 2023 18:39:12 +0200 [thread overview]
Message-ID: <2628105.X9hSmTKtgW@diego> (raw)
In-Reply-To: <a7eba2b4d00765b668937cb2430fd23057e6a873.1680190534.git.jani.nikula@intel.com>
Am Donnerstag, 30. März 2023, 17:39:48 CEST schrieb Jani Nikula:
> Prefer the parsed results for has_audio in display info over calling
> drm_detect_monitor_audio().
>
> Cc: Sandy Huang <hjc@rock-chips.com>
> Cc: Heiko Stübner <heiko@sntech.de>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
> ---
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 ++--
> drivers/gpu/drm/rockchip/inno_hdmi.c | 3 ++-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> index b6afe3786b74..4a4cf4354e27 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -272,10 +272,10 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
> DRM_DEV_DEBUG_KMS(dp->dev, "got edid: width[%d] x height[%d]\n",
> edid->width_cm, edid->height_cm);
>
> - dp->sink_has_audio = drm_detect_monitor_audio(edid);
> -
> drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> +
> + dp->sink_has_audio = connector->display_info.has_audio;
> }
> mutex_unlock(&dp->lock);
>
> diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
> index f51774866f41..98691aef1be5 100644
> --- a/drivers/gpu/drm/rockchip/inno_hdmi.c
> +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
> @@ -564,10 +564,11 @@ static int inno_hdmi_connector_get_modes(struct drm_connector *connector)
>
> edid = drm_get_edid(connector, hdmi->ddc);
> if (edid) {
> - hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid);
> drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> +
> + hdmi->hdmi_data.sink_has_audio = connector->display_info.has_audio;
> }
>
> return ret;
>
next prev parent reply other threads:[~2023-03-30 16:39 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 15:39 [Nouveau] [PATCH 00/12] drm: reduce drm_detect_monitor_audio/drm_detect_hdmi_monitor/edid_blob_ptr usage Jani Nikula
2023-03-30 15:39 ` Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] " Jani Nikula
2023-03-30 15:39 ` Jani Nikula
2023-03-30 15:39 ` [PATCH 01/12] drm/edid: parse display info has_audio similar to is_hdmi Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] " Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] [PATCH 02/12] drm/nouveau: convert to using is_hdmi and has_audio from display info Jani Nikula
2023-03-30 15:39 ` Jani Nikula
2023-03-30 15:39 ` [Nouveau] " Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] [PATCH 03/12] drm/radeon: " Jani Nikula
2023-03-30 15:39 ` Jani Nikula
2023-03-30 15:39 ` [PATCH 04/12] drm/radeon: remove radeon_connector_edid() and stop using edid_blob_ptr Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] " Jani Nikula
2023-03-30 20:13 ` kernel test robot
2023-03-30 20:13 ` [Intel-gfx] " kernel test robot
2023-03-30 20:13 ` kernel test robot
2023-03-30 20:13 ` kernel test robot
2023-03-30 20:13 ` [Intel-gfx] " kernel test robot
2023-03-30 20:13 ` kernel test robot
2023-03-31 8:50 ` Jani Nikula
2023-03-31 8:50 ` [Intel-gfx] " Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] [PATCH 05/12] drm/amdgpu: remove amdgpu_connector_edid() " Jani Nikula
2023-03-30 15:39 ` Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] [PATCH 06/12] drm/i915/debugfs: " Jani Nikula
2023-03-30 15:39 ` Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] [PATCH 07/12] drm/exynos: fix is_hdmi usage Jani Nikula
2023-03-30 15:39 ` Jani Nikula
2023-03-30 15:39 ` [PATCH 08/12] drm/i2c/tda998x: convert to using has_audio from display_info Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] " Jani Nikula
2023-03-30 15:39 ` [PATCH 09/12] drm/sti/sti_hdmi: convert to using is_hdmi from display info Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] " Jani Nikula
2023-03-30 15:39 ` [PATCH 10/12] drm/rockchip: cdn-dp: call drm_connector_update_edid_property() unconditionally Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] " Jani Nikula
2023-03-30 16:38 ` Heiko Stübner
2023-03-30 16:38 ` [Intel-gfx] " Heiko Stübner
2023-03-30 15:39 ` [PATCH 11/12] drm/rockchip: convert to using has_audio from display_info Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] " Jani Nikula
2023-03-30 16:39 ` Heiko Stübner [this message]
2023-03-30 16:39 ` Heiko Stübner
2023-03-30 15:39 ` [PATCH 12/12] drm/connector: update edid_blob_ptr documentation Jani Nikula
2023-03-30 15:39 ` [Intel-gfx] " Jani Nikula
2023-03-30 20:12 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm: reduce drm_detect_monitor_audio/drm_detect_hdmi_monitor/edid_blob_ptr usage Patchwork
2023-03-30 20:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-03-31 18:52 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
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=2628105.X9hSmTKtgW@diego \
--to=heiko@sntech.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=hjc@rock-chips.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.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: link
Be 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.