diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_dp.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c index 64b43958e582..33742b11188b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dp.c +++ b/drivers/gpu/drm/nouveau/nouveau_dp.c | |||
@@ -272,6 +272,8 @@ bool | |||
272 | nouveau_dp_link_train(struct drm_encoder *encoder) | 272 | nouveau_dp_link_train(struct drm_encoder *encoder) |
273 | { | 273 | { |
274 | struct drm_device *dev = encoder->dev; | 274 | struct drm_device *dev = encoder->dev; |
275 | struct drm_nouveau_private *dev_priv = dev->dev_private; | ||
276 | struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio; | ||
275 | struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); | 277 | struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); |
276 | struct nouveau_connector *nv_connector; | 278 | struct nouveau_connector *nv_connector; |
277 | struct bit_displayport_encoder_table *dpe; | 279 | struct bit_displayport_encoder_table *dpe; |
@@ -295,7 +297,7 @@ nouveau_dp_link_train(struct drm_encoder *encoder) | |||
295 | /* disable hotplug detect, this flips around on some panels during | 297 | /* disable hotplug detect, this flips around on some panels during |
296 | * link training. | 298 | * link training. |
297 | */ | 299 | */ |
298 | nv50_gpio_irq_enable(dev, nv_connector->dcb->gpio_tag, false); | 300 | pgpio->irq_enable(dev, nv_connector->dcb->gpio_tag, false); |
299 | 301 | ||
300 | if (dpe->script0) { | 302 | if (dpe->script0) { |
301 | NV_DEBUG_KMS(dev, "SOR-%d: running DP script 0\n", nv_encoder->or); | 303 | NV_DEBUG_KMS(dev, "SOR-%d: running DP script 0\n", nv_encoder->or); |
@@ -436,7 +438,7 @@ stop: | |||
436 | } | 438 | } |
437 | 439 | ||
438 | /* re-enable hotplug detect */ | 440 | /* re-enable hotplug detect */ |
439 | nv50_gpio_irq_enable(dev, nv_connector->dcb->gpio_tag, true); | 441 | pgpio->irq_enable(dev, nv_connector->dcb->gpio_tag, true); |
440 | 442 | ||
441 | return eq_done; | 443 | return eq_done; |
442 | } | 444 | } |