diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-04-21 21:18:32 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-04-27 07:51:59 (GMT) |
| commit | e8e7a2b8ccfdae0d4cb6bd25824bbedcd42da316 (patch) | |
| tree | 1b2140075e01d32af330370307004b9b73a9d796 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 6565945b60922211c299968ba66a66617af32c9f (diff) | |
| download | linux-fsl-qoriq-e8e7a2b8ccfdae0d4cb6bd25824bbedcd42da316.tar.xz | |
drm/i915: restore only the mode of this driver on lastclose (v2)
i915 calls the panic handler function on last close to reset the modes,
however this is a really bad idea for multi-gpu machines, esp shareable
gpus machines. So add a new entry point for the driver to just restore
its own fbcon mode.
v2: move code into fb helper, fix panic code to block mode change on
powered off GPUs.
[airlied: this hits drm core and I wrote it and it was reviewed on intel-gfx
so really I signed it off twice ;-).]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 7273037..12876f2 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -2207,7 +2207,7 @@ void i915_driver_lastclose(struct drm_device * dev) drm_i915_private_t *dev_priv = dev->dev_private; if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) { - drm_fb_helper_restore(); + intel_fb_restore_mode(dev); vga_switcheroo_process_delayed_switch(); return; } |