Skip to content

drm/apple: av: enable native display audio on firmware 27 #1741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
satchlj wants to merge 1 commit into
base: integration/aurora
Choose a base branch
from
+12 −5
Draft

drm/apple: av: enable native display audio on firmware 27 #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions drivers/gpu/drm/apple/av.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,8 @@ bool dcp_audiosrv_native_link(struct device *dev)
{
struct apple_dcp *dcp = dev_get_drvdata(dev);

return dcp_is_v14_7_external(dcp) || av_desktop_audio_role(dcp);
return dcp_is_v14_7_external(dcp) || av_desktop_audio_role(dcp) ||
dcp->fw_compat == DCP_FIRMWARE_V_27_0;
}

/* The 14.7 external role's audio service calls; KUnit stubs them. */
Expand Down Expand Up @@ -365,7 +366,10 @@ int dcp_audiosrv_open(struct device *dev)
/* Open: a zero body; status at +0, the opened Boolean at +16. */
memset(reply, 0, sizeof(reply));
ret = av_audiosrv_call(srv, asrv->cmds.open, NULL, 0, 32, reply, sizeof(reply));
if (!ret && (get_unaligned_le32(reply) || !get_unaligned_le64(reply + 16))) {
/* Firmware 27 does not require the 14.7 opened Boolean at +16. */
if (!ret && (get_unaligned_le32(reply) ||
(dcp->fw_compat != DCP_FIRMWARE_V_27_0 &&
!get_unaligned_le64(reply + 16)))) {
dev_err(dev, "audiosrv: open answered %#x, opened %llu\n",
get_unaligned_le32(reply), get_unaligned_le64(reply + 16));
ret = -EIO;
Expand Down Expand Up @@ -1232,7 +1236,8 @@ int avep_init(struct apple_dcp *dcp)
struct device *dev = dcp->dev;
struct device_node *endpoint, *audio_node = NULL;
const struct apple_epic_service_ops *ops = avep_ops;
u32 av_endpoint = AV_ENDPOINT;
u32 av_endpoint = dcp->fw_compat == DCP_FIRMWARE_V_27_0 ?
AV_ENDPOINT_V27 : AV_ENDPOINT;
int ret;

if (dcp->fw_compat == DCP_FIRMWARE_V_26_6_DESKTOP ||
Expand Down Expand Up @@ -1290,11 +1295,11 @@ int avep_init(struct apple_dcp *dcp)
default:
#if IS_ENABLED(CONFIG_DRM_APPLE_DCP_T6030_AUDIO)
/*
* The 14.7 external role (T6030 external processor) numbers its
* The 14.7 external role and firmware 27 number their
* methods as 13.5 does: open 4, close 5, prepare 6, start 7,
* stop 10, complete 11, elements 1/16, product attributes 1/18.
*/
if (dcp_is_v14_7_external(dcp)) {
if (dcp_is_v14_7_external(dcp) || dcp->fw_compat == DCP_FIRMWARE_V_27_0) {
audiosrv_data->cmds = dcp_av_audio_cmds_v13_5;
break;
}
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/apple/dcp-internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ enum {
DPAVSERV_ENDPOINT = 0x28,
DPAVSERV_ENDPOINT_V2 = 0x2a,
AV_ENDPOINT = 0x29,
/* Firmware 27 publishes DCPAVAudioInterface on 0x2b. */
AV_ENDPOINT_V27 = 0x2b,
/* Desktop 26.x separates the audio service from AV device control. */
AV_AUDIO_ENDPOINT_DESKTOP = 0x2b,
DPTX_ENDPOINT = 0x2a,
Expand Down
Loading