drm: Print device information again in debugfs

Commit Message

Daniel Vetter Oct. 13, 2016, 2:13 p.m. UTC

I was a bit over-eager in my cleanup in

commit 95c081c17f284de50eaca60d4d55643a64d39019
Author: Daniel Vetter <[e-mail]>
Date:   Tue Jun 21 10:54:12 2016 +0200

    drm: Move master pointer from drm_minor to drm_device

Noticed by Chris Wilson.

Fixes: 95c081c17f28 ("drm: Move master pointer from drm_minor to drm_device")
Cc: Chris Wilson <[e-mail]>
Cc: Chris Wilson <[e-mail]>
Cc: Daniel Vetter <[e-mail]>
Cc: Emil Velikov <[e-mail]>
Cc: Julia Lawall <[e-mail]>
Signed-off-by: Daniel Vetter <[e-mail]>
---
 drivers/gpu/drm/drm_info.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Alex Deucher Oct. 13, 2016, 2:29 p.m. UTC | #1

On Thu, Oct 13, 2016 at 10:13 AM, Daniel Vetter <[e-mail]> wrote:
> I was a bit over-eager in my cleanup in
>
> commit 95c081c17f284de50eaca60d4d55643a64d39019
> Author: Daniel Vetter <[e-mail]>
> Date:   Tue Jun 21 10:54:12 2016 +0200
>
>     drm: Move master pointer from drm_minor to drm_device
>
> Noticed by Chris Wilson.
>
> Fixes: 95c081c17f28 ("drm: Move master pointer from drm_minor to drm_device")
> Cc: Chris Wilson <[e-mail]>
> Cc: Chris Wilson <[e-mail]>
> Cc: Daniel Vetter <[e-mail]>
> Cc: Emil Velikov <[e-mail]>
> Cc: Julia Lawall <[e-mail]>
> Signed-off-by: Daniel Vetter <[e-mail]>

Reviewed-by: Alex Deucher <[e-mail]>

> ---
>  drivers/gpu/drm/drm_info.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
> index 1df2d33d0b40..ffb2ab389d1d 100644
> --- a/drivers/gpu/drm/drm_info.c
> +++ b/drivers/gpu/drm/drm_info.c
> @@ -54,9 +54,6 @@ int drm_name_info(struct seq_file *m, void *data)
>
>         mutex_lock(&dev->master_mutex);
>         master = dev->master;
> -       if (!master)
> -               goto out_unlock;
> -
>         seq_printf(m, "%s", dev->driver->name);
>         if (dev->dev)
>                 seq_printf(m, " dev=%s", dev_name(dev->dev));
> @@ -65,7 +62,6 @@ int drm_name_info(struct seq_file *m, void *data)
>         if (dev->unique)
>                 seq_printf(m, " unique=%s", dev->unique);
>         seq_printf(m, "\n");
> -out_unlock:
>         mutex_unlock(&dev->master_mutex);
>
>         return 0;
> --
> 2.9.3
>
> _______________________________________________
> dri-devel mailing list
> [e-mail]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Chris Wilson Oct. 13, 2016, 3:02 p.m. UTC | #2

On Thu, Oct 13, 2016 at 04:13:44PM +0200, Daniel Vetter wrote:
> I was a bit over-eager in my cleanup in
> 
> commit 95c081c17f284de50eaca60d4d55643a64d39019
> Author: Daniel Vetter <[e-mail]>
> Date:   Tue Jun 21 10:54:12 2016 +0200
> 
>     drm: Move master pointer from drm_minor to drm_device
> 
> Noticed by Chris Wilson.
> 
> Fixes: 95c081c17f28 ("drm: Move master pointer from drm_minor to drm_device")
> Cc: Chris Wilson <[e-mail]>
> Cc: Chris Wilson <[e-mail]>
> Cc: Daniel Vetter <[e-mail]>
> Cc: Emil Velikov <[e-mail]>
> Cc: Julia Lawall <[e-mail]>
> Signed-off-by: Daniel Vetter <[e-mail]>
Tested-by: Chris Wilson <[e-mail]>
-Chris

