Deleted Added
full compact
drm_bufs.c (183833) drm_bufs.c (189099)
1/*-
2 * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
3 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
4 * All Rights Reserved.
5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a
7 * copy of this software and associated documentation files (the "Software"),
8 * to deal in the Software without restriction, including without limitation

--- 15 unchanged lines hidden (view full) ---

24 *
25 * Authors:
26 * Rickard E. (Rik) Faith <faith@valinux.com>
27 * Gareth Hughes <gareth@valinux.com>
28 *
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
3 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
4 * All Rights Reserved.
5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a
7 * copy of this software and associated documentation files (the "Software"),
8 * to deal in the Software without restriction, including without limitation

--- 15 unchanged lines hidden (view full) ---

24 *
25 * Authors:
26 * Rickard E. (Rik) Faith <faith@valinux.com>
27 * Gareth Hughes <gareth@valinux.com>
28 *
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/sys/dev/drm/drm_bufs.c 183833 2008-10-13 18:03:27Z rnoland $");
32__FBSDID("$FreeBSD: head/sys/dev/drm/drm_bufs.c 189099 2009-02-27 06:01:42Z rnoland $");
33
34/** @file drm_bufs.c
35 * Implementation of the ioctls for setup of DRM mappings and DMA buffers.
36 */
37
38#include "dev/pci/pcireg.h"
39
40#include "dev/drm/drmP.h"

--- 834 unchanged lines hidden (view full) ---

875
876 ret = drm_do_addbufs_pci(dev, request);
877
878 DRM_SPINUNLOCK(&dev->dma_lock);
879
880 return ret;
881}
882
33
34/** @file drm_bufs.c
35 * Implementation of the ioctls for setup of DRM mappings and DMA buffers.
36 */
37
38#include "dev/pci/pcireg.h"
39
40#include "dev/drm/drmP.h"

--- 834 unchanged lines hidden (view full) ---

875
876 ret = drm_do_addbufs_pci(dev, request);
877
878 DRM_SPINUNLOCK(&dev->dma_lock);
879
880 return ret;
881}
882
883int drm_addbufs_ioctl(struct drm_device *dev, void *data,
884 struct drm_file *file_priv)
883int drm_addbufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
885{
886 struct drm_buf_desc *request = data;
887 int err;
888
889 if (request->flags & _DRM_AGP_BUFFER)
890 err = drm_addbufs_agp(dev, request);
891 else if (request->flags & _DRM_SG_BUFFER)
892 err = drm_addbufs_sg(dev, request);

--- 222 unchanged lines hidden ---
884{
885 struct drm_buf_desc *request = data;
886 int err;
887
888 if (request->flags & _DRM_AGP_BUFFER)
889 err = drm_addbufs_agp(dev, request);
890 else if (request->flags & _DRM_SG_BUFFER)
891 err = drm_addbufs_sg(dev, request);

--- 222 unchanged lines hidden ---