diff options
| author | Dave Airlie | 2014-08-05 01:04:59 +0200 |
|---|---|---|
| committer | Dave Airlie | 2014-08-05 01:04:59 +0200 |
| commit | 5d42f82a9b8c5168d75cf59307cd271feca94464 (patch) | |
| tree | a7049189a2c814589b3ad7e6e776fb736f980967 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | Merge tag 'drm-intel-next-2014-07-25-merged' of git://anongit.freedesktop.org... (diff) | |
| parent | Linux 3.16 (diff) | |
| download | kernel-qcow2-linux-5d42f82a9b8c5168d75cf59307cd271feca94464.tar.gz kernel-qcow2-linux-5d42f82a9b8c5168d75cf59307cd271feca94464.tar.xz kernel-qcow2-linux-5d42f82a9b8c5168d75cf59307cd271feca94464.zip | |
Merge tag 'v3.16' into drm-next
Linux 3.16
backmerge requested by i915, nouveau and radeon authors
Conflicts:
drivers/gpu/drm/i915/i915_gem_render_state.c
drivers/gpu/drm/i915/intel_drv.h
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index b2837c5fccfc..8a475a6909c3 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -556,6 +556,9 @@ struct intel_dp { unsigned long last_power_cycle; unsigned long last_power_on; unsigned long last_backlight_off; + + struct notifier_block edp_notifier; + bool use_tps3; bool can_mst; /* this port supports mst */ bool is_mst; |