diff options
| author | Keith Packard <keithp@keithp.com> | 2011-10-20 14:10:43 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-20 14:10:43 -0700 |
| commit | 9a1f57808afd65b1d066d5e1907526a1e45215df (patch) | |
| tree | ad4f679ef5a143a2eac5292effddd7efcf6cbe3a /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 86a3073e480c522f12e5291a462f68f6ee30aee3 (diff) | |
| parent | 9fb526db979581841227e1ed4f75a5fbe853db4a (diff) | |
| download | talos-obmc-linux-9a1f57808afd65b1d066d5e1907526a1e45215df.tar.gz talos-obmc-linux-9a1f57808afd65b1d066d5e1907526a1e45215df.zip | |
Merge branch 'fix-pch-refclk' into foo
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index b2ac20287f3b..0e777fdf9c61 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -358,6 +358,7 @@ typedef struct drm_i915_private { unsigned int lvds_vbt:1; unsigned int int_crt_support:1; unsigned int lvds_use_ssc:1; + unsigned int display_clock_mode:1; int lvds_ssc_freq; struct { int rate; @@ -1301,6 +1302,7 @@ extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state); extern bool intel_fbc_enabled(struct drm_device *dev); extern void intel_disable_fbc(struct drm_device *dev); extern bool ironlake_set_drps(struct drm_device *dev, u8 val); +extern void ironlake_init_pch_refclk(struct drm_device *dev); extern void ironlake_enable_rc6(struct drm_device *dev); extern void gen6_set_rps(struct drm_device *dev, u8 val); extern void intel_detect_pch(struct drm_device *dev); |
