search for: nvkm_event

...2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/core/core/event.c b/drivers/gpu/drm/nouveau/core/core/event.c index ff2b434..760947e 100644 --- a/drivers/gpu/drm/nouveau/core/core/event.c +++ b/drivers/gpu/drm/nouveau/core/core/event.c @@ -26,7 +26,7 @@ void nvkm_event_put(struct nvkm_event *event, u32 types, int index) { - BUG_ON(!spin_is_locked(&event->refs_lock)); + assert_spin_locked(&event->refs_lock); while (types) { int type = __ffs(types); types &= ~(1 << type); if (--event->refs[index * event->types_nr + type] == 0)...

gcc with W=1 reports drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c:451:1: error: no previous prototype for ?gf100_fifo_nonstall_block? [-Werror=missing-prototypes] 451 | gf100_fifo_nonstall_block(struct nvkm_event *event, int type, int index) | ^~~~~~~~~~~~~~~~~~~~~~~~~ gf100_fifo_nonstall_block is only used in gf100.c, so it should be static Signed-off-by: Tom Rix <trix at redhat.com> --- drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) d...

...uts for this display. */ > > struct list_head outp; > > + > > + /** @conn: List of connectors for this display. */ > > struct list_head conn; > > > > + /** @hpd: An event that fires when something happens I guess. */ > > struct nvkm_event hpd; > > + > > + /** @vblank: An event that fires and has some relation to the vblank. */ > > struct nvkm_event vblank; > > > > + /** @client: The oproxy (?) client for this display. */ > > struct nvkm_oproxy *client; > > }; > &gt...

...> struct list_head outp; > > > + > > > + /** @conn: List of connectors for this display. */ > > > struct list_head conn; > > > > > > + /** @hpd: An event that fires when something happens I guess. */ > > > struct nvkm_event hpd; > > > + > > > + /** @vblank: An event that fires and has some relation to the vblank. */ > > > struct nvkm_event vblank; > > > > > > + /** @client: The oproxy (?) client for this display. */ > > > struct nvkm_oproxy *c...

...;>>> + > >>>> + /** @conn: List of connectors for this display. */ > >>>> struct list_head conn; > >>>> > >>>> + /** @hpd: An event that fires when something happens I guess. */ > >>>> struct nvkm_event hpd; > >>>> + > >>>> + /** @vblank: An event that fires and has some relation to the vblank. */ > >>>> struct nvkm_event vblank; > >>>> > >>>> + /** @client: The oproxy (?) client for this display. */ > &gt...

...truct list_head outp; >>>> + >>>> + /** @conn: List of connectors for this display. */ >>>> struct list_head conn; >>>> >>>> + /** @hpd: An event that fires when something happens I guess. */ >>>> struct nvkm_event hpd; >>>> + >>>> + /** @vblank: An event that fires and has some relation to the vblank. */ >>>> struct nvkm_event vblank; >>>> >>>> + /** @client: The oproxy (?) client for this display. */ >>>> struct...

...resources for this display. */ struct list_head ior; + + /** @outp: List of outputs for this display. */ struct list_head outp; + + /** @conn: List of connectors for this display. */ struct list_head conn; + /** @hpd: An event that fires when something happens I guess. */ struct nvkm_event hpd; + + /** @vblank: An event that fires and has some relation to the vblank. */ struct nvkm_event vblank; + /** @client: The oproxy (?) client for this display. */ struct nvkm_oproxy *client; }; diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_dr...

...+ > + /** @outp: List of outputs for this display. */ > struct list_head outp; > + > + /** @conn: List of connectors for this display. */ > struct list_head conn; > > + /** @hpd: An event that fires when something happens I guess. */ > struct nvkm_event hpd; > + > + /** @vblank: An event that fires and has some relation to the vblank. */ > struct nvkm_event vblank; > > + /** @client: The oproxy (?) client for this display. */ > struct nvkm_oproxy *client; > }; generally not a big fan of "int a; //...

