leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/kms/nv50-: Use drm_dbg_kms() in crc.c

Browse Source 
Cc: Martin Peres <martin.peres@free.fr>
Cc: Jeremy Cline <jcline@redhat.com>
Cc: Simon Ser <contact@emersion.fr>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Simon Ser <contact@emersion.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Link: https://gitlab.freedesktop.org/drm/nouveau/-/merge_requests/10
This commit is contained in:
Lyude Paul
2021-01-18 20:48:45 -05:00
committed by Karol Herbst
parent 94bdb32aa2
commit bc4c7fa02b
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/nouveau/dispnv50/crc.c
View File

@@ -84,7 +84,8 @@ static void nv50_crc_ctx_flip_work(struct kthread_work *base)
struct nv50_crc *crc = container_of(work, struct nv50_crc, flip_work); struct nv50_crc *crc = container_of(work, struct nv50_crc, flip_work);
struct nv50_head *head = container_of(crc, struct nv50_head, crc); struct nv50_head *head = container_of(crc, struct nv50_head, crc);
struct drm_crtc *crtc = &head->base.base; struct drm_crtc *crtc = &head->base.base;
struct nv50_disp *disp = nv50_disp(crtc->dev); struct drm_device *dev = crtc->dev;
struct nv50_disp *disp = nv50_disp(dev);
u8 new_idx = crc->ctx_idx ^ 1; u8 new_idx = crc->ctx_idx ^ 1;
/* /*
@@ -92,18 +93,15 @@ static void nv50_crc_ctx_flip_work(struct kthread_work *base)
* try again for the next vblank if we don't grab the lock * try again for the next vblank if we don't grab the lock
*/ */
if (!mutex_trylock(&disp->mutex)) { if (!mutex_trylock(&disp->mutex)) {
DRM_DEV_DEBUG_KMS(crtc->dev->dev, drm_dbg_kms(dev, "Lock contended, delaying CRC ctx flip for %s\n", crtc->name);
"Lock contended, delaying CRC ctx flip for head-%d\n",
head->base.index);
drm_vblank_work_schedule(work, drm_vblank_work_schedule(work,
drm_crtc_vblank_count(crtc) + 1, drm_crtc_vblank_count(crtc) + 1,
true); true);
return; return;
} }
DRM_DEV_DEBUG_KMS(crtc->dev->dev, drm_dbg_kms(dev, "Flipping notifier ctx for %s (%d -> %d)\n",
"Flipping notifier ctx for head %d (%d -> %d)\n", crtc->name, crc->ctx_idx, new_idx);
drm_crtc_index(crtc), crc->ctx_idx, new_idx);
nv50_crc_program_ctx(head, NULL); nv50_crc_program_ctx(head, NULL);
nv50_crc_program_ctx(head, &crc->ctx[new_idx]); nv50_crc_program_ctx(head, &crc->ctx[new_idx]);
@@ -189,7 +187,7 @@ void nv50_crc_handle_vblank(struct nv50_head *head)
* updates back-to-back without waiting, we'll just be * updates back-to-back without waiting, we'll just be
* optimistic and assume we always miss exactly one frame. * optimistic and assume we always miss exactly one frame.
*/ */
DRM_DEV_DEBUG_KMS(head->base.base.dev->dev, drm_dbg_kms(head->base.base.dev,
"Notifier ctx flip for head-%d finished, lost CRC for frame %llu\n", "Notifier ctx flip for head-%d finished, lost CRC for frame %llu\n",
head->base.index, crc->frame); head->base.index, crc->frame);
crc->frame++; crc->frame++;