public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm: add logging for RMFB ioctl

Browse source 
We already have logging for ADDFB2. Add some logging for RMFB as
well.

This can be handy when trying to find out why a CRTC gets magically
disabled.

v2: make log message more explicit, add log messages to
drm_framebuffer_remove (Daniel)

Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/EghsoRDcn1SJV0nxVqRCisPd7v0627yLZbBjn4A8Yg@cp3-web-048.plabs.ch
This commit is contained in:
Simon Ser 2021-07-26 07:49:06 +00:00
parent ca31fef11d
commit df26600ad3
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/gpu/drm/drm_framebuffer.c
View file

@ -404,6 +404,9 @@ static void drm_mode_rmfb_work_fn(struct work_struct *w)
struct drm_framebuffer *fb = struct drm_framebuffer *fb =
list_first_entry(&arg->fbs, typeof(*fb), filp_head); list_first_entry(&arg->fbs, typeof(*fb), filp_head);
drm_dbg_kms(fb->dev,
"Removing [FB:%d] from all active usage due to RMFB ioctl\n",
fb->base.id);
list_del_init(&fb->filp_head); list_del_init(&fb->filp_head);
drm_framebuffer_remove(fb); drm_framebuffer_remove(fb);
} }
@ -981,6 +984,10 @@ retry:
if (plane->state->fb != fb) if (plane->state->fb != fb)
continue; continue;
drm_dbg_kms(dev,
"Disabling [PLANE:%d:%s] because [FB:%d] is removed\n",
plane->base.id, plane->name, fb->base.id);
plane_state = drm_atomic_get_plane_state(state, plane); plane_state = drm_atomic_get_plane_state(state, plane);
if (IS_ERR(plane_state)) { if (IS_ERR(plane_state)) {
ret = PTR_ERR(plane_state); ret = PTR_ERR(plane_state);
@ -990,6 +997,11 @@ retry:
if (disable_crtcs && plane_state->crtc->primary == plane) { if (disable_crtcs && plane_state->crtc->primary == plane) {
struct drm_crtc_state *crtc_state; struct drm_crtc_state *crtc_state;
drm_dbg_kms(dev,
"Disabling [CRTC:%d:%s] because [FB:%d] is removed\n",
plane_state->crtc->base.id,
plane_state->crtc->name, fb->base.id);
crtc_state = drm_atomic_get_existing_crtc_state(state, plane_state->crtc); crtc_state = drm_atomic_get_existing_crtc_state(state, plane_state->crtc);
ret = drm_atomic_add_affected_connectors(state, plane_state->crtc); ret = drm_atomic_add_affected_connectors(state, plane_state->crtc);
@ -1052,6 +1064,10 @@ static void legacy_remove_fb(struct drm_framebuffer *fb)
/* remove from any CRTC */ /* remove from any CRTC */
drm_for_each_crtc(crtc, dev) { drm_for_each_crtc(crtc, dev) {
if (crtc->primary->fb == fb) { if (crtc->primary->fb == fb) {
drm_dbg_kms(dev,
"Disabling [CRTC:%d:%s] because [FB:%d] is removed\n",
crtc->base.id, crtc->name, fb->base.id);
/* should turn off the crtc */ /* should turn off the crtc */
if (drm_crtc_force_disable(crtc)) if (drm_crtc_force_disable(crtc))
DRM_ERROR("failed to reset crtc %p when fb was deleted\n", crtc); DRM_ERROR("failed to reset crtc %p when fb was deleted\n", crtc);
@ -1059,8 +1075,12 @@ static void legacy_remove_fb(struct drm_framebuffer *fb)
} }
drm_for_each_plane(plane, dev) { drm_for_each_plane(plane, dev) {
if (plane->fb == fb) if (plane->fb == fb) {
drm_dbg_kms(dev,
"Disabling [PLANE:%d:%s] because [FB:%d] is removed\n",
plane->base.id, plane->name, fb->base.id);
drm_plane_force_disable(plane); drm_plane_force_disable(plane);
}
} }
drm_modeset_unlock_all(dev); drm_modeset_unlock_all(dev);
} }