diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-04-20 07:16:04 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-20 07:16:04 +0400 |
| commit | 7fff400be6fbf64f10abca9939718aaf1d61c255 (patch) | |
| tree | 384118628f5c5aa2d74303cddd120de75308beea /drivers/gpu/drm/nouveau/nv50_display.c | |
| parent | 0bcb1d844ac638a4c4280f697d5bfac9791e9a70 (diff) | |
| parent | b1f201980eb4a7a59277a13cf18acdbb46167ad5 (diff) | |
| download | linux-7fff400be6fbf64f10abca9939718aaf1d61c255.tar.xz | |
Merge branch 'drm-fbdev-cleanup' into drm-core-next
* drm-fbdev-cleanup:
drm/fb: remove drm_fb_helper_setcolreg
drm/kms/fb: use slow work mechanism for normal hotplug also.
drm/kms/fb: add polling support for when nothing is connected.
drm/kms/fb: provide a 1024x768 fbcon if no outputs found.
drm/kms/fb: separate fbdev connector list from core drm connectors
drm/kms/fb: move to using fb helper crtc grouping instead of core crtc list
drm/fb: fix fbdev object model + cleanup properly.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 649db4c1b690..f9b304866e66 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -29,6 +29,7 @@ #include "nouveau_encoder.h" #include "nouveau_connector.h" #include "nouveau_fb.h" +#include "nouveau_fbcon.h" #include "drm_crtc_helper.h" static void @@ -945,6 +946,8 @@ nv50_display_irq_hotplug_bh(struct work_struct *work) nv_wr32(dev, 0xe054, nv_rd32(dev, 0xe054)); if (dev_priv->chipset >= 0x90) nv_wr32(dev, 0xe074, nv_rd32(dev, 0xe074)); + + nouveau_fbcon_hotplug(dev); } void |