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 8FF14A95E for ; Wed, 19 Aug 2026 00:11:04 +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=1787098266; cv=none; b=HnWaSQkQA9eTKeqLqIQ0uXpBvVJ+MGhyLnBjkvLUErhfIkyyz1eWd2NDC7XQZP+oI2bpvgpc+gmXgFP+BNcMPo5//E2VkTxAXOhb1oaH0pqd2/nGW433D8t+XNehu7ecjKwvB5yuFDdTpjCkdkehsx7TuWWFzAlFNVWncSe4TmM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787098266; c=relaxed/simple; bh=E9Mj3FBVlliYr94R9sboa8B7LSzGGKEy+lMLf835AnI=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=TxWq1PtWdOaXeVsVBIa7DkHrMvX2RXidorAf+ADP3WBbY1tUiw9a/BVYYCa5dsWBuYzDs9UEH4usfnzYrm3xSfjzM06h8M3YjvI7viTDQT196ltOdn1DKMr5KuTlJHeM0C5borEif/DoUTvfBD3phhlJ6J6MKA31CBbjl4iSFP0= 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=Ib1ejHnL; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=pzw3tURA; 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="Ib1ejHnL"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="pzw3tURA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787098263; 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=3meVETvNh0oF+MgWc75MBOQm9AMx1Iu8D1AK3Y3rmHY=; b=Ib1ejHnLQzzTftjBUiNhKp3uSRVQ9gXk8bXiVnlvVbstHopfE+PcGVCyR0qfx0561tKEyS N3wim+ouy14tF8wzqY+cVnYbLHAiw5+XDVR8WFcCgik895jM0dd+U7VWxTC2pUqFDt0eHd LYlVjHNKBx1RPsnPjP1mYw+OcnFvV4A= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-347-6rgnNb11MlS7qPzCY_Q8pA-1; Tue, 18 Aug 2026 20:11:02 -0400 X-MC-Unique: 6rgnNb11MlS7qPzCY_Q8pA-1 X-Mimecast-MFC-AGG-ID: 6rgnNb11MlS7qPzCY_Q8pA_1787098261 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-8eac2620cb0so6176366d6.3 for ; Tue, 18 Aug 2026 17:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787098261; x=1787703061; 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=3meVETvNh0oF+MgWc75MBOQm9AMx1Iu8D1AK3Y3rmHY=; b=pzw3tURA2djE8Dz1G47NMoS6pDdqmR1KeLxeaCoLg1DHfXQA4efKxsIXtpZNz/Kx99 cJ6D9anWZlhqdIm7CZYJt2NJghPm1F6xCKFrT7lmmf2ySv2IjCCECTNnE/bcC3hb02Ah nNnyLfSUIK6zZE6sz6LnK5ADKIcFZaKE9xuQJkNcrtJCi4EtuKyXvCV74U99obk634Cd 2F6t+rNDmGA5F7vP6GxjK9xtN1xKsw87dtV16tYdl5fBwBIKypPYpT/WRMkq4632bBt+ VEz9RGH+UHsdNKxxiQOwTEd5op2pcUvF9p8HqrzlYCl2mDdUcBBOv2wvZPKg9d5nfBVk uFtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787098261; x=1787703061; 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=3meVETvNh0oF+MgWc75MBOQm9AMx1Iu8D1AK3Y3rmHY=; b=pwt0VpecuE1sd+2KO1cf5nw+kRWqmS/RtW0uZy4VTD4TKuZqb6DghReo43/m8dL7t0 YZzfjLZKMs8+zlzm95Q/VgPumVlNuztUHazMzzXCLftR3C+xvYY0mivZIjglGplWKVVE bMZMIDVbszcZciAToa/4kVskVwPzR8B7rxtASmhwU7HsnOCVa9njxKPFXX2N3kKT//jx aSgYqWdzRR0u5fo7ifJieEIEQrKb+mzWZOka71PEi+RAH15HtQbBqf4t7mehvmHDeviG JGihkkK4w8fyYgiwbITJpDfgc3fP/WyvU7vfa3mZPNwBMpbZ4F3ZJ0iHChLTm9jn02Vo ENSg== X-Forwarded-Encrypted: i=1; AHgh+RprSvwKNkx/oCx6UZ9IMORGdrXillHm0fwQi12YAa5/Gjk8G9qcjhtYp+1jyXf4+UnwXGbWpypcQDDn4EA=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2wJg+IUgmnxXvywktpxEjGA7Fp5X5abFTpInxaZ/ILn+SepUD bFZDqvDM6A/0O6ZvfaBx1Hj2GKfAT/D5U9uRpD8yQZxYR9MbBjLfraUHQ58CpXNwvZ109OJIZkQ T/anMha9z1fHHREkjuKxKhqAywuEsO1Yn7/nKILISxYYMYWLDDM9WxGeMQHqwc2aRXA== X-Gm-Gg: AR+sD10+o0/ud4Nwkijiq4eoNkINw4eDXDmkI8xAqhMeMq/3bVjlL8kbCCVNGcq4pzr BxX39XU1K84Pgz+HvI6FPzqeIU6JQNe3rI5EIOJKXgrhRab4Thur6Hcdt9FIBmatc+621Yz8WAx VnqBnfGAtcQx9+X+ssUqqmq744QTjWz/dhoQ3PXz9KNygb3L3ZCFbk4DJbGz/pqYyzFtreArTZl JbGjts6OxpVCE20YgKrN8DenCn7VyFsxMMNtWcVNVGkw8T9CIUw9vyGdeTiduKHw9cXXl3iNTCF ObjjIJ0rOK8B2JBHcqcdy9rWge8S2pi4QUQk4cR098nvHNEtXh92kEacbz1ZAsunhfQU9Ljs X-Received: by 2002:a05:6214:4186:b0:8fd:d5a7:f970 with SMTP id 6a1803df08f44-90c5e6cc420mr7993556d6.11.1787098261475; Tue, 18 Aug 2026 17:11:01 -0700 (PDT) X-Received: by 2002:a05:6214:4186:b0:8fd:d5a7:f970 with SMTP id 6a1803df08f44-90c5e6cc420mr7993056d6.11.1787098261046; Tue, 18 Aug 2026 17:11:01 -0700 (PDT) Received: from [192.168.8.4] ([100.0.180.93]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-90c5f2911a5sm1572226d6.30.2026.08.18.17.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2026 17:10:59 -0700 (PDT) Message-ID: Subject: Re: [PATCH 4/6] drm/nouveau/kms/nv50-: Stop using nv_encoder->crtc in nv50_disp_atomic_commit_core() From: lyude@redhat.com To: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Marek Czernohous Cc: Marek Czernohous , Faith Ekstrand , Dave Airlie , Maarten Lankhorst , Luca Ceresoli , Kees Cook , Marco Crivellari , Simona Vetter , Ben Skeggs , David Airlie , Thomas Zimmermann , Maxime Ripard , Danilo Krummrich , Jani Nikula , James Jones Date: Tue, 18 Aug 2026 20:10:58 -0400 In-Reply-To: <20260818235637.1738055-5-lyude@redhat.com> References: <20260818235637.1738055-1-lyude@redhat.com> <20260818235637.1738055-5-lyude@redhat.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 This is wrong and I only just noticed it before getting ready to finish up work - whether we need to use the new or old state depends on if we're enabling or disabling - otherwise we'll end up with an unexpected !nv_crtc Will send a respin of this tomorrow On Tue, 2026-08-18 at 19:48 -0400, Lyude Paul wrote: > Another leftover spot where we still use nv_encoder->crtc. Get rid of > it > and do the right thing: get the currently assigned CRTC from the new > atomic > state. >=20 > Signed-off-by: Lyude Paul > Reported-by: Marek Czernohous > --- > =C2=A0drivers/gpu/drm/nouveau/dispnv50/disp.c | 8 ++++++-- > =C2=A01 file changed, 6 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c > b/drivers/gpu/drm/nouveau/dispnv50/disp.c > index f19820dc055ae..63d554e97fb62 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c > @@ -2171,10 +2171,14 @@ nv50_disp_atomic_commit_core(struct > drm_atomic_commit *state, u32 *interlock) > =C2=A0 list_for_each_entry(outp, &atom->outp, head) { > =C2=A0 if (outp->encoder->encoder_type !=3D > DRM_MODE_ENCODER_DPMST) { > =C2=A0 struct nouveau_encoder *nv_encoder =3D > nouveau_encoder(outp->encoder); > + struct nouveau_crtc *nv_crtc =3D > nv50_outp_get_new_crtc(state, nv_encoder); > + > + if (drm_WARN_ON(drm->dev, !nv_crtc)) > + continue; > =C2=A0 > =C2=A0 if (outp->enabled) { > - nv50_audio_enable(outp->encoder, > nouveau_crtc(nv_encoder->crtc), > - =C2=A0 nv_encoder->conn, > NULL, NULL); > + nv50_audio_enable(outp->encoder, > nv_crtc, nv_encoder->conn, NULL, > + =C2=A0 NULL); > =C2=A0 outp->enabled =3D outp->disabled =3D > false; > =C2=A0 } else { > =C2=A0 if (outp->disabled) {