* [PATCH] drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps
@ 2020-08-06 23:01 Lyude Paul
2020-08-13 16:25 ` Sasha Levin
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Lyude Paul @ 2020-08-06 23:01 UTC (permalink / raw)
To: nouveau
Cc: stable, Ben Skeggs, David Airlie, Daniel Vetter,
Christian König, Nirmoy Das,
open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS, open list
Not entirely sure why this never came up when I originally tested this
(maybe some BIOSes already have this setup?) but the ->caps_init vfunc
appears to cause the display engine to throw an exception on driver
init, at least on my ThinkPad P72:
nouveau 0000:01:00.0: disp: chid 0 mthd 008c data 00000000 0000508c 0000102b
This is magic nvidia speak for "You need to have the DMA notifier offset
programmed before you can call NV507D_GET_CAPABILITIES." So, let's fix
this by doing that.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Fixes: 4a2cb4181b07 ("drm/nouveau/kms/nv50-: Probe SOR and PIOR caps for DP interlacing support")
Cc: <stable@vger.kernel.org> # v5.8+
---
drivers/gpu/drm/nouveau/dispnv50/core507d.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv50/core507d.c b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
index ad1f09a143aa4..c984080ce99f2 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/core507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
@@ -80,11 +80,19 @@ core507d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp)
struct nvif_push *push = disp->core->chan.push;
int ret;
- if ((ret = PUSH_WAIT(push, 2)))
+ if ((ret = PUSH_WAIT(push, 4)))
return ret;
+ PUSH_MTHD(push, NV507D, SET_NOTIFIER_CONTROL,
+ NVDEF(NV507D, SET_NOTIFIER_CONTROL, MODE, WRITE) |
+ NVVAL(NV507D, SET_NOTIFIER_CONTROL, OFFSET, NV50_DISP_CORE_NTFY >> 2) |
+ NVDEF(NV507D, SET_NOTIFIER_CONTROL, NOTIFY, ENABLE));
PUSH_MTHD(push, NV507D, GET_CAPABILITIES, 0x00000000);
- return PUSH_KICK(push);
+ ret = PUSH_KICK(push);
+ if (ret)
+ return ret;
+
+ return 0;
}
int
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps
2020-08-06 23:01 [PATCH] drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps Lyude Paul
@ 2020-08-13 16:25 ` Sasha Levin
2020-08-19 23:56 ` Sasha Levin
2020-08-26 13:53 ` Sasha Levin
2 siblings, 0 replies; 4+ messages in thread
From: Sasha Levin @ 2020-08-13 16:25 UTC (permalink / raw)
To: Sasha Levin, Lyude Paul, nouveau; +Cc: stable, Ben Skeggs, stable
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 4a2cb4181b07 ("drm/nouveau/kms/nv50-: Probe SOR and PIOR caps for DP interlacing support").
The bot has tested the following trees: v5.8.
v5.8: Failed to apply! Possible dependencies:
3c43c362b3a5 ("drm/nouveau/kms/nv50-: convert core caps_init() to new push macros")
5e691222eac6 ("drm/nouveau/kms/nv50-: convert core init() to new push macros")
d8b24526ef68 ("drm/nouveau/kms/nv50-: use NVIDIA's headers for core caps_init()")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps
2020-08-06 23:01 [PATCH] drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps Lyude Paul
2020-08-13 16:25 ` Sasha Levin
@ 2020-08-19 23:56 ` Sasha Levin
2020-08-26 13:53 ` Sasha Levin
2 siblings, 0 replies; 4+ messages in thread
From: Sasha Levin @ 2020-08-19 23:56 UTC (permalink / raw)
To: Sasha Levin, Lyude Paul, nouveau; +Cc: stable, Ben Skeggs, stable
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 4a2cb4181b07 ("drm/nouveau/kms/nv50-: Probe SOR and PIOR caps for DP interlacing support").
The bot has tested the following trees: v5.8.1.
v5.8.1: Failed to apply! Possible dependencies:
3c43c362b3a5 ("drm/nouveau/kms/nv50-: convert core caps_init() to new push macros")
5e691222eac6 ("drm/nouveau/kms/nv50-: convert core init() to new push macros")
d8b24526ef68 ("drm/nouveau/kms/nv50-: use NVIDIA's headers for core caps_init()")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps
2020-08-06 23:01 [PATCH] drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps Lyude Paul
2020-08-13 16:25 ` Sasha Levin
2020-08-19 23:56 ` Sasha Levin
@ 2020-08-26 13:53 ` Sasha Levin
2 siblings, 0 replies; 4+ messages in thread
From: Sasha Levin @ 2020-08-26 13:53 UTC (permalink / raw)
To: Sasha Levin, Lyude Paul, nouveau; +Cc: stable, Ben Skeggs, stable
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: 4a2cb4181b07 ("drm/nouveau/kms/nv50-: Probe SOR and PIOR caps for DP interlacing support").
The bot has tested the following trees: v5.8.2.
v5.8.2: Failed to apply! Possible dependencies:
3c43c362b3a5 ("drm/nouveau/kms/nv50-: convert core caps_init() to new push macros")
5e691222eac6 ("drm/nouveau/kms/nv50-: convert core init() to new push macros")
d8b24526ef68 ("drm/nouveau/kms/nv50-: use NVIDIA's headers for core caps_init()")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks
Sasha
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-26 13:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-06 23:01 [PATCH] drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps Lyude Paul
2020-08-13 16:25 ` Sasha Levin
2020-08-19 23:56 ` Sasha Levin
2020-08-26 13:53 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).