diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-05-21 15:44:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-05-21 15:44:32 +1000 |
| commit | df696a6fe8b324344eae03127aff0a68d982e1fd (patch) | |
| tree | fb1805d16381acec5f8a25957bf48ffe7bcd9b38 /drivers/gpu/drm/nouveau/nouveau_encoder.h | |
| parent | 5d9b7e2d2db95549aeab129c95d588236137a4c8 (diff) | |
| parent | 893887ed75cacbfe1a855c63659838e0261d17e8 (diff) | |
Merge remote branch 'nouveau/for-airlied' into drm-next
* nouveau/for-airlied:
drm/nouveau: fix i2c-related init table handlers
drm/nouveau: support init table i2c device identifier 0x81
drm/nouveau: ensure we've parsed i2c table entry for INIT_*I2C* handlers
drm/nouveau: display error message for any failed init table opcode
drm/nouveau: fix init table handlers to return proper error codes
drm/nv50: support fractional feedback divider on newer chips
drm/nv50: fix monitor detection on certain chipsets
drm/nv50: store full dcb i2c entry from vbios
drm/nv50: fix suspend/resume with DP outputs
drm/nv50: output calculated crtc pll when debugging on
drm/nouveau: dump pll limits entries when debugging is on
drm/nouveau: bios parser fixes for eDP boards
drm/nouveau: fix a nouveau_bo dereference after it's been destroyed
drm/nv40: remove some completed ctxprog TODOs
drm/nv04: Implement missing nv04 PGRAPH methods in software.
drm/nouveau: Use 0x5f instead of 0x9f as imageblit on original NV10.
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_encoder.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_encoder.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h index 9f28b94e479..e1df8209cd0 100644 --- a/drivers/gpu/drm/nouveau/nouveau_encoder.h +++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h @@ -48,6 +48,8 @@ struct nouveau_encoder { union { struct { int mc_unknown; + uint32_t unk0; + uint32_t unk1; int dpcd_version; int link_nr; int link_bw; |