diff options
author | Kirill Smelkov <kirr@landau.phys.spbu.ru> | 2010-05-14 11:45:16 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-05-18 02:19:18 -0400 |
commit | 3da1f33e79a5922c1a31077e7b33aba1cec19b94 (patch) | |
tree | 5f8f2fa3b0de9b46721d75a2899d6cf2635660e1 /drivers/gpu/drm/drm_fb_helper.c | |
parent | bc35afdb182d4c48c889fe27ba7a5d7ea0c8194d (diff) |
drm: Prefix info printk about registering panic notifier with 'drm'
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.)
Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
-rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index b28e56382e86..5db4f47a0085 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c | |||
@@ -485,7 +485,7 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper) | |||
485 | if (!list_empty(&fb_helper->kernel_fb_list)) { | 485 | if (!list_empty(&fb_helper->kernel_fb_list)) { |
486 | list_del(&fb_helper->kernel_fb_list); | 486 | list_del(&fb_helper->kernel_fb_list); |
487 | if (list_empty(&kernel_fb_helper_list)) { | 487 | if (list_empty(&kernel_fb_helper_list)) { |
488 | printk(KERN_INFO "unregistered panic notifier\n"); | 488 | printk(KERN_INFO "drm: unregistered panic notifier\n"); |
489 | atomic_notifier_chain_unregister(&panic_notifier_list, | 489 | atomic_notifier_chain_unregister(&panic_notifier_list, |
490 | &paniced); | 490 | &paniced); |
491 | unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op); | 491 | unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op); |
@@ -859,7 +859,7 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, | |||
859 | /* Switch back to kernel console on panic */ | 859 | /* Switch back to kernel console on panic */ |
860 | /* multi card linked list maybe */ | 860 | /* multi card linked list maybe */ |
861 | if (list_empty(&kernel_fb_helper_list)) { | 861 | if (list_empty(&kernel_fb_helper_list)) { |
862 | printk(KERN_INFO "registered panic notifier\n"); | 862 | printk(KERN_INFO "drm: registered panic notifier\n"); |
863 | atomic_notifier_chain_register(&panic_notifier_list, | 863 | atomic_notifier_chain_register(&panic_notifier_list, |
864 | &paniced); | 864 | &paniced); |
865 | register_sysrq_key('v', &sysrq_drm_fb_helper_restore_op); | 865 | register_sysrq_key('v', &sysrq_drm_fb_helper_restore_op); |