| Message ID | 1301953194-6706-1-git-send-email-mjg@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Apr 5, 2011 at 7:39 AM, Matthew Garrett <mjg@redhat.com> wrote: > It's expected that efifb will conflict with a native driver, so the > handover message should be informational rather than an error. > > Signed-off-by: Matthew Garrett <mjg@redhat.com> Acked-by: Dave Airlie <airlied@redhat.com> Dave. > --- > drivers/video/fbmem.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c > index e2bf953..e0c2284 100644 > --- a/drivers/video/fbmem.c > +++ b/drivers/video/fbmem.c > @@ -1507,7 +1507,7 @@ void remove_conflicting_framebuffers(struct apertures_struct *a, > (primary && gen_aper && gen_aper->count && > gen_aper->ranges[0].base == VGA_FB_PHYS)) { > > - printk(KERN_ERR "fb: conflicting fb hw usage " > + printk(KERN_INFO "fb: conflicting fb hw usage " > "%s vs %s - removing generic driver\n", > name, registered_fb[i]->fix.id); > unregister_framebuffer(registered_fb[i]); > -- > 1.7.4.1 > > -- > 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 Wed, Apr 06, 2011 at 10:50:04AM +1000, Dave Airlie wrote: > On Tue, Apr 5, 2011 at 7:39 AM, Matthew Garrett <mjg@redhat.com> wrote: > > It's expected that efifb will conflict with a native driver, so the > > handover message should be informational rather than an error. > > > > Signed-off-by: Matthew Garrett <mjg@redhat.com> > > Acked-by: Dave Airlie <airlied@redhat.com> > Applied, thanks. -- 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
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index e2bf953..e0c2284 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -1507,7 +1507,7 @@ void remove_conflicting_framebuffers(struct apertures_struct *a, (primary && gen_aper && gen_aper->count && gen_aper->ranges[0].base == VGA_FB_PHYS)) { - printk(KERN_ERR "fb: conflicting fb hw usage " + printk(KERN_INFO "fb: conflicting fb hw usage " "%s vs %s - removing generic driver\n", name, registered_fb[i]->fix.id); unregister_framebuffer(registered_fb[i]);
It's expected that efifb will conflict with a native driver, so the handover message should be informational rather than an error. Signed-off-by: Matthew Garrett <mjg@redhat.com> --- drivers/video/fbmem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)