diff options
| author | Eric Anholt <eric@anholt.net> | 2009-01-02 13:33:00 -0800 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-01-07 11:49:47 +1000 |
| commit | 7d57382e65994ab7d01741373bd1c420370aed9f (patch) | |
| tree | b0c3c5f9657a360db60c45b4c4091b7c027a637f /drivers/gpu/drm/i915/intel_sdvo.c | |
| parent | 3f8bc370ac679a5fe5c098f30d3cf8e80f62a9f8 (diff) | |
| download | op-kernel-dev-7d57382e65994ab7d01741373bd1c420370aed9f.zip op-kernel-dev-7d57382e65994ab7d01741373bd1c420370aed9f.tar.gz | |
drm/i915: Add support for integrated HDMI on G4X hardware.
This is ported directly from the userland 2D driver code. The HDMI audio bits
aren't hooked up yet.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index fbbaa4f..4072154 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -978,7 +978,7 @@ static const struct drm_encoder_funcs intel_sdvo_enc_funcs = { }; -void intel_sdvo_init(struct drm_device *dev, int output_device) +bool intel_sdvo_init(struct drm_device *dev, int output_device) { struct drm_connector *connector; struct intel_output *intel_output; @@ -991,7 +991,7 @@ void intel_sdvo_init(struct drm_device *dev, int output_device) intel_output = kcalloc(sizeof(struct intel_output)+sizeof(struct intel_sdvo_priv), 1, GFP_KERNEL); if (!intel_output) { - return; + return false; } connector = &intel_output->base; @@ -1116,7 +1116,7 @@ void intel_sdvo_init(struct drm_device *dev, int output_device) intel_output->ddc_bus = i2cbus; - return; + return true; err_i2c: intel_i2c_destroy(intel_output->i2c_bus); @@ -1124,5 +1124,5 @@ err_connector: drm_connector_cleanup(connector); kfree(intel_output); - return; + return false; } |
