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

XVMC: Use XCB DRI2 instead of cargo-culting our own copy of Xlib stuff. (v2) 

v2: Incorporate comments from Jamey on device name handling and extension
detection.
This commit is contained in:
Eric Anholt 2009-10-15 13:48:56 -07:00
parent 38ab403d7a
commit 3e8f2eae3a
5 changed files with 82 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -155,7 +155,9 @@ if test "$VIDEO_DEBUG" = yes; then
fi
if test "$XVMC" = yes; then
PKG_CHECK_MODULES(XVMCLIB, [xvmc xext xfixes dri2proto], [XVMC=yes], [XVMC=no])
PKG_CHECK_MODULES(XVMCLIB,
[xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux],
[XVMC=yes], [XVMC=no])
fi
AC_MSG_CHECKING([whether to include XvMC support])
AC_MSG_RESULT([$XVMC])

4
src/xvmc/Makefile.am
View File

@ -24,9 +24,7 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \
xvmc_vld.c \
xvmc_vld.h \
intel_batchbuffer.c \
intel_batchbuffer.h \
dri2.c \
dri2.h
intel_batchbuffer.h
libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0

298
src/xvmc/dri2.c
View File

@ -1,298 +0,0 @@
/*
* Copyright © 2008 Red Hat, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Soft-
* ware"), to deal in the Software without restriction, including without
* limitation the rights to use, copy, modify, merge, publish, distribute,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, provided that the above copyright
* notice(s) and this permission notice appear in all copies of the Soft-
* ware and that both the above copyright notice(s) and this permission
* notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
* ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
* RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
* THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
* QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
* MANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall
* not be used in advertising or otherwise to promote the sale, use or
* other dealings in this Software without prior written authorization of
* the copyright holder.
*
* Authors:
* Kristian Høgsberg (krh@redhat.com)
*/
#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
#include <X11/extensions/dri2proto.h>
#include "xf86drm.h"
#include "dri2.h"
static char dri2ExtensionName[] = DRI2_NAME;
static XExtensionInfo *dri2Info;
static XEXT_GENERATE_CLOSE_DISPLAY(DRI2CloseDisplay, dri2Info)
static /* const */ XExtensionHooks dri2ExtensionHooks = {
NULL, /* create_gc */
NULL, /* copy_gc */
NULL, /* flush_gc */
NULL, /* free_gc */
NULL, /* create_font */
NULL, /* free_font */
DRI2CloseDisplay, /* close_display */
NULL, /* wire_to_event */
NULL, /* event_to_wire */
NULL, /* error */
NULL, /* error_string */
};
static XEXT_GENERATE_FIND_DISPLAY(DRI2FindDisplay, dri2Info,
dri2ExtensionName,
&dri2ExtensionHooks, 0, NULL)
Bool DRI2QueryExtension(Display * dpy, int *eventBase, int *errorBase)
{
XExtDisplayInfo *info = DRI2FindDisplay(dpy);
if (XextHasExtension(info)) {
*eventBase = info->codes->first_event;
*errorBase = info->codes->first_error;
return True;
}
return False;
}
Bool DRI2QueryVersion(Display * dpy, int *major, int *minor)
{
XExtDisplayInfo *info = DRI2FindDisplay(dpy);
xDRI2QueryVersionReply rep;
xDRI2QueryVersionReq *req;
XextCheckExtension(dpy, info, dri2ExtensionName, False);
LockDisplay(dpy);
GetReq(DRI2QueryVersion, req);
req->reqType = info->codes->major_opcode;
req->dri2ReqType = X_DRI2QueryVersion;
req->majorVersion = DRI2_MAJOR;
req->minorVersion = DRI2_MINOR;
if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
return False;
}
*major = rep.majorVersion;
*minor = rep.minorVersion;
UnlockDisplay(dpy);
SyncHandle();
return True;
}
Bool DRI2Connect(Display * dpy, XID window,
char **driverName, char **deviceName)
{
XExtDisplayInfo *info = DRI2FindDisplay(dpy);
xDRI2ConnectReply rep;
xDRI2ConnectReq *req;
XextCheckExtension(dpy, info, dri2ExtensionName, False);
LockDisplay(dpy);
GetReq(DRI2Connect, req);
req->reqType = info->codes->major_opcode;
req->dri2ReqType = X_DRI2Connect;
req->window = window;
req->driverType = DRI2DriverDRI;
if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
return False;
}
if (rep.driverNameLength == 0 && rep.deviceNameLength == 0) {
UnlockDisplay(dpy);
SyncHandle();
return False;
}
*driverName = Xmalloc(rep.driverNameLength + 1);
if (*driverName == NULL) {
_XEatData(dpy,
((rep.driverNameLength + 3) & ~3) +
((rep.deviceNameLength + 3) & ~3));
UnlockDisplay(dpy);
SyncHandle();
return False;
}
_XReadPad(dpy, *driverName, rep.driverNameLength);
(*driverName)[rep.driverNameLength] = '\0';
*deviceName = Xmalloc(rep.deviceNameLength + 1);
if (*deviceName == NULL) {
Xfree(*driverName);
_XEatData(dpy, ((rep.deviceNameLength + 3) & ~3));
UnlockDisplay(dpy);
SyncHandle();
return False;
}
_XReadPad(dpy, *deviceName, rep.deviceNameLength);
(*deviceName)[rep.deviceNameLength] = '\0';
UnlockDisplay(dpy);
SyncHandle();
return True;
}
Bool DRI2Authenticate(Display * dpy, XID window, drm_magic_t magic)
{
XExtDisplayInfo *info = DRI2FindDisplay(dpy);
xDRI2AuthenticateReq *req;
xDRI2AuthenticateReply rep;
XextCheckExtension(dpy, info, dri2ExtensionName, False);
LockDisplay(dpy);
GetReq(DRI2Authenticate, req);
req->reqType = info->codes->major_opcode;
req->dri2ReqType = X_DRI2Authenticate;
req->window = window;
req->magic = magic;
if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
return False;
}
UnlockDisplay(dpy);
SyncHandle();
return rep.authenticated;
}
void DRI2CreateDrawable(Display * dpy, XID drawable)
{
XExtDisplayInfo *info = DRI2FindDisplay(dpy);
xDRI2CreateDrawableReq *req;
XextSimpleCheckExtension(dpy, info, dri2ExtensionName);
LockDisplay(dpy);
GetReq(DRI2CreateDrawable, req);
req->reqType = info->codes->major_opcode;
req->dri2ReqType = X_DRI2CreateDrawable;
req->drawable = drawable;
UnlockDisplay(dpy);
SyncHandle();
}
void DRI2DestroyDrawable(Display * dpy, XID drawable)
{
XExtDisplayInfo *info = DRI2FindDisplay(dpy);
xDRI2DestroyDrawableReq *req;
XextSimpleCheckExtension(dpy, info, dri2ExtensionName);
XSync(dpy, False);
LockDisplay(dpy);
GetReq(DRI2DestroyDrawable, req);
req->reqType = info->codes->major_opcode;
req->dri2ReqType = X_DRI2DestroyDrawable;
req->drawable = drawable;
UnlockDisplay(dpy);
SyncHandle();
}
DRI2Buffer *DRI2GetBuffers(Display * dpy, XID drawable,
int *width, int *height,
unsigned int *attachments, int count, int *outCount)
{
XExtDisplayInfo *info = DRI2FindDisplay(dpy);
xDRI2GetBuffersReply rep;
xDRI2GetBuffersReq *req;
DRI2Buffer *buffers;
xDRI2Buffer repBuffer;
CARD32 *p;
int i;
XextCheckExtension(dpy, info, dri2ExtensionName, False);
LockDisplay(dpy);
GetReqExtra(DRI2GetBuffers, count * 4, req);
req->reqType = info->codes->major_opcode;
req->dri2ReqType = X_DRI2GetBuffers;
req->drawable = drawable;
req->count = count;
p = (CARD32 *) & req[1];
for (i = 0; i < count; i++)
p[i] = attachments[i];
if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
return NULL;
}
*width = rep.width;
*height = rep.height;
*outCount = rep.count;
buffers = Xmalloc(rep.count * sizeof buffers[0]);
if (buffers == NULL) {
_XEatData(dpy, rep.count * sizeof repBuffer);
UnlockDisplay(dpy);
SyncHandle();
return NULL;
}
for (i = 0; i < rep.count; i++) {
_XReadPad(dpy, (char *)&repBuffer, sizeof repBuffer);
buffers[i].attachment = repBuffer.attachment;
buffers[i].name = repBuffer.name;
buffers[i].pitch = repBuffer.pitch;
buffers[i].cpp = repBuffer.cpp;
buffers[i].flags = repBuffer.flags;
}
UnlockDisplay(dpy);
SyncHandle();
return buffers;
}
void DRI2CopyRegion(Display * dpy, XID drawable, XserverRegion region,
CARD32 dest, CARD32 src)
{
XExtDisplayInfo *info = DRI2FindDisplay(dpy);
xDRI2CopyRegionReq *req;
xDRI2CopyRegionReply rep;
XextSimpleCheckExtension(dpy, info, dri2ExtensionName);
LockDisplay(dpy);
GetReq(DRI2CopyRegion, req);
req->reqType = info->codes->major_opcode;
req->dri2ReqType = X_DRI2CopyRegion;
req->drawable = drawable;
req->region = region;
req->dest = dest;
req->src = src;
_XReply(dpy, (xReply *) & rep, 0, xFalse);
UnlockDisplay(dpy);
SyncHandle();
}

