summaryrefslogtreecommitdiff
path: root/src/intel_driver.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-06-22 17:30:02 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2013-06-23 07:33:56 +0100
commit7ec0378b64e88923ba1c4eba043488685aa3a795 (patch)
tree1d11f3c1bbc292083fb2f8fd86c40d40fe21d921 /src/intel_driver.c
parent41badce186fe0f6e8f49e30b6c1c251027161e35 (diff)
sna: Only open the /dev/dri/cardX device once
Merge the device open in the main driver with the probing so that we can open the path explicitly passed in by the PlatformProbe and keep that fd around for the main driver and so avoid a later search. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_driver.c')
-rw-r--r--src/intel_driver.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c
index ae2e31e8..7569c130 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -1298,6 +1298,8 @@ static Bool I830PMEvent(SCRN_ARG_TYPE arg, pmEvent event, Bool undo)
Bool intel_init_scrn(ScrnInfoPtr scrn)
{
+ __intel_uxa_release_device(scrn);
+
scrn->PreInit = I830PreInit;
scrn->ScreenInit = I830ScreenInit;
scrn->SwitchMode = I830SwitchMode;