Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix drmOpen for non-linux 965 XvMC 

drmOpen by name only works on linux after falling back to groping around
in /proc.  This doesn't work on other OS.

Signed-off-by: Robert Noland <rnoland@2hip.net>
This commit is contained in:
Robert Noland 2008-12-17 09:27:30 +08:00 committed by Zhenyu Wang
parent ecdd706873
commit ed267072db
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/xvmc/intel_xvmc.c
View File

@ -292,12 +292,6 @@ _X_EXPORT Status XvMCCreateContext(Display *display, XvPortID port,
intel_xvmc_debug_init();
/* Open DRI Device */
if((fd = drmOpen("i915", NULL)) < 0) {
XVMC_ERR("DRM Device could not be opened.");
return BadValue;
}
/*
Width, Height, and flags are checked against surface_type_id
and port for validity inside the X server, no need to check
@ -358,8 +352,6 @@ _X_EXPORT Status XvMCCreateContext(Display *display, XvPortID port,
return BadValue;
}
xvmc_driver->fd = fd;
XVMC_INFO("decoder type is %s", intel_xvmc_decoder_string(comm->type));
xvmc_driver->sarea_size = comm->sarea_size;
@ -390,6 +382,16 @@ _X_EXPORT Status XvMCCreateContext(Display *display, XvPortID port,
return BadValue;
}
/* Open DRI Device */
if((fd = drmOpen("i915", curBusID)) < 0) {
XVMC_ERR("DRM Device could not be opened.");
XFree(priv_data);
XFree(curBusID);
return BadValue;
}
xvmc_driver->fd = fd;
strncpy(xvmc_driver->busID, curBusID, 20);
xvmc_driver->busID[20] = '\0';
XFree(curBusID);