git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_drv.c
diff --git
a/drivers/gpu/drm/i915/i915_drv.c
b/drivers/gpu/drm/i915/i915_drv.c
index
e3cb402
..
fc4b68a
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_drv.c
+++ b/
drivers/gpu/drm/i915/i915_drv.c
@@
-35,6
+35,7
@@
#include "drm_pciids.h"
#include <linux/console.h>
#include "drm_pciids.h"
#include <linux/console.h>
+#include "drm_crtc_helper.h"
static unsigned int i915_modeset = -1;
module_param_named(modeset, i915_modeset, int, 0400);
static unsigned int i915_modeset = -1;
module_param_named(modeset, i915_modeset, int, 0400);
@@
-57,8
+58,8
@@
static int i915_suspend(struct drm_device *dev, pm_message_t state)
struct drm_i915_private *dev_priv = dev->dev_private;
if (!dev || !dev_priv) {
struct drm_i915_private *dev_priv = dev->dev_private;
if (!dev || !dev_priv) {
-
printk(KERN_ERR
"dev: %p, dev_priv: %p\n", dev, dev_priv);
-
printk(KERN_ERR
"DRM not initialized, aborting suspend.\n");
+
DRM_ERROR(
"dev: %p, dev_priv: %p\n", dev, dev_priv);
+
DRM_ERROR(
"DRM not initialized, aborting suspend.\n");
return -ENODEV;
}
return -ENODEV;
}
@@
-115,6
+116,10
@@
static int i915_resume(struct drm_device *dev)
drm_irq_install(dev);
}
drm_irq_install(dev);
}
+ if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+ /* Resume the modeset for every activated CRTC */
+ drm_helper_resume_force_mode(dev);
+ }
return ret;
}
return ret;
}