diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-07-25 19:28:25 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-25 21:43:57 -0400 |
commit | ee2e013131dcf6427334663662dbe760ccdba735 (patch) | |
tree | 2533973de31a05dbb06465a124087334842c6f37 /drivers/gpu/drm/nouveau/nv50_display.c | |
parent | bf563a6b7c7efb283dd4ddf12cc90c2898195c16 (diff) |
drm/nouveau: introduce gpio engine
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 13a44898563..0ab86872211 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c | |||
@@ -193,6 +193,7 @@ nv50_display_init(struct drm_device *dev) | |||
193 | { | 193 | { |
194 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 194 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
195 | struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer; | 195 | struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer; |
196 | struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio; | ||
196 | struct nouveau_channel *evo = dev_priv->evo; | 197 | struct nouveau_channel *evo = dev_priv->evo; |
197 | struct drm_connector *connector; | 198 | struct drm_connector *connector; |
198 | uint32_t val, ram_amount; | 199 | uint32_t val, ram_amount; |
@@ -379,7 +380,7 @@ nv50_display_init(struct drm_device *dev) | |||
379 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | 380 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
380 | struct nouveau_connector *conn = nouveau_connector(connector); | 381 | struct nouveau_connector *conn = nouveau_connector(connector); |
381 | 382 | ||
382 | nv50_gpio_irq_enable(dev, conn->dcb->gpio_tag, true); | 383 | pgpio->irq_enable(dev, conn->dcb->gpio_tag, true); |
383 | } | 384 | } |
384 | 385 | ||
385 | return 0; | 386 | return 0; |