Emil Velikov Oct. 13, 2016, 5:33 p.m. UTC | #3

On 13 October 2016 at 15:13, Daniel Vetter <[e-mail]> wrote:
> I was a bit over-eager in my cleanup in
>
> commit 95c081c17f284de50eaca60d4d55643a64d39019
> Author: Daniel Vetter <[e-mail]>
> Date:   Tue Jun 21 10:54:12 2016 +0200
>
>     drm: Move master pointer from drm_minor to drm_device
>
> Noticed by Chris Wilson.
>
> Fixes: 95c081c17f28 ("drm: Move master pointer from drm_minor to drm_device")
> Cc: Chris Wilson <[e-mail]>
> Cc: Chris Wilson <[e-mail]>
> Cc: Daniel Vetter <[e-mail]>
> Cc: Emil Velikov <[e-mail]>
> Cc: Julia Lawall <[e-mail]>
> Signed-off-by: Daniel Vetter <[e-mail]>
Oops ;-) Worth updating/dropping the "Called when ..." comment above
the function ? How about the rest of the file ?

Either way,
Reviewed-by: Emil Velikov <[e-mail]>

-Emil

Jani Nikula Oct. 14, 2016, 10:12 a.m. UTC | #4

On Thu, 13 Oct 2016, Daniel Vetter <[e-mail]> wrote:
> I was a bit over-eager in my cleanup in
>
> commit 95c081c17f284de50eaca60d4d55643a64d39019
> Author: Daniel Vetter <[e-mail]>
> Date:   Tue Jun 21 10:54:12 2016 +0200
>
>     drm: Move master pointer from drm_minor to drm_device
>
> Noticed by Chris Wilson.
>
> Fixes: 95c081c17f28 ("drm: Move master pointer from drm_minor to drm_device")

Cc: <[e-mail]> # v4.8+

> Cc: Chris Wilson <[e-mail]>
> Cc: Chris Wilson <[e-mail]>
> Cc: Daniel Vetter <[e-mail]>
> Cc: Emil Velikov <[e-mail]>
> Cc: Julia Lawall <[e-mail]>
> Signed-off-by: Daniel Vetter <[e-mail]>
> ---
>  drivers/gpu/drm/drm_info.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
> index 1df2d33d0b40..ffb2ab389d1d 100644
> --- a/drivers/gpu/drm/drm_info.c
> +++ b/drivers/gpu/drm/drm_info.c
> @@ -54,9 +54,6 @@ int drm_name_info(struct seq_file *m, void *data)
>  
>  	mutex_lock(&dev->master_mutex);
>  	master = dev->master;
> -	if (!master)
> -		goto out_unlock;
> -
>  	seq_printf(m, "%s", dev->driver->name);
>  	if (dev->dev)
>  		seq_printf(m, " dev=%s", dev_name(dev->dev));
> @@ -65,7 +62,6 @@ int drm_name_info(struct seq_file *m, void *data)
>  	if (dev->unique)
>  		seq_printf(m, " unique=%s", dev->unique);
>  	seq_printf(m, "\n");
> -out_unlock:
>  	mutex_unlock(&dev->master_mutex);
>  
>  	return 0;

Patch

diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
index 1df2d33d0b40..ffb2ab389d1d 100644
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c
@@ -54,9 +54,6 @@  int drm_name_info(struct seq_file *m, void *data)
 
 	mutex_lock(&dev->master_mutex);
 	master = dev->master;
-	if (!master)
-		goto out_unlock;
-
 	seq_printf(m, "%s", dev->driver->name);
 	if (dev->dev)
 		seq_printf(m, " dev=%s", dev_name(dev->dev));
@@ -65,7 +62,6 @@  int drm_name_info(struct seq_file *m, void *data)
 	if (dev->unique)
 		seq_printf(m, " unique=%s", dev->unique);
 	seq_printf(m, "\n");
-out_unlock:
 	mutex_unlock(&dev->master_mutex);
 
 	return 0;