From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A06A3E833E for ; Fri, 14 Aug 2026 23:59:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786751944; cv=none; b=gAiLpBL3IvEesglxK2D+OZICQz8uzD3UG4VUjv/SmqzysomTzWsh+6/ra26H8kGPRqfa4tBZuIoaQ8ZQDnkkIngRL1RpPQOv7I28FgEssjKDMZujNl8RWEn+RSKj8H4Fi/h1wTWobPokWlLB6wjEpVRRcKvMKlfHVQSh5Fikk6A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786751944; c=relaxed/simple; bh=S3Ex/YEo4eA1IDhlShBowDNbT2mUX07UdFPi+PuWizM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s43RnHoyyPl74SwlkogehRzrE/Q+ZnytASBCmPe8MtVERFEwkhFLs+TxuVxk+J4/qFIZNxnZYfSmX0E6ftsTaxNEcJz52/Yr29OvnYKaDxjA7oiLNeDLU66b//UC4LgvZsFnxLsn0VHD5Xd7aLa4LORHwzvstLt7kyCvXEjNKF0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dSiX2/UX; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dSiX2/UX" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-495590dde14so20852105e9.0 for ; Fri, 14 Aug 2026 16:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786751941; x=1787356741; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=fMGRuxtkoqwvkegb2VQwtKr99OBFpwpDX/9kGruR5sw=; b=dSiX2/UXhayh1mkKTR2CUVE9amYOuChwfH8LXutpDD3zFk6h/+F3jDXm4b+c4iGykP 0UgyF07O+WzFUnwGVf2ZWXTChljCM59oofjrmJk6kjwcsO8mDvULR7EBpQZmZAPHVfAk BoE5HxPD49KICgBnnsuC3F1pA6vDD2z7cTKRR7TBDeDhhGuI/CKUVvNkoQMS+gTiRIR9 TIKxrbDufNYE17Wdo8L2YXxNCE9G1HctkD6lx2YVYFieJj16xkwuxbG6Gd4WgtFLrp+X ou7gAkF4r70LrC1z9AdKVufnfBMfO0Qy/665rsh2xEQgBh/wK+U2rf6LNoLqAmMfxDki n+1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786751941; x=1787356741; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=fMGRuxtkoqwvkegb2VQwtKr99OBFpwpDX/9kGruR5sw=; b=NSqOL5Gaz2X0rKWB1V3z3iRheFAmjRuZg5PK6GI9bzRTpyShL4Sj6LMjKV4vWL5UBx 2iyn5aq4bAQ5p//wdoK9nvyScEmQE/wI7YHHRhmrpgk+PhPnFS10rgKVc+y8B8KRxVIq 2IPSRNaYn3kCMWZBJw7dLxpDevv13ukaUcgETyFuozT5WykbWAg3lZHJe12DBjf/Z0Ul YCP7t/BnPY+z/wavvmLfzai6WZpUjatHI7CzKyTCgFS+oifOxFRp6y8jBh7Z+2+9mmnb mw7zf4QxguDWSMTts+BpvZvKhYy9vMDx38HstxAGZoqFgu6+g6cs3FAywhqnaC7FeWht GWxg== X-Gm-Message-State: AOJu0YwlT0rdxhUBYM77/pIwOKBMDdWNnp5kYTyar7bhwYf5j+u0eunI Iqk4VED1MLbUJFkhWfzf0ZEjxAVZwyiZcex7L6eruBA0oXvJ5vPWeqUzhRZoMuqz0NM= X-Gm-Gg: AR+sD10DY8jznK06RIPTy3QJXGqqYDuXSkJfwWfDp/fe2LTcv69vyUVq1r8JNxiHQzP nQqSj+Btt8BnJcuGT7rGZi5kSnOt66qlllhnGwFTy8UDn34rMclsL3SUv3+VbajmAyYtc7DCFnd y1LBGQ5yDpAYKKqHTmTUV5eUR3y8WaV12MY6/O25BP8d5MZs5J6SxRFZR9xJwmkmYLhE168KI4t UWnGd4u3N5dNfJoRaQMewCK55HnCZhT+aXi/AnyuMN5oq3errHuN4Ye62OgOWYzi2qXB4j29mL2 NE59VzjZC+2qDUVYP2C8ccE4BuZZs0cbzLrkrZtfXDaibbNd8bNfKgp2WH/o9K9v7HhEl/BQQQs TgUDIiY6csOWJ7/nb8EbeH0MLdy+m1vm8zs1TmmIINFuQdGXNusxxKn2h/tRv66XexrO9xY3uwW 3zIbUcCf+bHu/zOfKlkOZy2Ll3t721aKXlNaa6Zt/8NAsipHXEkGE+28VmDK/O6+xh0a9jyv3d X-Received: by 2002:a05:600c:4688:b0:499:8807:345f with SMTP id 5b1f17b1804b1-49988073627mr107955575e9.13.1786751941266; Fri, 14 Aug 2026 16:59:01 -0700 (PDT) Received: from fedora ([5.31.134.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-499899753ccsm77751245e9.0.2026.08.14.16.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 16:59:00 -0700 (PDT) From: Mohamed Ahmed To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Lyude Paul , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Mary Guillemard , nouveau@lists.freedesktop.org, Mohamed Ahmed Subject: [PATCH 5/7] nouveau/gsp: fix vblank interrupts on GB20x Date: Sat, 15 Aug 2026 03:57:03 +0400 Message-ID: <20260814235705.59132-6-mohamedahmedegypt2001@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260814235705.59132-1-mohamedahmedegypt2001@gmail.com> References: <20260814235705.59132-1-mohamedahmedegypt2001@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The GSP path programs per-head timing (vblank) interrupts the same way on every generation. NVD5.0 (GB20x) reworked the FE interrupt frontend around four message-based kernel vectors (high latency, low latency, PMU, and GSP) and moved RM head-timing interrupts to the dedicated low-latency vector: - The enable is NV_PDISP_FE_RM_INTR_EN1_HEAD_TIMING, 0x611ef0 + head*4 (570.144 kernel_head_0501.c and v05_01 dev_disp.h. (Renamed kernel_head_0502.c in 610 releases)). - The vector is reported as a separate interrupt table entry, MC_ENGINE_IDX_DISP_LOW (intr_gb202.c, intrCacheDispIntrVectors). - The vector must be re-armed through NV_PDISP_FE_INTR_RETRIGGER(1) at 0x611f34 after servicing (kdispServiceInterrupt -> kdispIntrRetrigger_v05_01). The event latch (0x611800), per-head status (0x611c00), and dispatch summary (0x611ec0) the interrupt handler uses are unchanged on GB20x (kheadReadPendingVblank_v03_00 and kheadResetPendingLastData_v03_00 remain for DISPv0502+). On GB20x the old code enables head timing onto the legacy vector, leaves its handler there, and never re-arms the message-based vectors. Page flips still complete (nv50 sends those events from the commit path), so the desktop looks fine while DRM vblank waits and vblank sequence queries are affected. Select the head functions and the interrupt handler per generation in r535_disp_oneinit(), keyed on the display root class from the RM GPU table like the SOR split. Translate the low-latency interrupt table as a second NVKM_ENGINE_DISP instance, attach the handler to it on GB20x, and retrigger the vector after servicing. Signed-off-by: Mohamed Ahmed --- .../nouveau/nvkm/subdev/gsp/rm/r535/disp.c | 63 ++++++++++++++++++- .../drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c | 8 +++ 2 files changed, 68 insertions(+), 3 deletions(-) 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 dd632767aea5..248ed6368e48 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 @@ -696,6 +696,33 @@ r535_head = { .vblank_put = r535_head_vblank_put, }; +/* NVD5.0 (GB20x and later) moved the RM head-timing interrupt enable to + * the low-latency vector's EN1 block. The event latch is unchanged. + */ +static void +gb202_head_vblank_put(struct nvkm_head *head) +{ + struct nvkm_device *device = head->disp->engine.subdev.device; + + nvkm_mask(device, 0x611ef0 + (head->id * 4), 0x00000002, 0x00000000); +} + +static void +gb202_head_vblank_get(struct nvkm_head *head) +{ + struct nvkm_device *device = head->disp->engine.subdev.device; + + nvkm_wr32(device, 0x611800 + (head->id * 4), 0x00000002); + nvkm_mask(device, 0x611ef0 + (head->id * 4), 0x00000002, 0x00000002); +} + +static const struct nvkm_head_func +gb202_head = { + .state = r535_head_state, + .vblank_get = gb202_head_vblank_get, + .vblank_put = gb202_head_vblank_put, +}; + static struct nvkm_conn * r535_conn_new(struct nvkm_disp *disp, u32 id) { @@ -1496,6 +1523,20 @@ r535_disp_intr(struct nvkm_inth *inth) return IRQ_HANDLED; } +static irqreturn_t +gb202_disp_intr(struct nvkm_inth *inth) +{ + struct nvkm_disp *disp = container_of(inth, typeof(*disp), engine.subdev.inth); + irqreturn_t ret = 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; +} + static void r535_disp_fini(struct nvkm_disp *disp, bool suspend) { @@ -1568,7 +1609,9 @@ r535_disp_oneinit(struct nvkm_disp *disp) struct nvkm_device *device = disp->engine.subdev.device; struct nvkm_gsp *gsp = device->gsp; const struct nvkm_rm_api *rmapi = gsp->rm->api; + const struct nvkm_rm_gpu *gpu = gsp->rm->gpu; NV2080_CTRL_INTERNAL_DISPLAY_WRITE_INST_MEM_PARAMS *ctrl; + nvkm_inth_func intr_func; unsigned long mask; int ret, i; @@ -1722,7 +1765,12 @@ r535_disp_oneinit(struct nvkm_disp *disp) nvkm_gsp_rm_ctrl_done(&disp->rm.objcom, ctrl); for_each_set_bit(i, &disp->head.mask, disp->head.nr) { - ret = nvkm_head_new_(&r535_head, disp, i); + const struct nvkm_head_func *func = &r535_head; + + if (gpu->disp.class.root >= GB202_DISP) + func = &gb202_head; + + ret = nvkm_head_new_(func, disp, i); if (ret) return ret; } @@ -1766,12 +1814,21 @@ r535_disp_oneinit(struct nvkm_disp *disp) if (ret) return ret; - ret = nvkm_gsp_intr_stall(gsp, disp->engine.subdev.type, disp->engine.subdev.inst); + if (gpu->disp.class.root >= GB202_DISP) { + /* GB20x deliver head-timing interrupts on the display's + * separate low-latency vector (interrupt table instance 1). + */ + ret = nvkm_gsp_intr_stall(gsp, disp->engine.subdev.type, 1); + intr_func = gb202_disp_intr; + } else { + ret = nvkm_gsp_intr_stall(gsp, disp->engine.subdev.type, disp->engine.subdev.inst); + intr_func = r535_disp_intr; + } if (ret < 0) return ret; ret = nvkm_inth_add(&device->vfn->intr, ret, NVKM_INTR_PRIO_NORMAL, &disp->engine.subdev, - r535_disp_intr, &disp->engine.subdev.inth); + intr_func, &disp->engine.subdev.inth); if (ret) return ret; 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 *ptype = NVKM_ENGINE_DISP; *pinst = 0; 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 = NVKM_ENGINE_DISP; + *pinst = 1; + return true; case MC_ENGINE_IDX_CE0 ... MC_ENGINE_IDX_CE19: *ptype = NVKM_ENGINE_CE; *pinst = mc_engine_idx - MC_ENGINE_IDX_CE0; -- 2.55.0