On Mon, Aug 10, 2015 at 01:48:53PM +0200, Thierry Reding wrote: > On Mon, Aug 10, 2015 at 01:34:08PM +0200, Daniel Vetter wrote: > > Instead of our own duplicated one. This fixes a bug in the driver > > unload code if DRM_FBDEV_EMULATION=n but DRM_I915_FBDEV=y because we > > try to unregister the nonexistent fbdev drm_framebuffer. > > > > Cc: Archit Taneja <architt@xxxxxxxxxxxxxx> > > Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > > Reported-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> > > --- > > drivers/gpu/drm/i915/Kconfig | 15 --------------- > > drivers/gpu/drm/i915/Makefile | 2 +- > > drivers/gpu/drm/i915/i915_debugfs.c | 2 +- > > drivers/gpu/drm/i915/i915_drv.h | 2 +- > > drivers/gpu/drm/i915/intel_display.c | 4 ++-- > > drivers/gpu/drm/i915/intel_dp_mst.c | 4 ++-- > > drivers/gpu/drm/i915/intel_drv.h | 2 +- > > 7 files changed, 8 insertions(+), 23 deletions(-) > > Isn't this going to cause some pain to users because .config may not > have this symbol yet? Arguably this is somewhat mitigated by the fact > that both symbols are "default y", but technically somebody could have > DRM_I915_FBDEV=n in their .config and after this change fbdev emulation > will be switched on again. > > I'm not sure how to upgrade more sanely, though, so perhaps this is just > a bullet that needs biting. There are other drivers two with their private FBDEV option (like msm) so I don't think we can do any sensible upgrade logic that just works. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel