drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps
Subsystems (4)
Lyude Paul
maintainerPATCH v5 1/2 drm/nouveau/kms/nv50-: Program notifier offset before requesting disp caps
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, and also perform an update afterwards to prevent racing with the GPU when reading capabilities.
v2:
* Don't just program the DMA notifier offset, make sure to actually perform an update
v3:
* Don't call UPDATE()
* Actually read the correct notifier fields, as apparently the CAPABILITIES_DONE field lives in a different location than the main NV_DISP_CORE_NOTIFIER_1 field. As well, 907d+ use a different CAPABILITIES_DONE field then pre-907d cards.
v4:
* Don't forget to check the return value of core507d_read_caps() v5:
* Get rid of NV50_DISP_CAPS_NTFY[14], use NV50_DISP_CORE_NTFY
* Disable notifier after calling GetCapabilities()
--- drivers/gpu/drm/nouveau/dispnv50/core.h | 2 + drivers/gpu/drm/nouveau/dispnv50/core507d.c | 41 ++++++++++++++++++- drivers/gpu/drm/nouveau/dispnv50/core907d.c | 36 +++++++++++++++- drivers/gpu/drm/nouveau/dispnv50/core917d.c | 2 +- .../drm/nouveau/include/nvhw/class/cl507d.h | 5 ++- .../drm/nouveau/include/nvhw/class/cl907d.h | 4 ++ 6 files changed, 85 insertions(+), 5 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/core.h +2 -0
@@ -44,6 +44,7 @@ int core507d_new_(const struct nv50_core_func *, struct nouveau_drm *, s32, struct nv50_core **); int core507d_init(struct nv50_core *);void core507d_ntfy_init (struct nouveau_bo *,u32 ); +int core507d_read_caps (struct nv50_disp *disp);int core507d_caps_init (struct nouveau_drm *,struct nv50_disp *);int core507d_ntfy_wait_done (struct nouveau_bo *,u32 ,struct nvif_device *);int core507d_update (struct nv50_core *,u32 *,bool );
@@ -55,6 +56,7 @@ extern const struct nv50_outp_func pior507d;int core827d_new (struct nouveau_drm *,s32 ,struct nv50_core **);int core907d_new (struct nouveau_drm *,s32 ,struct nv50_core **); +int core907d_caps_init (struct nouveau_drm *drm,struct nv50_disp *disp);extern const struct nv50_outp_func dac907d;extern const struct nv50_outp_func sor907d;
drivers/gpu/drm/nouveau/dispnv50/core507d.c +39 -2
57 lines not on this page · raw message
drivers/gpu/drm/nouveau/dispnv50/core907d.c +35 -1
@@ -22,11 +22,45 @@#include "core.h" #include "head.h" +#include <nvif/push507c.h> +#include <nvif/timer.h> + +#include <nvhw/class/cl907d.h> + +#include "nouveau_bo.h" + +int +core907d_caps_init (struct nouveau_drm *drm,struct nv50_disp *disp) +{ +struct nv50_core *core = disp->core; +struct nouveau_bo *bo = disp->sync; +s64 time; +int ret; + +NVBO_WR32 (bo,NV50_DISP_CORE_NTFY ,NV907D_CORE_NOTIFIER_3 ,CAPABILITIES_4 , +NVDEF (NV907D_CORE_NOTIFIER_3 ,CAPABILITIES_4 ,DONE , FALSE)); + + ret =core507d_read_caps (disp); +if (ret <0 ) +return ret; + + time =nvif_msec (core->chan.base.device,2000ULL , + if (NVBO_TD32(bo, NV50_DISP_CORE_NTFY, + NV907D_CORE_NOTIFIER_3, CAPABILITIES_4, DONE, ==, TRUE)) + break; + usleep_range(1, 2); + ); +if (time <0 ) +NV_ERROR (drm,"core caps notifier timeout\n" ); + +return 0 ; +} +static const struct nv50_core_func core907d = { .init = core507d_init, .ntfy_init = core507d_ntfy_init, - .caps_init = core507d_caps_init, + .caps_init = core907d_caps_init, .ntfy_wait_done = core507d_ntfy_wait_done, .update = core507d_update, .head = &head907d,
drivers/gpu/drm/nouveau/dispnv50/core917d.c +1 -1
@@ -26,7 +26,7 @@ static const struct nv50_core_func core917d = { .init = core507d_init, .ntfy_init = core507d_ntfy_init, - .caps_init = core507d_caps_init, + .caps_init = core907d_caps_init, .ntfy_wait_done = core507d_ntfy_wait_done, .update = core507d_update, .head = &head917d,
drivers/gpu/drm/nouveau/include/nvhw/class/cl507d.h +4 -1
@@ -32,7 +32,10 @@#define NV_DISP_CORE_NOTIFIER_1_COMPLETION_0_DONE_TRUE 0x00000001#define NV_DISP_CORE_NOTIFIER_1_COMPLETION_0_R0 15:1#define NV_DISP_CORE_NOTIFIER_1_COMPLETION_0_TIMESTAMP 29:16 - +#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1 0x00000001 +#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1_DONE 0:0 +#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1_DONE_FALSE 0x00000000 +#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1_DONE_TRUE 0x00000001// class methods #define NV507D_UPDATE (0x00000080)
drivers/gpu/drm/nouveau/include/nvhw/class/cl907d.h +4 -0
@@ -24,6 +24,10 @@#ifndef _cl907d_h_#define _cl907d_h_ +#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_4 0x00000004 +#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_4_DONE 0:0 +#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_4_DONE_FALSE 0x00000000 +#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_4_DONE_TRUE 0x00000001#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_CAP_SOR0_20 0x00000014#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_CAP_SOR0_20_SINGLE_LVDS18 0:0#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_CAP_SOR0_20_SINGLE_LVDS18_FALSE 0x00000000
Signature · 1 line
2.26.2
Lyude Paul
maintainerPATCH v5 2/2 drm/nouveau/kms/nv50-: Log SOR/PIOR caps
Since I'm almost certain I didn't get capability checking right for pre-volta chipsets, let's start logging any caps we find to make things like this obvious in the future.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/nouveau/dispnv50/disp.c +10 -0
@@ -303,6 +303,14 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp,/****************************************************************************** * Output path helpers *****************************************************************************/ +static void +nv50_outp_dump_caps (struct nouveau_drm *drm, +struct nouveau_encoder *outp) +{ +NV_DEBUG (drm,"%s caps: dp_interlace=%d\n" , + outp->base.base.name, outp->caps.dp_interlace); +} +static void nv50_outp_release (struct nouveau_encoder *nv_encoder) {
@@ -1819,6 +1827,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)drm_connector_attach_encoder (connector, encoder); disp->core->func->sor->get_caps (disp, nv_encoder,ffs (dcbe->or) -1 ); +nv50_outp_dump_caps (drm, nv_encoder);if (dcbe->type ==DCB_OUTPUT_DP ) { struct nvkm_i2c_aux *aux =
@@ -1989,6 +1998,7 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)drm_connector_attach_encoder (connector, encoder); disp->core->func->pior->get_caps (disp, nv_encoder,ffs (dcbe->or) -1 ); +nv50_outp_dump_caps (drm, nv_encoder);return 0 ; }
Signature · 1 line
2.26.2
A message that is not in the archive (sent off-list or not yet received): 20200904202813.1260202-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
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.7.
v5.8.7: Failed to apply! Possible dependencies:
0a96099691c8 ("drm/nouveau/kms/nv50-: implement proper push buffer control logic")
0bc8ffe09771 ("drm/nouveau/kms/nv50-: Move hard-coded object handles into header")
12885ecbfe62 ("drm/nouveau/kms/nvd9-: Add CRC support")
203f6eaf4182 ("drm/nouveau/kms/nv50-: convert core update() to new push macros")
2853ccf09255 ("drm/nouveau/kms/nv50-: wrap existing command submission in nvif_push interface")
344c2e5a4796 ("drm/nouveau/kms/nv50-: use NVIDIA's headers for core or_ctrl()")
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")
9ec5e8204053 ("drm/nouveau/kms/nv50-: convert core or_ctrl() to new push macros")
b11d8ca151d0 ("drm/nouveau/kms/nv50-: use NVIDIA's headers for core init()")
b505935e56b2 ("drm/nouveau/kms/nv50-: convert core wndw_owner() to new push macros")
d8b24526ef68 ("drm/nouveau/kms/nv50-: use NVIDIA's headers for core caps_init()")
e79c9a0ba5e7 ("drm/nouveau/nvif: give every mem object a human-readable identifier")NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
Signature · 2 lines
Thanks Sasha
Quoted 28 lines · Lyude Paul
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
0000508c0000102bThis 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, and also perform an update afterwards to prevent racing with the GPU when reading capabilities.v2:
* Don't just program the DMA notifier offset, make sure to actually perform an update
v3:
* Don't callUPDATE()
* Actually read the correct notifier fields, as apparently theCAPABILITIES_DONEfield lives in a different location than the mainNV_DISP_CORE_NOTIFIER_1field. As well, 907d+ use a differentCAPABILITIES_DONEfield then pre-907d cards.
v4:
* Don't forget to check the return value ofcore507d_read_caps()v5:
* Get rid of NV50_DISP_CAPS_NTFY[14], useNV50_DISP_CORE_NTFY
* Disable notifier after callingGetCapabilities()
Quoted 3 lines
Signed-off-by Lyude Paul <[email protected]>Fixes 4a2cb4181b07 ("drm/nouveau/kms/nv50-: Probe SOR and PIOR caps for DP interlacing support")Cc <[email protected]> # v5.8+
Thanks Lyude, looks good, and merged!
Ben.
Quoted 193 lines
--- drivers/gpu/drm/nouveau/dispnv50/core.h | 2 + drivers/gpu/drm/nouveau/dispnv50/core507d.c | 41 ++++++++++++++++++- drivers/gpu/drm/nouveau/dispnv50/core907d.c | 36 +++++++++++++++- drivers/gpu/drm/nouveau/dispnv50/core917d.c | 2 +- .../drm/nouveau/include/nvhw/class/cl507d.h | 5 ++- .../drm/nouveau/include/nvhw/class/cl907d.h | 4 ++ 6 files changed, 85 insertions(+), 5 deletions(-)drivers/gpu/drm/nouveau/dispnv50/core.h +2
-0@@ -44,6 +44,7 @@ int core507d_new_(const struct nv50_core_func *, struct nouveau_drm *, s32, struct nv50_core **); int core507d_init(struct nv50_core *);void core507d_ntfy_init (struct nouveau_bo *,u32 ); +int core507d_read_caps (struct nv50_disp *disp);int core507d_caps_init (struct nouveau_drm *,struct nv50_disp *);int core507d_ntfy_wait_done (struct nouveau_bo *,u32 ,struct nvif_device *);int core507d_update (struct nv50_core *,u32 *,bool );@@ -55,6 +56,7 @@ extern const struct nv50_outp_func pior507d;int core827d_new (struct nouveau_drm *,s32 ,struct nv50_core **);int core907d_new (struct nouveau_drm *,s32 ,struct nv50_core **); +int core907d_caps_init (struct nouveau_drm *drm,struct nv50_disp *disp);extern const struct nv50_outp_func dac907d;extern const struct nv50_outp_func sor907d;drivers/gpu/drm/nouveau/dispnv50/core507d.c +39
-2@@ -78,18 +78,55 @@ core507d_ntfy_init(struct nouveau_bo *bo, u32 offset) }int -core507d_caps_init (struct nouveau_drm *drm,struct nv50_disp *disp) +core507d_read_caps (struct nv50_disp *disp) {struct nvif_push *push = disp->core->chan.push;int ret; -if ((ret =PUSH_WAIT (push,2 ))) + ret =PUSH_WAIT (push,6 ); +if (ret)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 ); + +PUSH_MTHD (push,NV507D ,SET_NOTIFIER_CONTROL , +NVDEF (NV507D ,SET_NOTIFIER_CONTROL ,NOTIFY ,DISABLE )); +return PUSH_KICK (push); } +int +core507d_caps_init (struct nouveau_drm *drm,struct nv50_disp *disp) +{ +struct nv50_core *core = disp->core; +struct nouveau_bo *bo = disp->sync; +s64 time; +int ret; + +NVBO_WR32 (bo,NV50_DISP_CORE_NTFY ,NV_DISP_CORE_NOTIFIER_1 ,CAPABILITIES_1 , +NVDEF (NV_DISP_CORE_NOTIFIER_1 ,CAPABILITIES_1 ,DONE , FALSE)); + + ret =core507d_read_caps (disp); +if (ret <0 ) +return ret; + + time =nvif_msec (core->chan.base.device,2000ULL , + if (NVBO_TD32(bo, NV50_DISP_CORE_NTFY, + NV_DISP_CORE_NOTIFIER_1, CAPABILITIES_1, DONE, ==, TRUE)) + break; + usleep_range(1, 2); + ); +if (time <0 ) +NV_ERROR (drm,"core caps notifier timeout\n" ); + +return 0 ; +} +int core507d_init (struct nv50_core *core) {drivers/gpu/drm/nouveau/dispnv50/core907d.c +35
-1@@ -22,11 +22,45 @@#include "core.h" #include "head.h" +#include <nvif/push507c.h> +#include <nvif/timer.h> + +#include <nvhw/class/cl907d.h> + +#include "nouveau_bo.h" + +int +core907d_caps_init (struct nouveau_drm *drm,struct nv50_disp *disp) +{ +struct nv50_core *core = disp->core; +struct nouveau_bo *bo = disp->sync; +s64 time; +int ret; + +NVBO_WR32 (bo,NV50_DISP_CORE_NTFY ,NV907D_CORE_NOTIFIER_3 ,CAPABILITIES_4 , +NVDEF (NV907D_CORE_NOTIFIER_3 ,CAPABILITIES_4 ,DONE , FALSE)); + + ret =core507d_read_caps (disp); +if (ret <0 ) +return ret; + + time =nvif_msec (core->chan.base.device,2000ULL , + if (NVBO_TD32(bo, NV50_DISP_CORE_NTFY, + NV907D_CORE_NOTIFIER_3, CAPABILITIES_4, DONE, ==, TRUE)) + break; + usleep_range(1, 2); + ); +if (time <0 ) +NV_ERROR (drm,"core caps notifier timeout\n" ); + +return 0 ; +} +static const struct nv50_core_func core907d = { .init = core507d_init, .ntfy_init = core507d_ntfy_init, - .caps_init = core507d_caps_init, + .caps_init = core907d_caps_init, .ntfy_wait_done = core507d_ntfy_wait_done, .update = core507d_update, .head = &head907d,drivers/gpu/drm/nouveau/dispnv50/core917d.c +1
-1@@ -26,7 +26,7 @@ static const struct nv50_core_func core917d = { .init = core507d_init, .ntfy_init = core507d_ntfy_init, - .caps_init = core507d_caps_init, + .caps_init = core907d_caps_init, .ntfy_wait_done = core507d_ntfy_wait_done, .update = core507d_update, .head = &head917d,drivers/gpu/drm/nouveau/include/nvhw/class/cl507d.h +4
-1@@ -32,7 +32,10 @@#define NV_DISP_CORE_NOTIFIER_1_COMPLETION_0_DONE_TRUE 0x00000001#define NV_DISP_CORE_NOTIFIER_1_COMPLETION_0_R0 15:1#define NV_DISP_CORE_NOTIFIER_1_COMPLETION_0_TIMESTAMP 29:16 - +#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1 0x00000001 +#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1_DONE 0:0 +#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1_DONE_FALSE 0x00000000 +#define NV_DISP_CORE_NOTIFIER_1_CAPABILITIES_1_DONE_TRUE 0x00000001// class methods #define NV507D_UPDATE (0x00000080)drivers/gpu/drm/nouveau/include/nvhw/class/cl907d.h +4
-1@@ -24,6 +24,10 @@#ifndef _cl907d_h_#define _cl907d_h_ +#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_4 0x00000004 +#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_4_DONE 0:0 +#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_4_DONE_FALSE 0x00000000 +#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_4_DONE_TRUE 0x00000001#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_CAP_SOR0_20 0x00000014#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_CAP_SOR0_20_SINGLE_LVDS18 0:0#define NV907D_CORE_NOTIFIER_3_CAPABILITIES_CAP_SOR0_20_SINGLE_LVDS18_FALSE 0x00000000 --2.26.2
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau