diff options
| author | Dave Airlie | 2009-06-24 08:20:19 +0200 |
|---|---|---|
| committer | Dave Airlie | 2009-06-24 08:20:19 +0200 |
| commit | 5b6345be1b41db5e70f90c3559c3b40c8abcde8b (patch) | |
| tree | fb72ccb8fa82d88c2a0e1c1a0301cfe8a67a3e6e /drivers/gpu/drm/i915/intel_dvo.c | |
| parent | drm/radeon: fix driver initialization order so radeon kms can be builtin (diff) | |
| parent | drm/i915: initialize fence registers to zero when loading GEM (diff) | |
| download | kernel-qcow2-linux-5b6345be1b41db5e70f90c3559c3b40c8abcde8b.tar.gz kernel-qcow2-linux-5b6345be1b41db5e70f90c3559c3b40c8abcde8b.tar.xz kernel-qcow2-linux-5b6345be1b41db5e70f90c3559c3b40c8abcde8b.zip | |
Merge remote branch 'origin/drm-intel-next' of ../drm-intel into drm-fixes
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dvo.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dvo.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index 1ee3007d6ec0..13bff20930e8 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c @@ -384,10 +384,9 @@ void intel_dvo_init(struct drm_device *dev) { struct intel_output *intel_output; struct intel_dvo_device *dvo; - struct intel_i2c_chan *i2cbus = NULL; + struct i2c_adapter *i2cbus = NULL; int ret = 0; int i; - int gpio_inited = 0; int encoder_type = DRM_MODE_ENCODER_NONE; intel_output = kzalloc (sizeof(struct intel_output), GFP_KERNEL); if (!intel_output) @@ -420,14 +419,11 @@ void intel_dvo_init(struct drm_device *dev) * It appears that everything is on GPIOE except for panels * on i830 laptops, which are on GPIOB (DVOA). */ - if (gpio_inited != gpio) { - if (i2cbus != NULL) - intel_i2c_destroy(i2cbus); - if (!(i2cbus = intel_i2c_create(dev, gpio, - gpio == GPIOB ? "DVOI2C_B" : "DVOI2C_E"))) { - continue; - } - gpio_inited = gpio; + if (i2cbus != NULL) + intel_i2c_destroy(i2cbus); + if (!(i2cbus = intel_i2c_create(dev, gpio, + gpio == GPIOB ? "DVOI2C_B" : "DVOI2C_E"))) { + continue; } if (dvo->dev_ops!= NULL) |