summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Glisse <glisse@freedesktop.org>2007-11-18 19:16:40 +0100
committerJerome Glisse <glisse@freedesktop.org>2007-11-21 18:58:03 +0100
commit8fd8bf599b42b6caa062afabdfce7385d59a7695 (patch)
tree9ab8b689466e0608fc17893da8c2e0bfb1e04435
parentf29b2a583d6f9d2cd02d58e915a0ca1cdee0919e (diff)
drm: don't reset to 0 irq_enabled when client open file descriptor
-rw-r--r--linux-core/drm_fops.c1
-rw-r--r--linux-core/drm_stub.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index ffee1027..a5277b7b 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -85,7 +85,6 @@ static int drm_setup(struct drm_device * dev)
dev->queue_reserved = 0;
dev->queue_slots = 0;
dev->queuelist = NULL;
- dev->irq_enabled = 0;
dev->context_flag = 0;
dev->interrupt_flag = 0;
dev->dma_flag = 0;
diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index 4aaf0a9c..eb4ba8e9 100644
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -84,6 +84,7 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
dev->hose = pdev->sysdata;
#endif
dev->irq = pdev->irq;
+ dev->irq_enabled = 0;
if (drm_ht_create(&dev->map_hash, DRM_MAP_HASH_ORDER))
return -ENOMEM;