diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-03-15 11:24:32 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-15 11:24:32 +0100 |
| commit | 8229c885fe361e521ac64de36b16011e54a30de0 (patch) | |
| tree | 572e5d34b16713ddef9e803308c6f72014aff01b /drivers/gpu/drm/gma500/cdv_device.c | |
| parent | drm: Add drm_mode_copy() (diff) | |
| parent | Linux 3.3-rc7 (diff) | |
| download | linux-8229c885fe361e521ac64de36b16011e54a30de0.tar.xz linux-8229c885fe361e521ac64de36b16011e54a30de0.zip | |
drm: Merge tag 'v3.3-rc7' into drm-core-next
Merge the fixes so far into core-next, needed to test
intel driver.
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/gpu/drm/gma500/cdv_device.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/cdv_device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c index eefcef6fa32f..a54cc738926a 100644 --- a/drivers/gpu/drm/gma500/cdv_device.c +++ b/drivers/gpu/drm/gma500/cdv_device.c @@ -452,6 +452,8 @@ static int cdv_chip_setup(struct drm_device *dev) cdv_get_core_freq(dev); gma_intel_opregion_init(dev); psb_intel_init_bios(dev); + REG_WRITE(PORT_HOTPLUG_EN, 0); + REG_WRITE(PORT_HOTPLUG_STAT, REG_READ(PORT_HOTPLUG_STAT)); return 0; } |