diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-11-24 12:59:44 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 19:01:46 +1000 |
| commit | 52c4d767437b40b0cbc02d6a4480abb45ace64bb (patch) | |
| tree | 3def763a06171e5eb2acc3c13269f662093c1d2c /drivers/gpu/drm/nouveau/nv04_display.c | |
| parent | 47e5d5cb83d4b41168f4afa1ca32843d4a126cc8 (diff) | |
| download | op-kernel-dev-52c4d767437b40b0cbc02d6a4480abb45ace64bb.zip op-kernel-dev-52c4d767437b40b0cbc02d6a4480abb45ace64bb.tar.gz | |
drm/nouveau: move hpd enable/disable to common code
No idea why I didn't do this initially... NVD9 HPD is now enabled.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_display.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c index 15b748f..7047d37 100644 --- a/drivers/gpu/drm/nouveau/nv04_display.c +++ b/drivers/gpu/drm/nouveau/nv04_display.c @@ -31,7 +31,6 @@ #include "nouveau_hw.h" #include "nouveau_encoder.h" #include "nouveau_connector.h" -#include "nouveau_gpio.h" static void nv04_vblank_crtc0_isr(struct drm_device *); static void nv04_vblank_crtc1_isr(struct drm_device *); @@ -221,7 +220,6 @@ nv04_display_destroy(struct drm_device *dev) int nv04_display_init(struct drm_device *dev) { - struct drm_connector *connector; struct drm_encoder *encoder; struct drm_crtc *crtc; @@ -242,12 +240,6 @@ nv04_display_init(struct drm_device *dev) list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) crtc->funcs->restore(crtc); - /* enable hotplug interrupts */ - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { - struct nouveau_connector *conn = nouveau_connector(connector); - nouveau_gpio_irq(dev, 0, conn->hpd, 0xff, true); - } - return 0; } |
