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 7E6E93F12D8 for ; Mon, 17 Aug 2026 22:59:09 +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=1787007552; cv=none; b=KPdQQS4q8jp8RhvsxieXyDvlDmJNHQN/0rY3NG+GylwZhL+c90s8hb/leMCF7xmIhWf0UCiXcav4uhCVsLgayFvnue1rnRejGKgdeDHX57fLvskKucTpPpoVpJZYIdm9yPD44CjjB7TdH4caA/XkvM/To/93l1dWULavI1GYnPo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787007552; c=relaxed/simple; bh=H4v+qaP7m/Xhyf063G3sGltFFFLC1Zs5+lbRgAPAPvw=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=qRNu0gutlC+gq6Dz5KBL9hdlhM3xQ0OhyN1FNy//oL+xINDCszwuMgFR1facq2ya+MQVickaJQW9Q+85i2wtheREiPMc5t3wfDhQurc1oIBrXlHbNPXU03YOnIBKB0G46y9vfBa3j9eCGJmgz+O2GH66/Iw2r22hqguwPgqHZyo= 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=HL515zxH; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=bGBVYWw1; 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="HL515zxH"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="bGBVYWw1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787007548; 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=rqGWJx78v4FRAZeWcBTMQYlunIdCeO9TuaYZ3v3TiUs=; b=HL515zxHDx84CNJi64GI1tOAIwBKCkeLcEdr26itsaPfOTVD6HF2zameDsi2DWE8Lt6I18 3oOa9b8GxsCKDMCVdFDHif3Y06VPXbcEKEDFwekYwqn/EMLnqozdYgnSo7zLvK62DLkeBj g10xSILhsET23pFWZZ4Z6LeX/gmAuWo= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-121-g9Szc2CpNwSIHZ3JPXNOuQ-1; Mon, 17 Aug 2026 18:59:06 -0400 X-MC-Unique: g9Szc2CpNwSIHZ3JPXNOuQ-1 X-Mimecast-MFC-AGG-ID: g9Szc2CpNwSIHZ3JPXNOuQ_1787007546 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-930b571432fso45041985a.0 for ; Mon, 17 Aug 2026 15:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787007546; x=1787612346; 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=rqGWJx78v4FRAZeWcBTMQYlunIdCeO9TuaYZ3v3TiUs=; b=bGBVYWw1xiOkHu02ERwyLO3yc/+GiYeXrNkELzn5ak+6RZmbc8v9nElUIFU8Po3F1P ltUTNKUEVmZ29Cc9pbt+vuOu2PPoNQJoNBt68SE6QpuGcg3SjbrE2GTdTpzG2HOY4s0j ZKNDCCbUF5AcXH+wMFkPrSQWakKoV2msXXuJp5sabvwxOd4T8NFqkvqsyZYbDSKVqWVV o4glzJl715C+9JawWWSz24WytP9grF8XBNmKFwNcDenT0dWyoC9iEP/HLoILAhDVVmiw WWhfrlwQLgZvvTKX9zQng1vJeeNoRgjfeYfKifmus2xfPEnhTx9BbTGC5MjPCQnLHQHz l5lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787007546; x=1787612346; 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=rqGWJx78v4FRAZeWcBTMQYlunIdCeO9TuaYZ3v3TiUs=; b=Zi24odUf7ejh3vBFWj+fpozwfS3g7xKNXrA4Ek4vjM7nbHKR2eWXMaggOgpNIYd2Zj uNem7qBq2YiXRPeetApMnydqm0FFFfBg/sDRwOlBOYqCoActkpM67f6Vv/r2MIUjrFI6 pTGDQGpa5y4NHnF+R3J4dxaezDjF5IE+xfi107abLNfN4dXq5fUEYpua/7IWv4W8/TIq nd7kpgq2TCCmDx85dZeVURFdYTys/jVYFk1XxMxuQUwd2koV4Qjm0imwIeAoywKjJGEG WeZcu3oPsx73uCyijoFwSxx5hA/G6AbWStCi8vxBBvMSBs/USYmpfSvv4EsaO/gTnuOr yIBg== X-Forwarded-Encrypted: i=1; AHgh+RpI7aCBpFwB+GFe5LMh6DDxfPP7j+1hz5LFjGpN0PxUNTTWI3kAVkcOE782SEAeogb11meCurKC9+3g4fw=@vger.kernel.org X-Gm-Message-State: AOJu0Ywc0upYna32LVvmtIVfmXkX1JpJf3SQvk3tYMBYdmtItsi5WkTH ZyKJE32gYFS10/K9mqSoytCwv8hiZ7FVSX16liP/bKQzOzS1x8tX0+5RrYC2n0UcRQxJe7lzGbg k/dHsSLWA57neNMsURwx8BYd1qDEa6P4ZIy77mPY81nk8Uo6vNIP1/WiMRaYB5hPxzA== X-Gm-Gg: AR+sD11M3jkgRGJgtSlEf9wDPL+RFKnbbaGZH31RiW5akwCXa2BXiEFpcOtz3uvi2je spwusKt7/H5r+Y8734JSMIMdLey0RQLzfKw9v7oEfQ49Kr/cAM2NfqadDUk9pV70/BNXe1OB09n mGRGWrOHOWJyHJqzVXdRlmjQRw8vgf189x5iKWvyOWhhKCclJxIv09RpaEECuLnpNplhxxmIMyR 9hYUyyx/Mj5zwkpX9fN39DUJ8G+750FVnMgIKp7Vcz49bofTWE3xpv8FAPr6fuZ+ET4+11qem9J Z5E+CEe7LZfOXYuBRA82mYN4beyckK/YOWK4DUhn57S8cGkzGaB9YVgrZ5o8yD/kLsnDjZjM X-Received: by 2002:a05:620a:3190:b0:936:c5da:ea88 with SMTP id af79cd13be357-9370657081fmr306725485a.7.1787007546382; Mon, 17 Aug 2026 15:59:06 -0700 (PDT) X-Received: by 2002:a05:620a:3190:b0:936:c5da:ea88 with SMTP id af79cd13be357-9370657081fmr306719985a.7.1787007545687; Mon, 17 Aug 2026 15:59:05 -0700 (PDT) Received: from [192.168.8.4] ([100.0.180.93]) by smtp.gmail.com with ESMTPSA id af79cd13be357-937033cd76fsm154185485a.29.2026.08.17.15.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2026 15:59:04 -0700 (PDT) Message-ID: <996d2033b1522090867e50f181e9b4daaab19861.camel@redhat.com> Subject: Re: [PATCH 5/7] nouveau/gsp: fix vblank interrupts on GB20x 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: Mon, 17 Aug 2026 18:59:03 -0400 In-Reply-To: <20260814235705.59132-6-mohamedahmedegypt2001@gmail.com> References: <20260814235705.59132-1-mohamedahmedegypt2001@gmail.com> <20260814235705.59132-6-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 On Sat, 2026-08-15 at 03:57 +0400, Mohamed Ahmed wrote: >=20 > + > +static const struct nvkm_head_func > +gb202_head =3D { > + .state =3D r535_head_state, > + .vblank_get =3D gb202_head_vblank_get, > + .vblank_put =3D gb202_head_vblank_put, > +}; > + You should probably add these two as well: .state =3D gv100_head_state, .rgpos =3D gv100_head_rgpos, I don't think they've actually changed in blackwell, but it's possible maybe they do change in GB200x so you probably want to double check so we don't lose precise vblank timestamps again. > =C2=A0static struct nvkm_conn * > =C2=A0r535_conn_new(struct nvkm_disp *disp, u32 id) > =C2=A0{ > @@ -1496,6 +1523,20 @@ r535_disp_intr(struct nvkm_inth *inth) > =C2=A0 return IRQ_HANDLED; > =C2=A0} > =C2=A0 > +static irqreturn_t > +gb202_disp_intr(struct nvkm_inth *inth) > +{ > + struct nvkm_disp *disp =3D container_of(inth, typeof(*disp), > engine.subdev.inth); > + irqreturn_t ret =3D r535_disp_intr(inth); > + > + /* The FE interrupt vectors are message-based on NVD5.0. Re- > arm the > + * low-latency vector so it fires again for any event that > latched > + * while we were servicing. > + */ > + nvkm_wr32(disp->engine.subdev.device, 0x611f34, 0x00000001); > + return ret; > +} > + > =C2=A0static void > =C2=A0r535_disp_fini(struct nvkm_disp *disp, bool suspend) > =C2=A0{ > @@ -1568,7 +1609,9 @@ r535_disp_oneinit(struct nvkm_disp *disp) > =C2=A0 struct nvkm_device *device =3D disp->engine.subdev.device; > =C2=A0 struct nvkm_gsp *gsp =3D device->gsp; > =C2=A0 const struct nvkm_rm_api *rmapi =3D gsp->rm->api; > + const struct nvkm_rm_gpu *gpu =3D gsp->rm->gpu; > =C2=A0 NV2080_CTRL_INTERNAL_DISPLAY_WRITE_INST_MEM_PARAMS *ctrl; > + nvkm_inth_func intr_func; > =C2=A0 unsigned long mask; > =C2=A0 int ret, i; > =C2=A0 > @@ -1722,7 +1765,12 @@ r535_disp_oneinit(struct nvkm_disp *disp) > =C2=A0 nvkm_gsp_rm_ctrl_done(&disp->rm.objcom, ctrl); > =C2=A0 > =C2=A0 for_each_set_bit(i, &disp->head.mask, disp->head.nr) > { > - ret =3D nvkm_head_new_(&r535_head, disp, i); > + const struct nvkm_head_func *func =3D > &r535_head; > + > + if (gpu->disp.class.root >=3D GB202_DISP) > + func =3D &gb202_head; > + > + ret =3D nvkm_head_new_(func, disp, i); > =C2=A0 if (ret) > =C2=A0 return ret; > =C2=A0 } > @@ -1766,12 +1814,21 @@ r535_disp_oneinit(struct nvkm_disp *disp) > =C2=A0 if (ret) > =C2=A0 return ret; > =C2=A0 > - ret =3D nvkm_gsp_intr_stall(gsp, disp->engine.subdev.type, > disp->engine.subdev.inst); > + if (gpu->disp.class.root >=3D GB202_DISP) { > + /* GB20x deliver head-timing interrupts on the > display's > + * separate low-latency vector (interrupt table > instance 1). > + */ > + ret =3D nvkm_gsp_intr_stall(gsp, disp- > >engine.subdev.type, 1); > + intr_func =3D gb202_disp_intr; > + } else { > + ret =3D nvkm_gsp_intr_stall(gsp, disp- > >engine.subdev.type, disp->engine.subdev.inst); > + intr_func =3D r535_disp_intr; > + } > =C2=A0 if (ret < 0) > =C2=A0 return ret; > =C2=A0 > =C2=A0 ret =3D nvkm_inth_add(&device->vfn->intr, ret, > NVKM_INTR_PRIO_NORMAL, &disp->engine.subdev, > - =C2=A0=C2=A0=C2=A0 r535_disp_intr, &disp- > >engine.subdev.inth); > + =C2=A0=C2=A0=C2=A0 intr_func, &disp->engine.subdev.inth); > =C2=A0 if (ret) > =C2=A0 return ret; > =C2=A0 > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c > b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c > index 996941c668ba..2590b22663cb 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c > @@ -44,6 +44,14 @@ r570_gsp_xlat_mc_engine_idx(u32 mc_engine_idx, > enum nvkm_subdev_type *ptype, int > =C2=A0 *ptype =3D NVKM_ENGINE_DISP; > =C2=A0 *pinst =3D 0; > =C2=A0 return true; > + case MC_ENGINE_IDX_DISP_LOW: > + /* GB20x+ report a separate low-latency display > vector, used > + * for head-timing interrupts. Expose it as a second > DISP > + * interrupt instance. > + */ > + *ptype =3D NVKM_ENGINE_DISP; > + *pinst =3D 1; > + return true; > =C2=A0 case MC_ENGINE_IDX_CE0 ... MC_ENGINE_IDX_CE19: > =C2=A0 *ptype =3D NVKM_ENGINE_CE; > =C2=A0 *pinst =3D mc_engine_idx - MC_ENGINE_IDX_CE0;