summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2009-01-04 16:55:33 -0500
committerDave Airlie <airlied@redhat.com>2009-03-13 14:23:58 +1000
commit112b715e8e2f9ef7b96930888bb099ce10b4c3cc (patch)
tree1058edb8beb6dd60a794d2333e43d37cc7116f06 /include/drm
parent41c2e75e60200a860a74b7c84a6375c105e7437f (diff)
downloadkernel-crypto-112b715e8e2f9ef7b96930888bb099ce10b4c3cc.tar.gz
kernel-crypto-112b715e8e2f9ef7b96930888bb099ce10b4c3cc.tar.xz
kernel-crypto-112b715e8e2f9ef7b96930888bb099ce10b4c3cc.zip
drm: claim PCI device when running in modesetting mode.
Under kernel modesetting, we manage the device at all times, regardless of VT switching and X servers, so the only decent thing to do is to claim the PCI device. In that case, we call the suspend/resume hooks directly from the pci driver hooks instead of the current class device detour. Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drmP.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index c91fbb68b46..533d35baa08 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1265,7 +1265,7 @@ extern struct drm_master *drm_master_get(struct drm_master *master);
extern void drm_master_put(struct drm_master **master);
extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
struct drm_driver *driver);
-extern int drm_put_dev(struct drm_device *dev);
+extern void drm_put_dev(struct drm_device *dev);
extern int drm_put_minor(struct drm_minor **minor);
extern unsigned int drm_debug;