diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-14 15:17:41 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-15 09:44:29 +0100 |
| commit | 96ab4c70396e4e5a4d623bc95e86484682bef78f (patch) | |
| tree | b5f31a822c7b8c1872ce91ca2aff6506fcd26af9 /drivers/gpu/drm/i915/intel_opregion.c | |
| parent | 565ee3897f0cb1e9b09905747b3784e6605767e8 (diff) | |
| parent | 596cc11e7a4a89bf6c45f955402d0bd0c7d51f13 (diff) | |
| download | op-kernel-dev-96ab4c70396e4e5a4d623bc95e86484682bef78f.zip op-kernel-dev-96ab4c70396e4e5a4d623bc95e86484682bef78f.tar.gz | |
Merge branch 'bdw-fixes' into backlight-rework
Merge the bdw changes into the backlight rework branch so that we can
adapt the new code for bdw, too. This is a bit a mess, but doing this
another way would have delayed the merging of the backlight
refactoring. Mea culpa.
As discussed with Jani on irc only do bdw-specific callbacks for the
set/get methods and bake in the only other special-case into the pch
enable function.
Conflicts:
drivers/gpu/drm/i915/intel_panel.c
v2: Don't enable the PWM too early for bdw (Jani).
v3: Create new bdw_ functions for setup and enable - the rules change
sufficiently imo with the switch from controlling the pwm from the cpu
to controlling it completel from the pch to warrant this.
v4: Rip out unused pipe variable in bdw_enable_backlight (0-day
builder).
Tested-by: Ben Widawsky <ben@bwidawsk.net> (on bdw)
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_opregion.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_opregion.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index a0b5a99..6506df2 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -859,7 +859,9 @@ int intel_opregion_setup(struct drm_device *dev) return -ENOTSUPP; } +#ifdef CONFIG_ACPI INIT_WORK(&opregion->asle_work, asle_work); +#endif base = acpi_os_ioremap(asls, OPREGION_SIZE); if (!base) |