65
src/xvmc/dri2.h
View File

@ -1,65 +0,0 @@
/*
* Copyright © 2007,2008 Red Hat, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Soft-
* ware"), to deal in the Software without restriction, including without
* limitation the rights to use, copy, modify, merge, publish, distribute,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, provided that the above copyright
* notice(s) and this permission notice appear in all copies of the Soft-
* ware and that both the above copyright notice(s) and this permission
* notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
* ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
* RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
* THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
* QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
* MANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder shall
* not be used in advertising or otherwise to promote the sale, use or
* other dealings in this Software without prior written authorization of
* the copyright holder.
*
* Authors:
* Kristian Høgsberg (krh@redhat.com)
*/
#ifndef _DRI2_H_
#define _DRI2_H_
#include <X11/extensions/Xfixes.h>
#include <X11/extensions/dri2tokens.h>
typedef struct {
unsigned int attachment;
unsigned int name;
unsigned int pitch;
unsigned int cpp;
unsigned int flags;
} DRI2Buffer;
extern Bool
DRI2QueryExtension(Display * display, int *eventBase, int *errorBase);
extern Bool DRI2QueryVersion(Display * display, int *major, int *minor);
extern Bool
DRI2Connect(Display * display, XID window,
char **driverName, char **deviceName);
extern Bool DRI2Authenticate(Display * display, XID window, drm_magic_t magic);
extern void DRI2CreateDrawable(Display * display, XID drawable);
extern void DRI2DestroyDrawable(Display * display, XID handle);
extern DRI2Buffer *DRI2GetBuffers(Display * dpy, XID drawable,
int *width, int *height,
unsigned int *attachments, int count,
int *outCount);
extern void
DRI2CopyRegion(Display * dpy, XID drawable, XserverRegion region,
CARD32 dest, CARD32 src);
#endif

