diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2009-11-18 02:15:02 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-11-30 19:10:56 -0500 |
| commit | 29874f44fbcbc24b231b42c9956f8f9de9407231 (patch) | |
| tree | 22532ad33c5f265bc728e5e21a8175ce0f81f126 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | d271817baecbccb47da0d9f28c285a0dae8a06b7 (diff) | |
drm/i915: fix gpio register detection logic for BIOS without VBT
if no VBT is present, crt_ddc_bus will be left at 0, and cause us
to use that for the GPIO register offset. That's never a valid register
offset, so let the "undefined" value be 0 instead of -1.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
[anholt: clarified the commit message a bit]
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index dcc061cdc9a5..13ede75ff6ce 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -266,7 +266,7 @@ typedef struct drm_i915_private { | |||
| 266 | 266 | ||
| 267 | struct notifier_block lid_notifier; | 267 | struct notifier_block lid_notifier; |
| 268 | 268 | ||
| 269 | int crt_ddc_bus; /* -1 = unknown, else GPIO to use for CRT DDC */ | 269 | int crt_ddc_bus; /* 0 = unknown, else GPIO to use for CRT DDC */ |
| 270 | struct drm_i915_fence_reg fence_regs[16]; /* assume 965 */ | 270 | struct drm_i915_fence_reg fence_regs[16]; /* assume 965 */ |
| 271 | int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */ | 271 | int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */ |
| 272 | int num_fence_regs; /* 8 on pre-965, 16 otherwise */ | 272 | int num_fence_regs; /* 8 on pre-965, 16 otherwise */ |