31,7 → 31,6 |
#include <linux/dmi.h> |
#include <linux/i2c.h> |
#include <linux/slab.h> |
#include <linux/vga_switcheroo.h> |
#include <drm/drmP.h> |
#include <drm/drm_atomic_helper.h> |
#include <drm/drm_crtc.h> |
123,10 → 122,6 |
|
pipe_config->base.adjusted_mode.flags |= flags; |
|
if (INTEL_INFO(dev)->gen < 5) |
pipe_config->gmch_pfit.lvds_border_bits = |
tmp & LVDS_BORDER_ENABLE; |
|
/* gen2/3 store dither state in pfit control, needs to match */ |
if (INTEL_INFO(dev)->gen < 4) { |
tmp = I915_READ(PFIT_CONTROL); |
483,8 → 478,11 |
* and as part of the cleanup in the hw state restore we also redisable |
* the vga plane. |
*/ |
if (!HAS_PCH_SPLIT(dev)) |
if (!HAS_PCH_SPLIT(dev)) { |
drm_modeset_lock_all(dev); |
intel_display_resume(dev); |
drm_modeset_unlock_all(dev); |
} |
|
dev_priv->modeset_restore = MODESET_DONE; |
|