From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 17AE340A92C for ; Fri, 21 Aug 2026 19:25:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787340349; cv=none; b=YfHwTytuiR5jqjG0bbHdTmceGTLV9FMoEe2eW7XKVjcjhaLX6Iwcs4sbB7eeI5mrIZwusCvhPh2oEmB+t1WdDkh+M354sjzzqreIQDkHXJiqLJajmQW30tKtim2KUbHElM+1A/aVp6NVFZKIvyu8YW5apqk2lU1CtUcTMDxAaWc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787340349; c=relaxed/simple; bh=LN6G38kLOxVII+y6zxnduhA19rnp+V6D8z2yDbZQr6o=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=jrSUeZ8EA9gUs7AY/hFU1pZfunJ+CUC3Uiv4m27hcX2KvBcfwzT05Wiib52+BAJ4q75LrEcRHa9oFELLmnSsG0R3h+9WNAy8VXz9hNJ0LV8gnSHRunFOGIFKoaL13C3N9sONdO8utfxSZC0mPdFYdMGwA+WCrW6GUA+DtCFeMG4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=i6Ln7xpc; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=NBUTcLZm; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="i6Ln7xpc"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="NBUTcLZm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787340344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XTWvZVA7JaArjs8Zd1HxJ0CjIfwAygH13+3hEPTRLdA=; b=i6Ln7xpcwx68GIxs2WGPkRxTxNNZiFt1Em61MPAJsuJnEcWDelnPBIIs+B95801VHSGdxh opdVVkyWtBKdPl9k9L+vpiZ2EPK0usCEka9vJGoDEgx5shL2+bayAsi3KQAC+yR4XxO5Vq JW/TuEyfxhDnqomrQwY0Pcoja7eYYls= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-439-WMESR6bTNRqZ4S0g4L4g8Q-1; Fri, 21 Aug 2026 15:25:41 -0400 X-MC-Unique: WMESR6bTNRqZ4S0g4L4g8Q-1 X-Mimecast-MFC-AGG-ID: WMESR6bTNRqZ4S0g4L4g8Q_1787340341 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-52cd0374265so24309531cf.1 for ; Fri, 21 Aug 2026 12:25:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787340341; x=1787945141; darn=vger.kernel.org; h=mime-version:user-agent:content-transfer-encoding:content-type :references:in-reply-to:date:cc:to:from:subject:message-id:from:to :cc:subject:date:message-id:reply-to:content-type; bh=XTWvZVA7JaArjs8Zd1HxJ0CjIfwAygH13+3hEPTRLdA=; b=NBUTcLZmV017aVx+9CoeBARuDXgb0zC/YuN3TQWFmD/yOCVL6FmZBviCTHgDqG2SNr Ko8NMdGuL/2uNNnPjT/+qCz07Du2JdMoHxLBOla4vX7RjNg4jKvh6OJLSArVPi1j53g2 qNn+K9hOB8xoi2Y/IxER4/xIimhktdXIfyBx3rBbayaVtrs1ufFm4Q5KOzFMs7Dj74/z VroF+tOcfZRh4MXzqva6ebxBC9ecQgVdSnIQ0NX7VG65+KOr4z0y/FD7/yjMLnKQHJV9 HgTKy6PiC2MwdzUr+Pe0F96DD6e9RVXPLM9pOjqFHDFh7eoIavLPYfdH8/R3WAIjDJDP o+JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787340341; x=1787945141; h=mime-version:user-agent:content-transfer-encoding:content-type :references:in-reply-to:date:cc:to:from:subject:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=XTWvZVA7JaArjs8Zd1HxJ0CjIfwAygH13+3hEPTRLdA=; b=E8+FccCniY63G8peELf9SK55eeJvzlpQiOH3ZXdcxRnyicYIJtU/S7fK9GtvJ7/N8x eIaffCEjT1pPl26LB6lqY5eOZzCz8v1PepNHZ9IbzvvBdN8iLQYTE080sTzVSNMebkH0 zFSVxATYYFAE5WoxLmkAl8aSgC23kaWD6VTeyd8LS180GejYwYBz5ttd+kALgBoNy+Pp sYKCGzNbdgOIxfojV4XVZ8xcuetZotJWeS6OjfmdxX8XZ4T1BdJotargAzOXKXvq/9R2 Cqn6XgzpyC/raYxZk1Mq/I60s21VQ2CQvhIrDs6zKPObrxQXhK1G2TR5PWE2wGC633Nh Jj0g== X-Forwarded-Encrypted: i=1; AHgh+RoVkJLYotl9EGNwHyjEiZItZqAJ0qX2wO8qFFHImmvhTZJtX6HRZfBIlGzjskAJEAAUXr1+J2dTBQRXAzE=@vger.kernel.org X-Gm-Message-State: AFuF++learHxt1ubWRaHrmpAy7PMWurbbd65fYniTxV9CnTA8/o9jg70 niVmfRZgN3QMp+/0mYL4FYsrHEecOCM04aDUYnTppIpPY2TB8i33hAUSXxKrhkLfUL3uft5wh3T 6tDvPf9PRz+HmDqksrZzpTK+AojoHVBMWbtuEJIWCUzyvicgmVCyUkdlny3bVRyW9Jg== X-Gm-Gg: AR+sD10hTZRbSXKC1UknQFxajFoQBnyJlQRmBnqWM/F4BvK4rTcLgeZRX+3XEdX3zGN 53GBJrkt1S7bxFiTS0Z5PkwAp8+dbVzQA7sW9+oT6szVgpnQH/QVPb/91Odoyv9v0GwomfjaF3n EPmOUEiKbd7DHkgDLQApj29b5uChb3MzKP3SjwtrhgVsPcHyn+nve4m2TN7F9vvoHVOwAECSui4 lOA6S4l63A7q9DXjjiHR7db82lprb7OdvQaeagEUhPJUkUeCBRHB/RcoUA4fnZ35EB1bC3NJ6Uu wAwYgkCfBsKgOOfJCMLhrWjeUayau/jlU8r8S1531QVUnxX3O+lA4XlbWjMB8hTccPXWb1+D X-Received: by 2002:a05:622a:481a:b0:52d:78c9:9377 with SMTP id d75a77b69052e-52e09ce9a34mr4128381cf.36.1787340340682; Fri, 21 Aug 2026 12:25:40 -0700 (PDT) X-Received: by 2002:a05:622a:481a:b0:52d:78c9:9377 with SMTP id d75a77b69052e-52e09ce9a34mr4127511cf.36.1787340339927; Fri, 21 Aug 2026 12:25:39 -0700 (PDT) Received: from [192.168.8.4] ([100.0.180.93]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-52e09ae930fsm1418381cf.27.2026.08.21.12.25.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 12:25:39 -0700 (PDT) Message-ID: <7509463d112de8807ba8be03a00a178a37891a94.camel@redhat.com> Subject: Re: [PATCH v2 02/10] drm/nouveau/disp: move the GSP HDMI GCP AVMute write to engine/disp From: lyude@redhat.com To: Mohamed Ahmed , linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Mary Guillemard , nouveau@lists.freedesktop.org Date: Fri, 21 Aug 2026 15:25:38 -0400 In-Reply-To: <20260820164929.17117-3-mohamedahmedegypt2001@gmail.com> References: <20260820164929.17117-1-mohamedahmedegypt2001@gmail.com> <20260820164929.17117-3-mohamedahmedegypt2001@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.58.3 (3.58.3-1.fc43) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Lyude Paul On Thu, 2026-08-20 at 20:49 +0400, Mohamed Ahmed wrote: > r535_sor_hdmi_audio() pairs two RM controls (a SET_OD_PACKET carrying > the same General Control Packet, and the audio mute-stream toggle) > with a direct write of the GCP AVMute bit through the SF GCP unit. > The controls are RM and stay, but the direct write is register > programming and moves next to the other per-chip display code as > tu102_sor_hdmi_gcp(). No functional change. >=20 > Signed-off-by: Mohamed Ahmed > --- > =C2=A0drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h=C2=A0=C2=A0=C2=A0 |= =C2=A0 1 + > =C2=A0drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c=C2=A0 | 15 > +++++++++++++++ > =C2=A0.../drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c=C2=A0=C2=A0=C2=A0 |= =C2=A0 9 +-------- > =C2=A03 files changed, 17 insertions(+), 8 deletions(-) >=20 > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h > b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h > index 3ba04bead2f9..5d682a774f2d 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h > @@ -194,6 +194,7 @@ void gv100_sor_dp_audio_sym(struct nvkm_ior *, > int, u16, u32); > =C2=A0void gv100_sor_dp_watermark(struct nvkm_ior *, int, u8); > =C2=A0extern const struct nvkm_ior_func_hda gv100_sor_hda; > =C2=A0 > +void tu102_sor_hdmi_gcp(struct nvkm_ior *, int, bool); > =C2=A0void tu102_sor_dp_vcpi(struct nvkm_ior *, int, u8, u8, u16, u16); > =C2=A0 > =C2=A0int nv50_pior_cnt(struct nvkm_disp *, unsigned long *); > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c > b/drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c > index 7b70b466fa36..6cfd52c9056f 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c > @@ -30,6 +30,21 @@ > =C2=A0 > =C2=A0#include > =C2=A0 > +/* General Control Packet: bracket an audio enable/disable with > AVMute > + * through the legacy GCP SF unit. Used by the GSP-RM path, which > sends the > + * equivalent packet via RM as well but keeps the direct write in > sync. > + */ > +void > +tu102_sor_hdmi_gcp(struct nvkm_ior *sor, int head, bool enable) > +{ > + struct nvkm_device *device =3D sor->disp- > >engine.subdev.device; > + const u32 hdmi =3D head * 0x400; > + > + nvkm_mask(device, 0x6f00c0 + hdmi, 0x00000001, 0x00000000); > + nvkm_wr32(device, 0x6f00cc + hdmi, !enable ? 0x00000001 : > 0x00000010); > + nvkm_mask(device, 0x6f00c0 + hdmi, 0x00000001, 0x00000001); > +} > + > =C2=A0void > =C2=A0tu102_sor_dp_vcpi(struct nvkm_ior *sor, int head, u8 slot, u8 > slot_nr, u16 pbn, u16 aligned) > =C2=A0{ > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c > b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c > index 8e57bb6519e5..cd4451e62512 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c > @@ -545,16 +545,9 @@ r535_sor_hdmi_ctrl_audio(struct nvkm_outp *outp, > bool enable) > =C2=A0static void > =C2=A0r535_sor_hdmi_audio(struct nvkm_ior *sor, int head, bool enable) > =C2=A0{ > - struct nvkm_device *device =3D sor->disp- > >engine.subdev.device; > - const u32 hdmi =3D head * 0x400; > - > =C2=A0 r535_sor_hdmi_ctrl_audio(sor->asy.outp, enable); > =C2=A0 r535_sor_hdmi_ctrl_audio_mute(sor->asy.outp, !enable); > - > - /* General Control (GCP). */ > - nvkm_mask(device, 0x6f00c0 + hdmi, 0x00000001, 0x00000000); > - nvkm_wr32(device, 0x6f00cc + hdmi, !enable ? 0x00000001 : > 0x00000010); > - nvkm_mask(device, 0x6f00c0 + hdmi, 0x00000001, 0x00000001); > + tu102_sor_hdmi_gcp(sor, head, enable); > =C2=A0} > =C2=A0 > =C2=A0static void