From: Thierry Reding <thierry.reding@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: [PATCH 32/32] drm/tegra: sor: Introduce audio enable/disable callbacks
Date: Thu, 24 Oct 2019 18:45:34 +0200 [thread overview]
Message-ID: <20191024164534.132764-33-thierry.reding@gmail.com> (raw)
In-Reply-To: <20191024164534.132764-1-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia.com>
In order to support different modes (DP in addition to HDMI), split out
the audio setup/teardown into callbacks.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
drivers/gpu/drm/tegra/sor.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 478c001f4453..615cb319fa8b 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -398,6 +398,8 @@ struct tegra_sor_ops {
const char *name;
int (*probe)(struct tegra_sor *sor);
int (*remove)(struct tegra_sor *sor);
+ void (*audio_enable)(struct tegra_sor *sor);
+ void (*audio_disable)(struct tegra_sor *sor);
};
struct tegra_sor {
@@ -3008,6 +3010,8 @@ static const struct tegra_sor_ops tegra_sor_hdmi_ops = {
.name = "HDMI",
.probe = tegra_sor_hdmi_probe,
.remove = tegra_sor_hdmi_remove,
+ .audio_enable = tegra_sor_hdmi_audio_enable,
+ .audio_disable = tegra_sor_hdmi_audio_disable,
};
static int tegra_sor_dp_probe(struct tegra_sor *sor)
@@ -3616,9 +3620,11 @@ static irqreturn_t tegra_sor_irq(int irq, void *data)
tegra_hda_parse_format(format, &sor->format);
- tegra_sor_hdmi_audio_enable(sor);
+ if (sor->ops->audio_enable)
+ sor->ops->audio_enable(sor);
} else {
- tegra_sor_hdmi_audio_disable(sor);
+ if (sor->ops->audio_disable)
+ sor->ops->audio_disable(sor);
}
}
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2019-10-24 16:45 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-24 16:45 [PATCH 00/32] drm/tegra: Add DisplayPort support Thierry Reding
2019-10-24 16:45 ` [PATCH 01/32] drm/tegra: Add missing kerneldoc for struct drm_dp_link Thierry Reding
2019-10-24 16:45 ` [PATCH 02/32] drm/tegra: dp: Add drm_dp_link_reset() implementation Thierry Reding
2019-10-24 16:45 ` [PATCH 03/32] drm/tegra: dp: Track link capabilities alongside settings Thierry Reding
2019-10-24 16:45 ` [PATCH 04/32] drm/tegra: dp: Turn link capabilities into booleans Thierry Reding
2019-10-24 16:45 ` [PATCH 05/32] drm/tegra: dp: Probe link using existing parsing helpers Thierry Reding
2019-10-24 16:45 ` [PATCH 06/32] drm/tegra: dp: Read fast training capability from link Thierry Reding
2019-10-24 16:45 ` [PATCH 07/32] drm/tegra: dp: Read TPS3 capability from sink Thierry Reding
2019-10-24 16:45 ` [PATCH 08/32] drm/tegra: dp: Read channel coding " Thierry Reding
2019-10-24 16:45 ` [PATCH 09/32] drm/tegra: dp: Read alternate scrambler reset " Thierry Reding
2019-10-24 16:45 ` [PATCH 10/32] drm/tegra: dp: Read eDP version from DPCD Thierry Reding
2019-10-24 16:45 ` [PATCH 11/32] drm/tegra: dp: Read AUX read interval " Thierry Reding
2019-10-24 16:45 ` [PATCH 12/32] drm/tegra: dp: Set channel coding on link configuration Thierry Reding
2019-10-24 16:45 ` [PATCH 13/32] drm/tegra: dp: Enable alternate scrambler reset when supported Thierry Reding
2019-10-24 16:45 ` [PATCH 14/32] drm/tegra: dp: Add drm_dp_link_choose() helper Thierry Reding
2019-10-24 16:45 ` [PATCH 15/32] drm/tegra: dp: Add support for eDP link rates Thierry Reding
2019-10-24 16:45 ` [PATCH 16/32] drm/tegra: dp: Add DisplayPort link training helper Thierry Reding
2019-10-24 16:45 ` [PATCH 17/32] drm/tegra: sor: Use DP link training helpers Thierry Reding
2019-10-24 16:45 ` [PATCH 18/32] drm/tegra: sor: Hook up I2C-over-AUX to output Thierry Reding
2019-10-24 16:45 ` [PATCH 19/32] drm/tegra: sor: Stabilize eDP Thierry Reding
2019-10-24 16:45 ` [PATCH 20/32] drm/tegra: sor: Filter eDP rates Thierry Reding
2019-10-24 16:45 ` [PATCH 21/32] drm/tegra: sor: Add DisplayPort support Thierry Reding
2019-10-24 16:45 ` [PATCH 22/32] drm/tegra: sor: Remove tegra186-sor1 support Thierry Reding
2019-10-24 16:45 ` [PATCH 23/32] drm/tegra: sor: Use correct SOR index on Tegra210 Thierry Reding
2019-10-24 16:45 ` [PATCH 24/32] drm/tegra: sor: Implement pad clock for all SOR instances Thierry Reding
2019-10-24 16:45 ` [PATCH 25/32] drm/tegra: sor: Deduplicate connector type detection code Thierry Reding
2019-10-24 16:45 ` [PATCH 26/32] drm/tegra: sor: Support DisplayPort on Tegra194 Thierry Reding
2019-10-24 16:45 ` [PATCH 27/32] drm/tegra: sor: Unify clock setup for eDP, HDMI and DP Thierry Reding
2019-10-24 16:45 ` [PATCH 28/32] drm/tegra: sor: Use correct I/O pad for DP Thierry Reding
2019-10-24 16:45 ` [PATCH 29/32] drm/tegra: sor: Unify eDP and DP support Thierry Reding
2019-10-24 16:45 ` [PATCH 30/32] drm/tegra: sor: Avoid timeouts on unplug events Thierry Reding
2019-10-24 16:45 ` [PATCH 31/32] drm/tegra: sor: Extract common audio enabling code Thierry Reding
2019-10-24 16:45 ` Thierry Reding [this message]
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=20191024164534.132764-33-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-tegra@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).