diff options
author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2009-03-04 19:36:02 +0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-03-27 15:12:14 -0700 |
commit | d2d9f23240a7ec29a496ee072ffdf69c4f6cdc76 (patch) | |
tree | d16bbef7d00ccf511d41fdc48832d88f4371e989 /drivers/gpu/drm/i915/i915_reg.h | |
parent | 02c5dd985ddc5407aa9cc7e0f4456ca63b294f16 (diff) |
drm/i915: TV mode_set sync up with 2D driver
Fix TV control save register for untouched bits, and color
knobs different definition for 945 and 965 chips.
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
-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 05b1894fa13..377cc588f5e 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -876,7 +876,7 @@ */ # define TV_ENC_C0_FIX (1 << 10) /** Bits that must be preserved by software */ -# define TV_CTL_SAVE ((3 << 8) | (3 << 6)) +# define TV_CTL_SAVE ((1 << 11) | (3 << 9) | (7 << 6) | 0xf) # define TV_FUSE_STATE_MASK (3 << 4) /** Read-only state that reports all features enabled */ # define TV_FUSE_STATE_ENABLED (0 << 4) |