Hi there, Resending these now that they've had some more polish and testing, and I heard that Ben's vacation is over :-) These patches work as a starting point for more explicit error mechanisms and better robustness. At the moment, when a job hangs or faults, it seems that nouveau doesn't quite know how to handle the situation and often results in a hang. Some of these situations

...08] Hardware name: NVIDIA Corporation. nFORCE-MCP/MS-6373, BIOS 6.00 PG 04/12/2002 [ 290.180008] Workqueue: events nouveau_pstate_work [nouveau] [ 290.180008] task: dd71c000 ti: dd720000 task.ti: dd720000 [ 290.180008] EIP: 0060:[<dea19e63>] EFLAGS: 00010046 CPU: 0 [ 290.180008] EIP is at nvkm_event_get+0x3/0x10 [nouveau] [ 290.180008] EAX: dc31eab4 EBX: 00000286 ECX: 00000000 EDX: 00000001 [ 290.180008] ESI: 00000000 EDI: ffffffff EBP: dd721ea8 ESP: dd721ea8 [ 290.180008] DS: 007b ES: 007b FS: 0000 GS: 00e0 SS: 0068 [ 290.180008] CR0: 8005003b CR2: b7742000 CR3: 1cf95000 CR4: 000007d0 [...

...ruct nvkm_object *object, u64 addr, u32 data) { struct nv50_disp_chan *chan = nv50_disp_chan(object); @@ -173,7 +173,7 @@ nv50_disp_chan_wr32(struct nvkm_object *object, u64 addr, u32 data) return 0; } -int +static int nv50_disp_chan_ntfy(struct nvkm_object *object, u32 type, struct nvkm_event **pevent) { @@ -189,7 +189,7 @@ nv50_disp_chan_ntfy(struct nvkm_object *object, u32 type, return -EINVAL; } -int +static int nv50_disp_chan_map(struct nvkm_object *object, u64 *addr, u32 *size) { struct nv50_disp_chan *chan = nv50_disp_chan(object); diff --git a/drivers/gpu/drm/nouveau/nv...

We get a few warnings when building kernel with W=1: drivers/gpu/drm/nouveau/nvkm/core/firmware.c:34:1: warning: no previous prototype for 'nvkm_firmware_get' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/core/firmware.c:58:1: warning: no previous prototype for 'nvkm_firmware_put' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr3.c:69:1: warning: no previous

...ruct nvkm_object *object, u64 addr, u32 data) { struct nv50_disp_chan *chan = nv50_disp_chan(object); @@ -173,7 +173,7 @@ nv50_disp_chan_wr32(struct nvkm_object *object, u64 addr, u32 data) return 0; } -int +static int nv50_disp_chan_ntfy(struct nvkm_object *object, u32 type, struct nvkm_event **pevent) { @@ -189,7 +189,7 @@ nv50_disp_chan_ntfy(struct nvkm_object *object, u32 type, return -EINVAL; } -int +static int nv50_disp_chan_map(struct nvkm_object *object, u64 *addr, u32 *size) { struct nv50_disp_chan *chan = nv50_disp_chan(object); diff --git a/drivers/gpu/drm/nouveau/nv...

Changes since last sent: * add a patch to set the device into DRM_SWITCH_POWER_CHANGING state (can be dropped actually, I thought I was needing it, came up with a different approach and forgot to delete it, doesn't hurt though) * expose information about runtime suspending to nvkm so that we can run the pcie workaround only on runtime suspend Karol Herbst (8): pci: disable ASPM

We get 2 warnings when building kernel with W=1: drivers/gpu/drm/nouveau/nvkm/core/firmware.c:34:1: warning: no previous prototype for 'nvkm_firmware_get' [-Wmissing-prototypes] drivers/gpu/drm/nouveau/nvkm/core/firmware.c:58:1: warning: no previous prototype for 'nvkm_firmware_put' [-Wmissing-prototypes] In fact, these functions are declared in

From: Jérôme Glisse <jglisse at redhat.com> (mm is cced just to allow exposure of device driver work without ccing a long list of peoples. I do not think there is anything usefull to discuss from mm point of view but i might be wrong, so just for the curious :)). git://people.freedesktop.org/~glisse/linux branch: nouveau-hmm-v00