forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 131
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
drm/i915: force mode set at lid open time
Some laptop platforms will disable pipes and/or planes at lid close time and not restore them when the lid is opened again. So catch the lid event, and if the lid was opened, force a mode restore. Fixes fdo bug #21230. Acked-by: Matthew Garrett <[email protected]> Signed-off-by: Jesse Barnes <[email protected]> Signed-off-by: Eric Anholt <[email protected]>
- Loading branch information
1 parent
7e12715
commit c1c7af6
Showing
4 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,6 +24,8 @@ | |
* Eric Anholt <[email protected]> | ||
*/ | ||
|
||
#include <linux/module.h> | ||
#include <linux/input.h> | ||
#include <linux/i2c.h> | ||
#include <linux/kernel.h> | ||
#include "drmP.h" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,6 +27,7 @@ | |
* Jesse Barnes <[email protected]> | ||
*/ | ||
|
||
#include <acpi/button.h> | ||
#include <linux/dmi.h> | ||
#include <linux/i2c.h> | ||
#include "drmP.h" | ||
|
@@ -632,6 +633,19 @@ static int intel_lvds_get_modes(struct drm_connector *connector) | |
return 0; | ||
} | ||
|
||
static int intel_lid_notify(struct notifier_block *nb, unsigned long val, | ||
void *unused) | ||
{ | ||
struct drm_i915_private *dev_priv = | ||
container_of(nb, struct drm_i915_private, lid_notifier); | ||
struct drm_device *dev = dev_priv->dev; | ||
|
||
if (acpi_lid_open()) | ||
drm_helper_resume_force_mode(dev); | ||
|
||
return NOTIFY_OK; | ||
} | ||
|
||
/** | ||
* intel_lvds_destroy - unregister and free LVDS structures | ||
* @connector: connector to free | ||
|
@@ -641,10 +655,14 @@ static int intel_lvds_get_modes(struct drm_connector *connector) | |
*/ | ||
static void intel_lvds_destroy(struct drm_connector *connector) | ||
{ | ||
struct drm_device *dev = connector->dev; | ||
struct intel_output *intel_output = to_intel_output(connector); | ||
struct drm_i915_private *dev_priv = dev->dev_private; | ||
|
||
if (intel_output->ddc_bus) | ||
intel_i2c_destroy(intel_output->ddc_bus); | ||
if (dev_priv->lid_notifier.notifier_call) | ||
acpi_lid_notifier_unregister(&dev_priv->lid_notifier); | ||
drm_sysfs_connector_remove(connector); | ||
drm_connector_cleanup(connector); | ||
kfree(connector); | ||
|
@@ -1011,6 +1029,11 @@ void intel_lvds_init(struct drm_device *dev) | |
pwm |= PWM_PCH_ENABLE; | ||
I915_WRITE(BLC_PWM_PCH_CTL1, pwm); | ||
} | ||
dev_priv->lid_notifier.notifier_call = intel_lid_notify; | ||
if (acpi_lid_notifier_register(&dev_priv->lid_notifier)) { | ||
DRM_DEBUG("lid notifier registration failed\n"); | ||
dev_priv->lid_notifier.notifier_call = NULL; | ||
} | ||
drm_sysfs_connector_add(connector); | ||
return; | ||
|
||
|