125
src/xvmc/intel_xvmc.c
View File

@ -25,7 +25,11 @@
*
*/
#include "intel_xvmc.h"
#include "dri2.h"
#include <xcb/xcb.h>
#include <xcb/xcb_aux.h>
#include <xcb/dri2.h>
#include <X11/Xlib-xcb.h>
#include <X11/extensions/dri2tokens.h>
/* global */
struct _intel_xvmc_driver *xvmc_driver = NULL;
@ -235,6 +239,77 @@ intel_xvmc_surface_ptr intel_xvmc_find_surface(XID id)
return NULL;
}
static int
dri2_connect(Display *display)
{
xcb_dri2_query_version_cookie_t query_version_cookie;
xcb_dri2_query_version_reply_t *query_version_reply;
xcb_dri2_connect_cookie_t connect_cookie;
xcb_dri2_connect_reply_t *connect_reply;
xcb_dri2_authenticate_cookie_t auth_cookie;
xcb_dri2_authenticate_reply_t *auth_reply;
xcb_screen_t *root;
xcb_connection_t *c = XGetXCBConnection(display);
drm_magic_t magic;
const xcb_query_extension_reply_t *dri2_reply;
char *device_name;
int len;
root = xcb_aux_get_screen(c, DefaultScreen(display));
dri2_reply = xcb_get_extension_data(c, &xcb_dri2_id);
if (!dri2_reply) {
XVMC_ERR("DRI2 required");
return BadValue;
}
/* Query the extension and make our first use of it at the same time. */
query_version_cookie = xcb_dri2_query_version(c, 1, 0);
connect_cookie = xcb_dri2_connect(c, root->root, DRI2DriverDRI);
query_version_reply =
xcb_dri2_query_version_reply(c, query_version_cookie, NULL);
connect_reply = xcb_dri2_connect_reply(c, connect_cookie, NULL);
if (!query_version_reply) {
XVMC_ERR("DRI2 required");
return BadValue;
}
free(query_version_reply);
len = xcb_dri2_connect_device_name_length(connect_reply);
device_name = malloc(len + 1);
if (!device_name) {
XVMC_ERR("malloc failure");
return BadAlloc;
}
strncpy(device_name, xcb_dri2_connect_device_name(connect_reply), len);
device_name[len] = 0;
xvmc_driver->fd = open(device_name, O_RDWR);
free(device_name);
free(connect_reply);
if (xvmc_driver->fd < 0) {
XVMC_ERR("Failed to open drm device: %s\n", strerror(errno));
return BadValue;
}
if (drmGetMagic(xvmc_driver->fd, &magic)) {
XVMC_ERR("Failed to get magic\n");
return BadValue;
}
auth_cookie = xcb_dri2_authenticate(c, root->root, magic);
auth_reply = xcb_dri2_authenticate_reply(c, auth_cookie, NULL);
if (!auth_reply) {
XVMC_ERR("Failed to authenticate magic %d\n", magic);
return BadValue;
}
free(auth_reply);
return Success;
}
/*
* Function: XvMCCreateContext
* Description: Create a XvMC context for the given surface parameters.
@ -258,7 +333,6 @@ _X_EXPORT Status XvMCCreateContext(Display * display, XvPortID port,
Status ret;
CARD32 *priv_data = NULL;
struct _intel_xvmc_common *comm;
drm_magic_t magic;
int major, minor;
int error_base;
int event_base;
@ -295,6 +369,7 @@ _X_EXPORT Status XvMCCreateContext(Display * display, XvPortID port,
XVMC_ERR("XvMCExtension is not available!");
return BadValue;
}
ret = XvMCQueryVersion(display, &major, &minor);
if (ret) {
XVMC_ERR
@ -360,56 +435,12 @@ _X_EXPORT Status XvMCCreateContext(Display * display, XvPortID port,
ret = Success;
xvmc_driver->fd = -1;
do {
if (!DRI2QueryExtension(display, &event_base, &error_base)) {
ret = BadValue;
break;
}
if (!DRI2QueryVersion(display, &major, &minor)) {
ret = BadValue;
break;
}
if (!DRI2Connect(display, RootWindow(display, screen),
&driverName, &deviceName)) {
ret = BadValue;
break;
}
xvmc_driver->fd = open(deviceName, O_RDWR);
if (xvmc_driver->fd < 0) {
XVMC_ERR("Failed to open drm device: %s\n",
strerror(errno));
ret = BadValue;
break;
}
if (drmGetMagic(xvmc_driver->fd, &magic)) {
XVMC_ERR("Failed to get magic\n");
ret = BadValue;
break;
}
if (!DRI2Authenticate
(display, RootWindow(display, screen), magic)) {
XVMC_ERR("Failed to authenticate magic %d\n", magic);
ret = BadValue;
break;
}
} while (0);
XFree(driverName);
XFree(deviceName);
ret = dri2_connect(display);
if (ret != Success) {
XFree(priv_data);
context->privData = NULL;
if (xvmc_driver->fd >= 0)
close(xvmc_driver->fd);
xvmc_driver = NULL;
return ret;
}