diff options
| author | Dave Airlie <airlied@gmail.com> | 2013-08-29 19:02:57 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2013-08-29 19:02:57 -0400 |
| commit | 1dcff832c6dea64a53e1af6e7a78f652eb061f72 (patch) | |
| tree | bab3ccbedb5197532d34409543f7ec1b2e013170 | |
| parent | d8dfad3876e4386666b759da3c833d62fb8b2267 (diff) | |
| parent | 77fa4cbd5fa389e28419bbe8ac491b5fdd54840d (diff) | |
Merge tag 'drm-intel-fixes-2013-08-30' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Just a one-line patch to fix a black screen issue on rare ivb machines,
cc: stable. Normally I'd just shovel this into the -next pull request this
late in the -rc cycle, but Linus was making noises about not getting real
fixes which are cc: stable. So here we go ;-)
* tag 'drm-intel-fixes-2013-08-30' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: ivb: fix edp voltage swing reg val
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 53cddd985406..342f1f336168 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
| @@ -4440,7 +4440,7 @@ | |||
| 4440 | #define EDP_LINK_TRAIN_600MV_0DB_IVB (0x30 <<22) | 4440 | #define EDP_LINK_TRAIN_600MV_0DB_IVB (0x30 <<22) |
| 4441 | #define EDP_LINK_TRAIN_600MV_3_5DB_IVB (0x36 <<22) | 4441 | #define EDP_LINK_TRAIN_600MV_3_5DB_IVB (0x36 <<22) |
| 4442 | #define EDP_LINK_TRAIN_800MV_0DB_IVB (0x38 <<22) | 4442 | #define EDP_LINK_TRAIN_800MV_0DB_IVB (0x38 <<22) |
| 4443 | #define EDP_LINK_TRAIN_800MV_3_5DB_IVB (0x33 <<22) | 4443 | #define EDP_LINK_TRAIN_800MV_3_5DB_IVB (0x3e <<22) |
| 4444 | 4444 | ||
| 4445 | /* legacy values */ | 4445 | /* legacy values */ |
| 4446 | #define EDP_LINK_TRAIN_500MV_0DB_IVB (0x00 <<22) | 4446 | #define EDP_LINK_TRAIN_500MV_0DB_IVB (0x00 <<22) |