Skip to contentSkip to conversation

drm: Print device information again in debugfs

PATCH In review Daniel Vetter 6 participants 6 messages Oct 13, 2016 – Oct 14, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: Print device information again in debugfs

I was a bit over-eager in my cleanup in

commit 95c081c17f284de50eaca60d4d55643a64d39019

Author: Daniel Vetter <[email protected]>
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 <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Emil Velikov <[email protected]>
Cc Julia Lawall <[email protected]>
---
 drivers/gpu/drm/drm_info.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/drm_info.c +0 -4
index 1df2d33d0b40..ffb2ab389d1d 100644
@@ -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;
Signature · 6 lines
2.9.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Daniel Vetter

I was a bit over-eager in my cleanup in

commit 95c081c17f284de50eaca60d4d55643a64d39019

Author: Daniel Vetter <[email protected]>
Date:   Tue Jun 21 10:54:12 2016 +0200

drm: Move master pointer from drm_minor to drm_device

Noticed by Chris Wilson.

Quoted 7 lines
Fixes 95c081c17f28 ("drm: Move master pointer from drm_minor to drm_device")
Cc Chris Wilson <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Emil Velikov <[email protected]>
Cc Julia Lawall <[email protected]>
Quoted 29 lines
---
 drivers/gpu/drm/drm_info.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/drm_info.c +0 -5
index 1df2d33d0b40..ffb2ab389d1d 100644
@@ -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

Quoted 4 lines

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Tested-by on v1 1/1
#2 lore raw
In reply to Daniel Vetter
Quoted 10 lines · Daniel Vetter

I was a bit over-eager in my cleanup in

commit 95c081c17f284de50eaca60d4d55643a64d39019

Author: Daniel Vetter <[email protected]>
Date:   Tue Jun 21 10:54:12 2016 +0200

drm: Move master pointer from drm_minor to drm_device

Noticed by Chris Wilson.

Quoted 7 lines
Fixes 95c081c17f28 ("drm: Move master pointer from drm_minor to drm_device")
Cc Chris Wilson <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Emil Velikov <[email protected]>
Cc Julia Lawall <[email protected]>

-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw

✗ Fi.CI.BAT: warning for drm: Print device information again in debugfs

In reply to Daniel Vetter
== Series Details ==

== Series Details ==

Series: drm: Print device information again in debugfs
URL : https://patchwork.freedesktop.org/series/13731/
State : warning

== Summary ==

Series 13731v1 drm: Print device information again in debugfs
https://patchwork.freedesktop.org/api/1.0/series/13731/revisions/1/mbox/

Test drv_module_reload_basic:

                skip       -> PASS       (fi-skl-6770hq)
Test kms_pipe_crc_basic:
        Subgroup bad-source:
                pass       -> DMESG-WARN (fi-ilk-650)
        Subgroup read-crc-pipe-b-frame-sequence:
                dmesg-warn -> PASS       (fi-ilk-650)
Test vgem_basic:
        Subgroup unload:
                skip       -> PASS       (fi-skl-6770hq)
                skip       -> PASS       (fi-hsw-4770)
                pass       -> SKIP       (fi-bdw-5557u)
fi-bdw-5557u     total:246  pass:230  dwarn:0   dfail:0   fail:0   skip:16 
fi-bsw-n3050     total:246  pass:204  dwarn:0   dfail:0   fail:0   skip:42 
fi-bxt-t5700     total:246  pass:216  dwarn:0   dfail:0   fail:0   skip:30 
fi-byt-j1900     total:246  pass:213  dwarn:1   dfail:0   fail:1   skip:31 
fi-byt-n2820     total:246  pass:210  dwarn:0   dfail:0   fail:1   skip:35 
fi-hsw-4770      total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 
fi-hsw-4770r     total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 
fi-ilk-650       total:246  pass:183  dwarn:1   dfail:0   fail:2   skip:60 
fi-ivb-3520m     total:246  pass:221  dwarn:0   dfail:0   fail:0   skip:25 
fi-ivb-3770      total:246  pass:221  dwarn:0   dfail:0   fail:0   skip:25 
fi-kbl-7200u     total:246  pass:222  dwarn:0   dfail:0   fail:0   skip:24 
fi-skl-6260u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:246  pass:223  dwarn:0   dfail:0   fail:0   skip:23 
fi-skl-6700k     total:246  pass:221  dwarn:1   dfail:0   fail:0   skip:24 
fi-skl-6770hq    total:246  pass:230  dwarn:1   dfail:0   fail:1   skip:14 
fi-snb-2520m     total:246  pass:210  dwarn:0   dfail:0   fail:0   skip:36 
fi-snb-2600      total:246  pass:209  dwarn:0   dfail:0   fail:0   skip:37 

Results at /archive/results/CI_IGT_test/Patchwork_2707/

dbcf6fbb541e70fac7db669631958eab2e4e0d9c drm-intel-nightly: 2016y-10m-13d-15h-31m-19s UTC integration manifest 3d9d112 drm: Print device information again in debugfs

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#4 lore raw
In reply to Daniel Vetter
Quoted 10 lines · Daniel Vetter

I was a bit over-eager in my cleanup in

commit 95c081c17f284de50eaca60d4d55643a64d39019

Author: Daniel Vetter <[email protected]>
Date:   Tue Jun 21 10:54:12 2016 +0200

drm: Move master pointer from drm_minor to drm_device

Noticed by Chris Wilson.

Quoted 7 lines
Fixes 95c081c17f28 ("drm: Move master pointer from drm_minor to drm_device")
Cc Chris Wilson <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Emil Velikov <[email protected]>
Cc Julia Lawall <[email protected]>

Oops ;-) Worth updating/dropping the "Called when ..." comment above the function ? How about the rest of the file ?

Either way,

-Emil
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
In reply to Daniel Vetter
Quoted 11 lines · Daniel Vetter

I was a bit over-eager in my cleanup in

commit 95c081c17f284de50eaca60d4d55643a64d39019

Author: Daniel Vetter <[email protected]>
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 <[email protected]> # v4.8+
Quoted 32 lines
Cc Chris Wilson <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Emil Velikov <[email protected]>
Cc Julia Lawall <[email protected]>
---
 drivers/gpu/drm/drm_info.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/drm_info.c +0 -4
index 1df2d33d0b40..ffb2ab389d1d 100644
@@ -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;
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel