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/i915/intel_fb.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/i915/intel_fb.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 1c510da04d16..e67061249934 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c | |||
@@ -258,6 +258,9 @@ void intel_fbdev_initial_config(struct drm_device *dev) | |||
258 | { | 258 | { |
259 | drm_i915_private_t *dev_priv = dev->dev_private; | 259 | drm_i915_private_t *dev_priv = dev->dev_private; |
260 | 260 | ||
261 | /* disable all the possible outputs/crtcs before entering KMS mode */ | ||
262 | drm_helper_disable_unused_functions(dev); | ||
263 | |||
261 | /* Due to peculiar init order wrt to hpd handling this is separate. */ | 264 | /* Due to peculiar init order wrt to hpd handling this is separate. */ |
262 | drm_fb_helper_initial_config(&dev_priv->fbdev->helper, 32); | 265 | drm_fb_helper_initial_config(&dev_priv->fbdev->helper, 32); |
263 | } | 266 | } |