diff options
| author | Patrik Jakobsson | 2011-12-19 22:41:10 +0100 |
|---|---|---|
| committer | Dave Airlie | 2011-12-20 11:23:14 +0100 |
| commit | 5736995b473b8853d5ee048c7dfb9c1d20ebf0ea (patch) | |
| tree | 95b82546611ca39c8ae383201e9154175ccaf4df /drivers/gpu/drm/gma500/psb_drv.h | |
| parent | gma500: Add support for Intel GMBUS (diff) | |
| download | kernel-qcow2-linux-5736995b473b8853d5ee048c7dfb9c1d20ebf0ea.tar.gz kernel-qcow2-linux-5736995b473b8853d5ee048c7dfb9c1d20ebf0ea.tar.xz kernel-qcow2-linux-5736995b473b8853d5ee048c7dfb9c1d20ebf0ea.zip | |
gma500: Replace SDVO code with slightly modified version from i915
Our current SDVO implementation is not working properly, so replace it with
a modified version of the i915. Further testing and debugging is needed to make
sure we can handle the different SDVO setups and wiring.
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/psb_drv.h')
| -rw-r--r-- | drivers/gpu/drm/gma500/psb_drv.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h index 962c1b605c32..3e63087a6f5f 100644 --- a/drivers/gpu/drm/gma500/psb_drv.h +++ b/drivers/gpu/drm/gma500/psb_drv.h @@ -260,6 +260,16 @@ struct psb_intel_opregion { int enabled; }; +struct sdvo_device_mapping { + u8 initialized; + u8 dvo_port; + u8 slave_addr; + u8 dvo_wiring; + u8 i2c_pin; + u8 i2c_speed; + u8 ddc_pin; +}; + struct intel_gmbus { struct i2c_adapter adapter; struct i2c_adapter *force_bit; @@ -345,6 +355,15 @@ struct drm_psb_private { /* gmbus */ struct intel_gmbus *gmbus; + /* Used by SDVO */ + int crt_ddc_pin; + /* FIXME: The mappings should be parsed from bios but for now we can + pretend there are no mappings available */ + struct sdvo_device_mapping sdvo_mappings[2]; + u32 hotplug_supported_mask; + struct drm_property *broadcast_rgb_property; + struct drm_property *force_audio_property; + /* * LVDS info */ |