Skip to contentSkip to conversation

drm: registering panic notifier cosmetics

PATCH New Kirill Smelkov 1 participant 5 messages May 14, 2010

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

cover drm: registering panic notifier cosmetics

Just some minor tweaks from casual user. Please apply & thanks.

Kirill Smelkov (2):
drm/radeon: "unregistered panic notifier" printk is redundant
drm: Prefix info printk about registering panic notifier with 'drm'

 drivers/gpu/drm/drm_fb_helper.c    |    4 ++--
 drivers/gpu/drm/radeon/radeon_fb.c |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
#1 lore raw

PATCH 1/2 drm/radeon: "unregistered panic notifier" printk is redundant

Because drm_fb_helper_free() prints the same.

This redundant printk seems to be a forgotten leftover after 785b93ef (drm/kms: move driver specific fb common code to helper functions (v2)) -- let's remove it.

---
 drivers/gpu/drm/radeon/radeon_fb.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_fb.c +0 -2
index 9ac57a0..2a161d8 100644
@@ -365,8 +365,6 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
 		framebuffer_release(info);
 	}
 
-	printk(KERN_INFO "unregistered panic notifier\n");
-
 	return 0;
 }
 EXPORT_SYMBOL(radeonfb_remove);
Signature · 1 line
1.7.1.87.gcc8c60.dirty
#2 lore raw

PATCH 1/2 drm/radeon: "unregistered panic notifier" printk is redundant

In reply to Kirill Smelkov

Because drm_fb_helper_free() prints the same.

This redundant printk seems to be a forgotten leftover after 785b93ef (drm/kms: move driver specific fb common code to helper functions (v2)) -- let's remove it.

---
 drivers/gpu/drm/radeon/radeon_fb.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_fb.c +0 -2
index 9ac57a0..2a161d8 100644
@@ -365,8 +365,6 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
 		framebuffer_release(info);
 	}
 
-	printk(KERN_INFO "unregistered panic notifier\n");
-
 	return 0;
 }
 EXPORT_SYMBOL(radeonfb_remove);
Signature · 1 line
1.7.1.87.gcc8c60.dirty
#3 lore raw

PATCH 2/2 drm: Prefix info printk about registering panic notifier with 'drm'

In reply to Kirill Smelkov

Recently I've studied my system dmesg and seen this:

<lots of stuff before>

1 [    0.478416] ACPI: Battery Slot [C1B4] (battery present)
2 [    0.478648] ACPI: Battery Slot [C1B3] (battery absent)
3 [    0.906678] [drm] initialized overlay support
4 [    1.762304] Console: switching to colour frame buffer device 128x48
5 [    1.765211] fb0: inteldrmfb frame buffer device
6 [    1.765242] registered panic notifier
7 [    1.765272] [drm] Initialized i915 1.6.0 20080730 for 0000:00:02.0 on minor 0
8 [    1.765372] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled

<lots of stuff after>

and it was not evident who registered that panic notifier on line 6.

I'd bought it as some low-level stuff needed by kernel itself, but the time was inappropriate -- too late for such things.

So I had to study sources to see it was drm who was registering switch-to-fb on panic.

Let's avoid possible confusion and mark this message as going from drm subsystem.

(I'm a bit unsure whether to use '[drm]:' or 'drm:' -- the rest of the
kernel just uses 'topic:', and even in drm_fb_helper.c we use 'fb%d:' without [] brackets. Either way is ok with me.)

---
 drivers/gpu/drm/drm_fb_helper.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_fb_helper.c +2 -2
index 288ea2f..90f1331 100644
@@ -912,7 +912,7 @@ int drm_fb_helper_single_fb_probe(struct drm_device *dev,
 	/* Switch back to kernel console on panic */
 	/* multi card linked list maybe */
 	if (list_empty(&kernel_fb_helper_list)) {
-		printk(KERN_INFO "registered panic notifier\n");
+		printk(KERN_INFO "drm: registered panic notifier\n");
 		atomic_notifier_chain_register(&panic_notifier_list,
 					       &paniced);
 		register_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
@@ -926,7 +926,7 @@ void drm_fb_helper_free(struct drm_fb_helper *helper)
 {
 	list_del(&helper->kernel_fb_list);
 	if (list_empty(&kernel_fb_helper_list)) {
-		printk(KERN_INFO "unregistered panic notifier\n");
+		printk(KERN_INFO "drm: unregistered panic notifier\n");
 		atomic_notifier_chain_unregister(&panic_notifier_list,
 						 &paniced);
 		unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
Signature · 1 line
1.7.1.87.gcc8c60.dirty
#4 lore raw

PATCH 2/2 drm: Prefix info printk about registering panic notifier with 'drm'

In reply to Kirill Smelkov

Recently I've studied my system dmesg and seen this:

<lots of stuff before>

1 [    0.478416] ACPI: Battery Slot [C1B4] (battery present)
2 [    0.478648] ACPI: Battery Slot [C1B3] (battery absent)
3 [    0.906678] [drm] initialized overlay support
4 [    1.762304] Console: switching to colour frame buffer device 128x48
5 [    1.765211] fb0: inteldrmfb frame buffer device
6 [    1.765242] registered panic notifier
7 [    1.765272] [drm] Initialized i915 1.6.0 20080730 for 0000:00:02.0 on minor 0
8 [    1.765372] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled

<lots of stuff after>

and it was not evident who registered that panic notifier on line 6.

I'd bought it as some low-level stuff needed by kernel itself, but the time was inappropriate -- too late for such things.

So I had to study sources to see it was drm who was registering switch-to-fb on panic.

Let's avoid possible confusion and mark this message as going from drm subsystem.

(I'm a bit unsure whether to use '[drm]:' or 'drm:' -- the rest of the
kernel just uses 'topic:', and even in drm_fb_helper.c we use 'fb%d:' without [] brackets. Either way is ok with me.)

---
 drivers/gpu/drm/drm_fb_helper.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_fb_helper.c +2 -2
index 288ea2f..90f1331 100644
@@ -912,7 +912,7 @@ int drm_fb_helper_single_fb_probe(struct drm_device *dev,
 	/* Switch back to kernel console on panic */
 	/* multi card linked list maybe */
 	if (list_empty(&kernel_fb_helper_list)) {
-		printk(KERN_INFO "registered panic notifier\n");
+		printk(KERN_INFO "drm: registered panic notifier\n");
 		atomic_notifier_chain_register(&panic_notifier_list,
 					       &paniced);
 		register_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
@@ -926,7 +926,7 @@ void drm_fb_helper_free(struct drm_fb_helper *helper)
 {
 	list_del(&helper->kernel_fb_list);
 	if (list_empty(&kernel_fb_helper_list)) {
-		printk(KERN_INFO "unregistered panic notifier\n");
+		printk(KERN_INFO "drm: unregistered panic notifier\n");
 		atomic_notifier_chain_unregister(&panic_notifier_list,
 						 &paniced);
 		unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
Signature · 1 line
1.7.1.87.gcc8c60.dirty