All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] drm: add logging for RMFB ioctl
@ 2021-07-26  7:49 Simon Ser
  2021-07-26 20:04 ` Sam Ravnborg
  2021-07-27  9:39 ` Daniel Vetter
  0 siblings, 2 replies; 4+ messages in thread
From: Simon Ser @ 2021-07-26  7:49 UTC (permalink / raw)
  To: dri-devel; +Cc: Daniel Vetter

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>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/drm_framebuffer.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index 4d01464b6f95..d3d09aba9833 100644
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -404,6 +404,9 @@ static void drm_mode_rmfb_work_fn(struct work_struct *w)
 		struct drm_framebuffer *fb =
 			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);
 		drm_framebuffer_remove(fb);
 	}
@@ -981,6 +984,10 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
 		if (plane->state->fb != fb)
 			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);
 		if (IS_ERR(plane_state)) {
 			ret = PTR_ERR(plane_state);
@@ -990,6 +997,11 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
 		if (disable_crtcs && plane_state->crtc->primary == plane) {
 			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);
 
 			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 */
 	drm_for_each_crtc(crtc, dev) {
 		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 */
 			if (drm_crtc_force_disable(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) {
-		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_modeset_unlock_all(dev);
 }
-- 
2.32.0



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] drm: add logging for RMFB ioctl
  2021-07-26  7:49 [PATCH v2] drm: add logging for RMFB ioctl Simon Ser
@ 2021-07-26 20:04 ` Sam Ravnborg
  2021-07-27  8:03   ` Pekka Paalanen
  2021-07-27  9:39 ` Daniel Vetter
  1 sibling, 1 reply; 4+ messages in thread
From: Sam Ravnborg @ 2021-07-26 20:04 UTC (permalink / raw)
  To: Simon Ser; +Cc: Daniel Vetter, dri-devel

Hi Simon,

On Mon, Jul 26, 2021 at 07:49:06AM +0000, Simon Ser wrote:
> 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>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>

Looks like some very useful debugging logging.

Acked-by: Sam Ravnborg <sam@ravnborg.org>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] drm: add logging for RMFB ioctl
  2021-07-26 20:04 ` Sam Ravnborg
@ 2021-07-27  8:03   ` Pekka Paalanen
  0 siblings, 0 replies; 4+ messages in thread
From: Pekka Paalanen @ 2021-07-27  8:03 UTC (permalink / raw)
  To: Simon Ser; +Cc: Daniel Vetter, Sam Ravnborg, dri-devel

[-- Attachment #1: Type: text/plain, Size: 738 bytes --]

On Mon, 26 Jul 2021 22:04:21 +0200
Sam Ravnborg <sam@ravnborg.org> wrote:

> Hi Simon,
> 
> On Mon, Jul 26, 2021 at 07:49:06AM +0000, Simon Ser wrote:
> > 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>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>  
> 
> Looks like some very useful debugging logging.
> 
> Acked-by: Sam Ravnborg <sam@ravnborg.org>

Yes indeed!

Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com>


Thanks,
pq

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] drm: add logging for RMFB ioctl
  2021-07-26  7:49 [PATCH v2] drm: add logging for RMFB ioctl Simon Ser
  2021-07-26 20:04 ` Sam Ravnborg
@ 2021-07-27  9:39 ` Daniel Vetter
  1 sibling, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2021-07-27  9:39 UTC (permalink / raw)
  To: Simon Ser; +Cc: Daniel Vetter, dri-devel

On Mon, Jul 26, 2021 at 07:49:06AM +0000, Simon Ser wrote:
> 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>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  drivers/gpu/drm/drm_framebuffer.c | 22 +++++++++++++++++++++-
>  1 file changed, 21 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
> index 4d01464b6f95..d3d09aba9833 100644
> --- a/drivers/gpu/drm/drm_framebuffer.c
> +++ b/drivers/gpu/drm/drm_framebuffer.c
> @@ -404,6 +404,9 @@ static void drm_mode_rmfb_work_fn(struct work_struct *w)
>  		struct drm_framebuffer *fb =
>  			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);
>  		drm_framebuffer_remove(fb);
>  	}
> @@ -981,6 +984,10 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
>  		if (plane->state->fb != fb)
>  			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);
>  		if (IS_ERR(plane_state)) {
>  			ret = PTR_ERR(plane_state);
> @@ -990,6 +997,11 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
>  		if (disable_crtcs && plane_state->crtc->primary == plane) {
>  			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);
>  
>  			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 */
>  	drm_for_each_crtc(crtc, dev) {
>  		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 */
>  			if (drm_crtc_force_disable(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) {
> -		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_modeset_unlock_all(dev);
>  }
> -- 
> 2.32.0
> 
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-07-27  9:39 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-26  7:49 [PATCH v2] drm: add logging for RMFB ioctl Simon Ser
2021-07-26 20:04 ` Sam Ravnborg
2021-07-27  8:03   ` Pekka Paalanen
2021-07-27  9:39 ` Daniel Vetter

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.