korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 20:48:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "i915: restore only the mode of this driver on lastclose"

Browse Source 
This reverts commit 0a0883c843.

this was in my tree by accident, I meant to rebase it out and
didn't realise in time.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2011-04-13 09:20:24 +10:00
parent d87dfdbfc9
commit 2582b6efce
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_dma.c
View File

@ -2207,7 +2207,7 @@ void i915_driver_lastclose(struct drm_device * dev)
drm_i915_private_t *dev_priv = dev->dev_private; drm_i915_private_t *dev_priv = dev->dev_private;
if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) { if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) {
intel_fb_restore_mode(dev); drm_fb_helper_restore();
vga_switcheroo_process_delayed_switch(); vga_switcheroo_process_delayed_switch();
return; return;
} }

1
drivers/gpu/drm/i915/intel_drv.h
View File

@ -338,5 +338,4 @@ extern int intel_overlay_attrs(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
extern void intel_fb_output_poll_changed(struct drm_device *dev); extern void intel_fb_output_poll_changed(struct drm_device *dev);
extern void intel_fb_restore_mode(struct drm_device *dev);
#endif /* __INTEL_DRV_H__ */ #endif /* __INTEL_DRV_H__ */

16
drivers/gpu/drm/i915/intel_fb.c
View File

@ -264,19 +264,3 @@ void intel_fb_output_poll_changed(struct drm_device *dev)
drm_i915_private_t *dev_priv = dev->dev_private; drm_i915_private_t *dev_priv = dev->dev_private;
drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper); drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper);
} }
void intel_fb_restore_mode(struct drm_device *dev)
{
drm_i915_private_t *dev_priv = dev->dev_private;
int ret, i;
if (!dev_priv->fbdev)
return;
for (i = 0; i < dev_priv->fbdev->helper.crtc_count; i++) {
struct drm_mode_set *mode_set = &dev_priv->fbdev->helper.crtc_info[i].mode_set;
ret = drm_crtc_helper_set_config(mode_set);
if (ret)
DRM_DEBUG("failed to restore crtc mode\n");
}
}