drm/nouveau: print a message very early during suspend
Subsystems (3)
PATCH 1/2 drm/nouveau: print a message very early during suspend
- In case of suspend lockups it's nice to know it happened in nouveau.
Signed-off-by Maarten Maathuis <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_drv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/gpu/drm/nouveau/nouveau_drv.c +2 -0
@@ -154,9 +154,11 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)if (pm_state.event ==PM_EVENT_PRETHAW )return 0 ; +NV_INFO (dev,"Disabling fbcon acceleration...\n" ); fbdev_flags = dev_priv->fbdev_info->flags; dev_priv->fbdev_info->flags |=FBINFO_HWACCEL_DISABLED ; +NV_INFO (dev,"Unpinning framebuffer(s)...\n" );list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) {struct nouveau_framebuffer *nouveau_fb;
Signature · 1 line
1.7.0
A message that is not in the archive (sent off-list or not yet received): 1267468395-3390-1-git-send-email-madman2003-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH 2/2 drm/nv50: add a memory barrier to pushbuf submission
- pre-nv50 has one too (in WRITE_PUT).
Signed-off-by Maarten Maathuis <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_dma.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/gpu/drm/nouveau/nouveau_dma.c +5 -0
@@ -190,6 +190,11 @@ nv50_dma_push(struct nouveau_channel *chan, struct nouveau_bo *bo,nouveau_bo_wr32 (pb, ip++,upper_32_bits (offset) | length <<8 ); chan->dma.ib_put = (chan->dma.ib_put +1 ) & chan->dma.ib_max; + +DRM_MEMORYBARRIER (); +/* Flush writes. */ +nouveau_bo_rd32 (pb,0 ); +nvchan_wr32 (chan,0x8c , chan->dma.ib_put); chan->dma.ib_free--; }
Signature · 1 line
1.7.0