History

Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next

radeon userptr support. * 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: allow userptr write access under certain conditions drm/radeon: add userptr flag to register MMU notifier v3 drm/radeon: add userptr flag to directly validate the BO to GTT drm/radeon: add userptr flag to limit it to anonymous memory v2 drm/radeon: add userptr support v8

Dave Airlie committed 12 years ago

Commit 484048d2 parents d5a0f2e bd645e414 files · +610 −4Browse files

Showing the changes to include/uapi (1 of 14 files). Show all

Unified · Split

include/uapi/drm/radeon_drm.h+19−0
@@ -511,6 +511,7 @@ typedef struct { · 510 unmodified lines
511#define DRM_RADEON_GEM_BUSY 0x2a511#define DRM_RADEON_GEM_BUSY 0x2a
512#define DRM_RADEON_GEM_VA 0x2b512#define DRM_RADEON_GEM_VA 0x2b
513#define DRM_RADEON_GEM_OP 0x2c513#define DRM_RADEON_GEM_OP 0x2c
514#define DRM_RADEON_GEM_USERPTR 0x2d
514 515
515#define DRM_IOCTL_RADEON_CP_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)516#define DRM_IOCTL_RADEON_CP_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
516#define DRM_IOCTL_RADEON_CP_START DRM_IO( DRM_COMMAND_BASE + DRM_RADEON_CP_START)517#define DRM_IOCTL_RADEON_CP_START DRM_IO( DRM_COMMAND_BASE + DRM_RADEON_CP_START)
@@ -554,6 +555,7 @@ typedef struct { · 37 unmodified lines
554#define DRM_IOCTL_RADEON_GEM_BUSY DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_BUSY, struct drm_radeon_gem_busy)555#define DRM_IOCTL_RADEON_GEM_BUSY DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_BUSY, struct drm_radeon_gem_busy)
555#define DRM_IOCTL_RADEON_GEM_VA DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_VA, struct drm_radeon_gem_va)556#define DRM_IOCTL_RADEON_GEM_VA DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_VA, struct drm_radeon_gem_va)
556#define DRM_IOCTL_RADEON_GEM_OP DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_OP, struct drm_radeon_gem_op)557#define DRM_IOCTL_RADEON_GEM_OP DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_OP, struct drm_radeon_gem_op)
558#define DRM_IOCTL_RADEON_GEM_USERPTR DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_USERPTR, struct drm_radeon_gem_userptr)
557 559
558typedef struct drm_radeon_init {560typedef struct drm_radeon_init {
559 enum {561 enum {
@@ -808,6 +810,23 @@ struct drm_radeon_gem_create { · 248 unmodified lines
808 uint32_t flags;810 uint32_t flags;
809};811};
810 812
813/*
814 * This is not a reliable API and you should expect it to fail for any
815 * number of reasons and have fallback path that do not use userptr to
816 * perform any operation.
817 */
818#define RADEON_GEM_USERPTR_READONLY (1 << 0)
819#define RADEON_GEM_USERPTR_ANONONLY (1 << 1)
820#define RADEON_GEM_USERPTR_VALIDATE (1 << 2)
821#define RADEON_GEM_USERPTR_REGISTER (1 << 3)
822
823struct drm_radeon_gem_userptr {
824 uint64_t addr;
825 uint64_t size;
826 uint32_t flags;
827 uint32_t handle;
828};
829
811#define RADEON_TILING_MACRO 0x1830#define RADEON_TILING_MACRO 0x1
812#define RADEON_TILING_MICRO 0x2831#define RADEON_TILING_MICRO 0x2
813#define RADEON_TILING_SWAP_16BIT 0x4832#define RADEON_TILING_SWAP_16BIT 0x4

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t