| Message ID | 1392238922-28255-1-git-send-email-ajax@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi CC'ing Tomi. On Wed, Feb 12, 2014 at 10:02 PM, Adam Jackson <ajax@redhat.com> wrote: > Calling this "conflicting" just makes people think there's a problem > when there's not. > > Signed-off-by: Adam Jackson <ajax@redhat.com> > --- > drivers/video/fbmem.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c > index 7309ac7..b6d5008 100644 > --- a/drivers/video/fbmem.c > +++ b/drivers/video/fbmem.c > @@ -1596,8 +1596,7 @@ static int do_remove_conflicting_framebuffers(struct apertures_struct *a, > (primary && gen_aper && gen_aper->count && > gen_aper->ranges[0].base == VGA_FB_PHYS)) { > > - printk(KERN_INFO "fb: conflicting fb hw usage " > - "%s vs %s - removing generic driver\n", > + printk(KERN_INFO "fb: switching to %s from %s\n", > name, registered_fb[i]->fix.id); I like that. Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Thanks David > ret = do_unregister_framebuffer(registered_fb[i]); > if (ret) > -- > 1.8.5.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/02/14 23:02, Adam Jackson wrote: > Calling this "conflicting" just makes people think there's a problem > when there's not. > > Signed-off-by: Adam Jackson <ajax@redhat.com> > --- > drivers/video/fbmem.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c > index 7309ac7..b6d5008 100644 > --- a/drivers/video/fbmem.c > +++ b/drivers/video/fbmem.c > @@ -1596,8 +1596,7 @@ static int do_remove_conflicting_framebuffers(struct apertures_struct *a, > (primary && gen_aper && gen_aper->count && > gen_aper->ranges[0].base == VGA_FB_PHYS)) { > > - printk(KERN_INFO "fb: conflicting fb hw usage " > - "%s vs %s - removing generic driver\n", > + printk(KERN_INFO "fb: switching to %s from %s\n", > name, registered_fb[i]->fix.id); > ret = do_unregister_framebuffer(registered_fb[i]); > if (ret) > Thanks, queued for 3.15. Tomi
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 7309ac7..b6d5008 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -1596,8 +1596,7 @@ static int do_remove_conflicting_framebuffers(struct apertures_struct *a, (primary && gen_aper && gen_aper->count && gen_aper->ranges[0].base == VGA_FB_PHYS)) { - printk(KERN_INFO "fb: conflicting fb hw usage " - "%s vs %s - removing generic driver\n", + printk(KERN_INFO "fb: switching to %s from %s\n", name, registered_fb[i]->fix.id); ret = do_unregister_framebuffer(registered_fb[i]); if (ret)
Calling this "conflicting" just makes people think there's a problem when there's not. Signed-off-by: Adam Jackson <ajax@redhat.com> --- drivers/video/fbmem.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)