aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_dp.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2013-02-02 21:56:16 -0500
committerBen Skeggs <bskeggs@redhat.com>2013-02-20 01:00:50 -0500
commit4f47643dbb4c345c5beebe53588682a7ff2c872a (patch)
tree824b98893e562bedab63d6987c1d248332b45f3f /drivers/gpu/drm/nouveau/nouveau_dp.c
parent0f0800661a125ddb038462570c869fe6f8ab5737 (diff)
drm/nouveau/gpio: use event interfaces for interrupt signalling
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_dp.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_dp.c6
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 c273c2afed10..a87c3674157f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -260,7 +260,8 @@ nouveau_dp_link_train(struct drm_encoder *encoder, u32 datarate,
260 * we take during link training (DP_SET_POWER is one), we need 260 * we take during link training (DP_SET_POWER is one), we need
261 * to ignore them for the moment to avoid races. 261 * to ignore them for the moment to avoid races.
262 */ 262 */
263 gpio->irq(gpio, 0, nv_connector->hpd.func, 0xff, false); 263 nouveau_event_put(gpio->events, nv_connector->hpd.line,
264 &nv_connector->hpd_func);
264 265
265 /* enable down-spreading and execute pre-train script from vbios */ 266 /* enable down-spreading and execute pre-train script from vbios */
266 dp_link_train_init(dev, &dp, nv_encoder->dp.dpcd[3] & 1); 267 dp_link_train_init(dev, &dp, nv_encoder->dp.dpcd[3] & 1);
@@ -300,7 +301,8 @@ nouveau_dp_link_train(struct drm_encoder *encoder, u32 datarate,
300 dp_link_train_fini(dev, &dp); 301 dp_link_train_fini(dev, &dp);
301 302
302 /* re-enable hotplug detect */ 303 /* re-enable hotplug detect */
303 gpio->irq(gpio, 0, nv_connector->hpd.func, 0xff, true); 304 nouveau_event_get(gpio->events, nv_connector->hpd.line,
305 &nv_connector->hpd_func);
304 return true; 306 return true;
305} 307}
306 308