Merge tag 'drm-intel-fixes-2013-09-26' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Browse source

Just a few fixes for regressions and other serious stuff.

Two fix state tracking mismatches, together with an additional patch that
I've submitted to stable (somehow forgotten to tag it) we should have them
fixed now (I hope).

* tag 'drm-intel-fixes-2013-09-26' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: Fix up usage of SHRINK_STOP
  drm/i915: preserve pipe A quirk in i9xx_set_pipeconf
  drm/i915/tv: clear adjusted_mode.flags
  drm/i915/dp: increase i2c-over-aux retry interval on AUX DEFER
  drm/i915: Use a temporary va_list for two-pass string handling

...

This commit is contained in:

Dave Airlie 2013-09-28 08:46:44 +10:00

parent 4a10c2ac2f d32270460f

commit 36dec40ceb

5 changed files with 32 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

drivers/gpu/drm/i915/i915_gem.c

View file

6

drivers/gpu/drm/i915/i915_gpu_error.c

View file

4

drivers/gpu/drm/i915/intel_display.c

View file

13

drivers/gpu/drm/i915/intel_dp.c

View file

8

drivers/gpu/drm/i915/intel_tv.c

View file