diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-04-21 22:18:32 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-04-27 17:51:59 +1000 |
| commit | e8e7a2b8ccfdae0d4cb6bd25824bbedcd42da316 (patch) | |
| tree | 1b2140075e01d32af330370307004b9b73a9d796 /drivers/gpu/drm/i915/intel_fb.c | |
| parent | 6565945b60922211c299968ba66a66617af32c9f (diff) | |
| download | blackbird-op-linux-e8e7a2b8ccfdae0d4cb6bd25824bbedcd42da316.tar.gz blackbird-op-linux-e8e7a2b8ccfdae0d4cb6bd25824bbedcd42da316.zip | |
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/intel_fb.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 512782728e51..ec49bae73382 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c @@ -264,3 +264,13 @@ void intel_fb_output_poll_changed(struct drm_device *dev) drm_i915_private_t *dev_priv = dev->dev_private; drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper); } + +void intel_fb_restore_mode(struct drm_device *dev) +{ + int ret; + drm_i915_private_t *dev_priv = dev->dev_private; + + ret = drm_fb_helper_restore_fbdev_mode(&dev_priv->fbdev->helper); + if (ret) + DRM_DEBUG("failed to restore crtc mode\n"); +} |
