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:29 +0100
commit09e51db77b049765117d3cfa8b59fab0b73e6c93 (patch)
tree3f1113301c60abb4b9befaf795a64861ed6fe984
parent3fc3fc082adfa9a7dfe45ea8fb7a9fb6e7019ff6 (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 6923ce86..2b1c5a08 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 401704f7..5ac75427 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;