diff options
author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2009-03-24 02:02:42 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-04-01 18:22:04 -0400 |
commit | e642c6f1d2ebea41b8d7ccc132734b74b5821034 (patch) | |
tree | 1caddb0e17d06a4016572a0e417fb2055af37bc7 | |
parent | 171a9e960ec820765e3b8e9dd1e3d8d81233d459 (diff) |
drm/i915: Fix SDVO CREATE_PREFERRED_INPUT_TIMING command
This brings fix commit acde0ef683 from 2D driver.
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo_regs.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 31cd9b835aa4..ea311c7241c2 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -589,9 +589,12 @@ intel_sdvo_create_preferred_input_timing(struct intel_output *output, | |||
589 | struct intel_sdvo_preferred_input_timing_args args; | 589 | struct intel_sdvo_preferred_input_timing_args args; |
590 | uint8_t status; | 590 | uint8_t status; |
591 | 591 | ||
592 | memset(&args, 0, sizeof(args)); | ||
592 | args.clock = clock; | 593 | args.clock = clock; |
593 | args.width = width; | 594 | args.width = width; |
594 | args.height = height; | 595 | args.height = height; |
596 | args.interlace = 0; | ||
597 | args.scaled = 0; | ||
595 | intel_sdvo_write_cmd(output, SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING, | 598 | intel_sdvo_write_cmd(output, SDVO_CMD_CREATE_PREFERRED_INPUT_TIMING, |
596 | &args, sizeof(args)); | 599 | &args, sizeof(args)); |
597 | status = intel_sdvo_read_response(output, NULL, 0); | 600 | status = intel_sdvo_read_response(output, NULL, 0); |
diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h index 1117b9c151a6..193938b7d7f9 100644 --- a/drivers/gpu/drm/i915/intel_sdvo_regs.h +++ b/drivers/gpu/drm/i915/intel_sdvo_regs.h | |||
@@ -100,6 +100,9 @@ struct intel_sdvo_preferred_input_timing_args { | |||
100 | u16 clock; | 100 | u16 clock; |
101 | u16 width; | 101 | u16 width; |
102 | u16 height; | 102 | u16 height; |
103 | u8 interlace:1; | ||
104 | u8 scaled:1; | ||
105 | u8 pad:6; | ||
103 | } __attribute__((packed)); | 106 | } __attribute__((packed)); |
104 | 107 | ||
105 | /* I2C registers for SDVO */ | 108 | /* I2C registers for SDVO */ |