diff options
author | Thierry Reding <treding@nvidia.com> | 2014-06-27 11:19:24 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-07-07 21:31:28 -0400 |
commit | 10a231026574f9ec9761b6435394b8830b485e4e (patch) | |
tree | ae55c7173758db2778f02bb98954e7efceee5ec0 /drivers/gpu/drm/i915/intel_fbdev.c | |
parent | 3a4938799dec32783759b0c66ee3bb8c82dd9937 (diff) |
drm: Introduce drm_fb_helper_prepare()
To implement hotplug detection in a race-free manner, drivers must call
drm_kms_helper_poll_init() before hotplug events can be triggered. Such
events can be triggered right after any of the encoders or connectors
are initialized. At the same time, if the drm_fb_helper_hotplug_event()
helper is used by a driver, then the poll helper requires some parts of
the FB helper to be initialized to prevent a crash.
At the same time, drm_fb_helper_init() requires information that is not
necessarily available at such an early stage (number of CRTCs and
connectors), so it cannot be used yet.
Add a new helper, drm_fb_helper_prepare(), that initializes the bare
minimum needed to allow drm_kms_helper_poll_init() to execute and any
subsequent hotplug events to be processed properly.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbdev.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_fbdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index c942d13cd5cb..347d16220cd0 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c | |||
@@ -623,7 +623,8 @@ int intel_fbdev_init(struct drm_device *dev) | |||
623 | if (ifbdev == NULL) | 623 | if (ifbdev == NULL) |
624 | return -ENOMEM; | 624 | return -ENOMEM; |
625 | 625 | ||
626 | ifbdev->helper.funcs = &intel_fb_helper_funcs; | 626 | drm_fb_helper_prepare(dev, &ifbdev->helper, &intel_fb_helper_funcs); |
627 | |||
627 | if (!intel_fbdev_init_bios(dev, ifbdev)) | 628 | if (!intel_fbdev_init_bios(dev, ifbdev)) |
628 | ifbdev->preferred_bpp = 32; | 629 | ifbdev->preferred_bpp = 32; |
629 | 630 | ||