diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-01-20 17:12:54 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-02-13 18:07:53 -0500 |
commit | 76a39dbfb2d1bc45219839e5a95d4ceaf6ca114f (patch) | |
tree | c6b6a620f88deb9956b6e9e92d1393d185e502c6 /drivers/gpu/drm/gma500/framebuffer.c | |
parent | 203cb50143029b2bc95736ce10f7defcf59aca44 (diff) |
drm/fb-helper: don't disable everything in initial_config
This should be done in the drivers for two reasons:
- it gets in the way of fastboot efforts
- it links the fb helpers with the crtc helpers instead of going
through the real interface vfuncs, forcing i915 to fake all the
->disable callbacks used by the crtc helper to avoid ugly Oopsen
v2: Resolve conflicts since drivers still call
drm_fb_helper_single_add_all_connectors.
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/gma500/framebuffer.c')
-rw-r--r-- | drivers/gpu/drm/gma500/framebuffer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index c1ef37e2efdf..fee3bf85af4a 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c | |||
@@ -616,6 +616,10 @@ int psb_fbdev_init(struct drm_device *dev) | |||
616 | INTELFB_CONN_LIMIT); | 616 | INTELFB_CONN_LIMIT); |
617 | 617 | ||
618 | drm_fb_helper_single_add_all_connectors(&fbdev->psb_fb_helper); | 618 | drm_fb_helper_single_add_all_connectors(&fbdev->psb_fb_helper); |
619 | |||
620 | /* disable all the possible outputs/crtcs before entering KMS mode */ | ||
621 | drm_helper_disable_unused_functions(dev); | ||
622 | |||
619 | drm_fb_helper_initial_config(&fbdev->psb_fb_helper, 32); | 623 | drm_fb_helper_initial_config(&fbdev->psb_fb_helper, 32); |
620 | return 0; | 624 | return 0; |
621 | } | 625 | } |