modesetting: Move dumb_bo into its own source files.
Eventually, drmmode_display will be able to use GBM for handling buffers, and won't need dumb_bo. Keeping the display related logic and buffer object abstraction in separate files seems a bit tidier. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Tested-by: Jason Ekstrand <jason.ekstrand@intel.com> Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
af4f94b08e
commit
87cc0c0d31
|
@ -48,6 +48,8 @@ modesetting_drv_la_SOURCES = \
|
|||
driver.h \
|
||||
drmmode_display.c \
|
||||
drmmode_display.h \
|
||||
dumb_bo.c \
|
||||
dumb_bo.h \
|
||||
vblank.c \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include <sys/ioctl.h>
|
||||
#include <sys/mman.h>
|
||||
#include <unistd.h>
|
||||
#include "dumb_bo.h"
|
||||
#include "xf86str.h"
|
||||
#include "X11/Xatom.h"
|
||||
#include "micmap.h"
|
||||
|
@ -54,114 +55,6 @@
|
|||
#include "glamor.h"
|
||||
#endif
|
||||
|
||||
static struct dumb_bo *
|
||||
dumb_bo_create(int fd,
|
||||
const unsigned width, const unsigned height, const unsigned bpp)
|
||||
{
|
||||
struct drm_mode_create_dumb arg;
|
||||
struct dumb_bo *bo;
|
||||
int ret;
|
||||
|
||||
bo = calloc(1, sizeof(*bo));
|
||||
if (!bo)
|
||||
return NULL;
|
||||
|
||||
memset(&arg, 0, sizeof(arg));
|
||||
arg.width = width;
|
||||
arg.height = height;
|
||||
arg.bpp = bpp;
|
||||
|
||||
ret = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg);
|
||||
if (ret)
|
||||
goto err_free;
|
||||
|
||||
bo->handle = arg.handle;
|
||||
bo->size = arg.size;
|
||||
bo->pitch = arg.pitch;
|
||||
|
||||
return bo;
|
||||
err_free:
|
||||
free(bo);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
dumb_bo_map(int fd, struct dumb_bo *bo)
|
||||
{
|
||||
struct drm_mode_map_dumb arg;
|
||||
int ret;
|
||||
void *map;
|
||||
|
||||
if (bo->ptr) {
|
||||
bo->map_count++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
memset(&arg, 0, sizeof(arg));
|
||||
arg.handle = bo->handle;
|
||||
|
||||
ret = drmIoctl(fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, arg.offset);
|
||||
if (map == MAP_FAILED)
|
||||
return -errno;
|
||||
|
||||
bo->ptr = map;
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static int
|
||||
dumb_bo_unmap(int fd, struct dumb_bo *bo)
|
||||
{
|
||||
bo->map_count--;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
dumb_bo_destroy(int fd, struct dumb_bo *bo)
|
||||
{
|
||||
struct drm_mode_destroy_dumb arg;
|
||||
int ret;
|
||||
|
||||
if (bo->ptr) {
|
||||
munmap(bo->ptr, bo->size);
|
||||
bo->ptr = NULL;
|
||||
}
|
||||
|
||||
memset(&arg, 0, sizeof(arg));
|
||||
arg.handle = bo->handle;
|
||||
ret = drmIoctl(fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg);
|
||||
if (ret)
|
||||
return -errno;
|
||||
|
||||
free(bo);
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct dumb_bo *
|
||||
dumb_get_bo_from_fd(int fd, int handle, int pitch, int size)
|
||||
{
|
||||
struct dumb_bo *bo;
|
||||
int ret;
|
||||
|
||||
bo = calloc(1, sizeof(*bo));
|
||||
if (!bo)
|
||||
return NULL;
|
||||
|
||||
ret = drmPrimeFDToHandle(fd, handle, &bo->handle);
|
||||
if (ret) {
|
||||
free(bo);
|
||||
return NULL;
|
||||
}
|
||||
bo->pitch = pitch;
|
||||
bo->size = size;
|
||||
return bo;
|
||||
}
|
||||
|
||||
Bool
|
||||
drmmode_SetSlaveBO(PixmapPtr ppix,
|
||||
drmmode_ptr drmmode, int fd_handle, int pitch, int size)
|
||||
|
|
|
@ -32,13 +32,7 @@
|
|||
#include "libudev.h"
|
||||
#endif
|
||||
|
||||
struct dumb_bo {
|
||||
uint32_t handle;
|
||||
uint32_t size;
|
||||
void *ptr;
|
||||
int map_count;
|
||||
uint32_t pitch;
|
||||
};
|
||||
#include "dumb_bo.h"
|
||||
|
||||
typedef struct {
|
||||
int fd;
|
||||
|
@ -149,8 +143,6 @@ Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
|
|||
void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
|
||||
void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode,
|
||||
int *depth, int *bpp);
|
||||
struct dumb_bo *dumb_get_bo_from_fd(int drm_fd, int fd, int pitch, int size);
|
||||
int dumb_bo_destroy(int fd, struct dumb_bo *bo);
|
||||
|
||||
|
||||
#ifndef DRM_CAP_DUMB_PREFERRED_DEPTH
|
||||
|
|
144
hw/xfree86/drivers/modesetting/dumb_bo.c
Normal file
144
hw/xfree86/drivers/modesetting/dumb_bo.c
Normal file
|
@ -0,0 +1,144 @@
|
|||
/*
|
||||
* Copyright © 2007 Red Hat, Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*
|
||||
* Authors:
|
||||
* Dave Airlie <airlied@redhat.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#include "dumb_bo.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/mman.h>
|
||||
#include <unistd.h>
|
||||
#include <xf86drm.h>
|
||||
|
||||
struct dumb_bo *
|
||||
dumb_bo_create(int fd,
|
||||
const unsigned width, const unsigned height, const unsigned bpp)
|
||||
{
|
||||
struct drm_mode_create_dumb arg;
|
||||
struct dumb_bo *bo;
|
||||
int ret;
|
||||
|
||||
bo = calloc(1, sizeof(*bo));
|
||||
if (!bo)
|
||||
return NULL;
|
||||
|
||||
memset(&arg, 0, sizeof(arg));
|
||||
arg.width = width;
|
||||
arg.height = height;
|
||||
arg.bpp = bpp;
|
||||
|
||||
ret = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg);
|
||||
if (ret)
|
||||
goto err_free;
|
||||
|
||||
bo->handle = arg.handle;
|
||||
bo->size = arg.size;
|
||||
bo->pitch = arg.pitch;
|
||||
|
||||
return bo;
|
||||
err_free:
|
||||
free(bo);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int
|
||||
dumb_bo_map(int fd, struct dumb_bo *bo)
|
||||
{
|
||||
struct drm_mode_map_dumb arg;
|
||||
int ret;
|
||||
void *map;
|
||||
|
||||
if (bo->ptr) {
|
||||
bo->map_count++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
memset(&arg, 0, sizeof(arg));
|
||||
arg.handle = bo->handle;
|
||||
|
||||
ret = drmIoctl(fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, arg.offset);
|
||||
if (map == MAP_FAILED)
|
||||
return -errno;
|
||||
|
||||
bo->ptr = map;
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static int
|
||||
dumb_bo_unmap(int fd, struct dumb_bo *bo)
|
||||
{
|
||||
bo->map_count--;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
dumb_bo_destroy(int fd, struct dumb_bo *bo)
|
||||
{
|
||||
struct drm_mode_destroy_dumb arg;
|
||||
int ret;
|
||||
|
||||
if (bo->ptr) {
|
||||
munmap(bo->ptr, bo->size);
|
||||
bo->ptr = NULL;
|
||||
}
|
||||
|
||||
memset(&arg, 0, sizeof(arg));
|
||||
arg.handle = bo->handle;
|
||||
ret = drmIoctl(fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg);
|
||||
if (ret)
|
||||
return -errno;
|
||||
|
||||
free(bo);
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct dumb_bo *
|
||||
dumb_get_bo_from_fd(int fd, int handle, int pitch, int size)
|
||||
{
|
||||
struct dumb_bo *bo;
|
||||
int ret;
|
||||
|
||||
bo = calloc(1, sizeof(*bo));
|
||||
if (!bo)
|
||||
return NULL;
|
||||
|
||||
ret = drmPrimeFDToHandle(fd, handle, &bo->handle);
|
||||
if (ret) {
|
||||
free(bo);
|
||||
return NULL;
|
||||
}
|
||||
bo->pitch = pitch;
|
||||
bo->size = size;
|
||||
return bo;
|
||||
}
|
46
hw/xfree86/drivers/modesetting/dumb_bo.h
Normal file
46
hw/xfree86/drivers/modesetting/dumb_bo.h
Normal file
|
@ -0,0 +1,46 @@
|
|||
/*
|
||||
* Copyright © 2007 Red Hat, Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*
|
||||
* Authors:
|
||||
* Dave Airlie <airlied@redhat.com>
|
||||
*
|
||||
*/
|
||||
#ifndef DUMB_BO_H
|
||||
#define DUMB_BO_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
struct dumb_bo {
|
||||
uint32_t handle;
|
||||
uint32_t size;
|
||||
void *ptr;
|
||||
int map_count;
|
||||
uint32_t pitch;
|
||||
};
|
||||
|
||||
struct dumb_bo *dumb_bo_create(int fd, const unsigned width,
|
||||
const unsigned height, const unsigned bpp);
|
||||
int dumb_bo_map(int fd, struct dumb_bo *bo);
|
||||
int dumb_bo_destroy(int fd, struct dumb_bo *bo);
|
||||
struct dumb_bo *dumb_get_bo_from_fd(int fd, int handle, int pitch, int size);
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user