FAILED: patch "[PATCH] drm/nouveau/disp/r535: Add scanline position support + head" failed to apply to 6.12-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 804cb093b245c752f15d17186e0d404f10303593
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026090922-celibate-moisten-846b@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 804cb093b245c752f15d17186e0d404f10303593 Mon Sep 17 00:00:00 2001
From: Lyude Paul <[email protected]>
Date: Tue, 28 Apr 2026 23:03:40 -0400
Subject: [PATCH] drm/nouveau/disp/r535: Add scanline position support + head
state support
That's right! It looks like this never actually got finished, something which I just noticed today when I saw this fun message spamming one of my test machine's kernel logs when enabling display debug output for nouveau:
[drm:drm_crtc_vblank_helper_get_vblank_timestamp_internal] crtc 0 : scanoutpos query failed.
So it looks like we've been falling back to DRM's core fallback for a while now, whoops.
So, while it seems that we do have the option of doing this through GSP - that doesn't seem like a great idea. Mainly because reading this from GSP would involve a lot more latency then we should have for vblank handling due to the RPC communication. So instead of implementing that, just use gv100_head_state and gv100_head_rgpos for implementing .state and .rgpos. It seems to work perfectly fine!
drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c +2 -2
@@ -253,7 +253,7 @@ gv100_head_vblank_get(struct nvkm_head *head)nvkm_mask (device,0x611d80 + (head->id *4 ),0x00000004 ,0x00000004 ); } -static void +void gv100_head_rgpos (struct nvkm_head *head,u16 *hline,u16 *vline) {struct nvkm_device *device = head->disp->engine.subdev.device;
@@ -263,7 +263,7 @@ gv100_head_rgpos(struct nvkm_head *head, u16 *hline, u16 *vline) *hline =nvkm_rd32 (device,0x616334 + hoff) &0x0000ffff ; } -static void +void gv100_head_state (struct nvkm_head *head,struct nvkm_head_state *state) {struct nvkm_device *device = head->disp->engine.subdev.device;
drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h +2 -0
@@ -53,6 +53,8 @@ void gf119_head_rgclk(struct nvkm_head *, int);int gv100_head_cnt (struct nvkm_disp *,unsigned long *);int gv100_head_new (struct nvkm_disp *,int id); +void gv100_head_state (struct nvkm_head *head,struct nvkm_head_state *state); +void gv100_head_rgpos (struct nvkm_head *head,u16 *hline,u16 *vline); #define HEAD_MSG(h,l,f,a...) do { \ struct nvkm_head *_h = (h); \
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c +2 -6
@@ -625,14 +625,10 @@ r535_head_vblank_get(struct nvkm_head *head)nvkm_mask (device,0x611d80 + (head->id *4 ),0x00000002 ,0x00000002 ); } -static void -r535_head_state (struct nvkm_head *head,struct nvkm_head_state *state) -{ -} -static const struct nvkm_head_func r535_head = { - .state = r535_head_state, + .state = gv100_head_state, + .rgpos = gv100_head_rgpos, .vblank_get = r535_head_vblank_get, .vblank_put = r535_head_vblank_put, };
Sasha Levin
maintainerPATCH 1/1 drm/nouveau/disp/r535: Add scanline position support + head state support
From: Lyude Paul <[email protected]>
[ Upstream commit 804cb093b245c752f15d17186e0d404f10303593 ]
That's right! It looks like this never actually got finished, something which I just noticed today when I saw this fun message spamming one of my test machine's kernel logs when enabling display debug output for nouveau:
[drm:drm_crtc_vblank_helper_get_vblank_timestamp_internal] crtc 0 : scanoutpos query failed.
So it looks like we've been falling back to DRM's core fallback for a while now, whoops.
So, while it seems that we do have the option of doing this through GSP - that doesn't seem like a great idea. Mainly because reading this from GSP would involve a lot more latency then we should have for vblank handling due to the RPC communication. So instead of implementing that, just use gv100_head_state and gv100_head_rgpos for implementing .state and .rgpos. It seems to work perfectly fine!
--- drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 4 ++-- drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h | 2 ++ drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c | 8 ++------ 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c +2 -2
@@ -253,7 +253,7 @@ gv100_head_vblank_get(struct nvkm_head *head)nvkm_mask (device,0x611d80 + (head->id *4 ),0x00000004 ,0x00000004 ); } -static void +void gv100_head_rgpos (struct nvkm_head *head,u16 *hline,u16 *vline) {struct nvkm_device *device = head->disp->engine.subdev.device;
@@ -263,7 +263,7 @@ gv100_head_rgpos(struct nvkm_head *head, u16 *hline, u16 *vline) *hline =nvkm_rd32 (device,0x616334 + hoff) &0x0000ffff ; } -static void +void gv100_head_state (struct nvkm_head *head,struct nvkm_head_state *state) {struct nvkm_device *device = head->disp->engine.subdev.device;
drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h +2 -0
@@ -53,6 +53,8 @@ void gf119_head_rgclk(struct nvkm_head *, int);int gv100_head_cnt (struct nvkm_disp *,unsigned long *);int gv100_head_new (struct nvkm_disp *,int id); +void gv100_head_state (struct nvkm_head *head,struct nvkm_head_state *state); +void gv100_head_rgpos (struct nvkm_head *head,u16 *hline,u16 *vline); #define HEAD_MSG(h,l,f,a...) do { \ struct nvkm_head *_h = (h); \
drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c +2 -6
@@ -623,14 +623,10 @@ r535_head_vblank_get(struct nvkm_head *head)nvkm_mask (device,0x611d80 + (head->id *4 ),0x00000002 ,0x00000002 ); } -static void -r535_head_state (struct nvkm_head *head,struct nvkm_head_state *state) -{ -} -static const struct nvkm_head_func r535_head = { - .state = r535_head_state, + .state = gv100_head_state, + .rgpos = gv100_head_rgpos, .vblank_get = r535_head_vblank_get, .vblank_put = r535_head_vblank_put, };
Signature · 1 line
2.53.0