diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-04-16 08:00:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-04-16 08:00:06 +1000 |
| commit | fc16fc4d69d5f1b67d3d6ac97bd3b4e1cc3f74cc (patch) | |
| tree | b91ebdc1c6621a8787b3994e45b5d8e02de5340e /drivers/gpu/drm/radeon/radeon.h | |
| parent | 665ae581ae82ed6a28980a32b9d37345db4eed32 (diff) | |
| parent | 49ecb10e01c68b05dcb73005a54430c15caa05d0 (diff) | |
Merge branch 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-next
Some final bits for 4.1. Some fixes for userptrs and allow a new
packet for VCE to enable some new features in mesa.
* 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: allow creating overlapping userptrs
drm/radeon: add userptr config option
drm/radeon: add video usability info support for VCE
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 73a6432da1a5..d2abe481954f 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -507,7 +507,7 @@ struct radeon_bo { pid_t pid; struct radeon_mn *mn; - struct interval_tree_node mn_it; + struct list_head mn_list; }; #define gem_to_radeon_bo(gobj) container_of((gobj), struct radeon_bo, gem_base) |