diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-08-22 03:19:40 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-08-22 03:19:40 +0400 |
| commit | 85119c16b34526b2b3c33b01ac6d770aa4431434 (patch) | |
| tree | 6516fb3ac367a1296a21d6e0062b74985f8c0f45 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | e2be2cd8046748a006c4afa40959855fe4079274 (diff) | |
| parent | 1ee9ae3244c4789f3184c5123f3b2d7e405b3f4c (diff) | |
| download | linux-85119c16b34526b2b3c33b01ac6d770aa4431434.tar.xz | |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Daniel writes:
" Nothing too major:
- A few fixes around the edid handling from Jani, also fixing a regression
in 3.5 due to us using gmbus by default.
- Fixup hsw uncached pte flags.
- Fix suspend/resume crash when using hw contexts, from Ben.
- Try to tune gpu turbo a bit better, seems to help with some oddball
power regressions."
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: use hsw rps tuning values everywhere on gen6+
drm/i915: fall back to bit-banging if GMBUS fails in CRT EDID reads
drm/i915: extract connector update from intel_ddc_get_modes() for reuse
drm/i915: fix hsw uncached pte
drm/i915/contexts: fix list corruption
drm/i915: fix EDID memory leak in SDVO
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 132ab511b90c..cd54cf88a28f 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -342,6 +342,8 @@ struct intel_fbc_work { int interval; }; +int intel_connector_update_modes(struct drm_connector *connector, + struct edid *edid); int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter); extern void intel_attach_force_audio_property(struct drm_connector *connector); |