diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-05-13 09:30:15 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-06-11 10:09:13 +0400 |
| commit | 8e8832e8a8ad4159fd6f9cb13975941c5de50c0f (patch) | |
| tree | c8ba570190a9f53d2355cb60d4a21b58c88d31dd /drivers/gpu/drm/nouveau/nouveau_connector.c | |
| parent | 255b329ca7f0e9b5fa6da3a68bb713684fe10305 (diff) | |
| download | linux-8e8832e8a8ad4159fd6f9cb13975941c5de50c0f.tar.xz | |
drm/nouveau/core: allow event source to handle multiple event types per index
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_connector.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 6ecea9b2b15a..0f3fdc66c823 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -934,7 +934,7 @@ nouveau_connector_hotplug_work(struct work_struct *work) } static int -nouveau_connector_hotplug(void *data, int index) +nouveau_connector_hotplug(void *data, u32 type, int index) { struct nouveau_connector *nv_connector = data; schedule_work(&nv_connector->hpd_work); @@ -1013,7 +1013,8 @@ nouveau_connector_create(struct drm_device *dev, int index) nv_connector->hpd.func = DCB_GPIO_UNUSED; if (nv_connector->hpd.func != DCB_GPIO_UNUSED) { - nouveau_event_new(gpio->events, nv_connector->hpd.line, + nouveau_event_new(gpio->events, 1, + nv_connector->hpd.line, nouveau_connector_hotplug, nv_connector, &nv_connector->hpd_func); |