diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-08-28 11:34:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-08-28 11:34:48 +1000 |
| commit | fb1aacae408a48968840f8743a73edaad94a2f94 (patch) | |
| tree | ab6a78bc2f7b0d42165eb647e13e87f92b97f149 /drivers/gpu/drm/radeon/radeon.h | |
| parent | 484048db6b4890bc433aac7f5e32fdcf1b2b4786 (diff) | |
| parent | f1217ed09f827e42a49ffa6a5aab672aa6f57a65 (diff) | |
Merge branch 'ttm_pfn' of git://people.freedesktop.org/~deathsimple/linux into drm-next
pull in placement changes radeon requires.
* 'ttm_pfn' of git://people.freedesktop.org/~deathsimple/linux:
drm/ttm: move fpfn and lpfn into each placement v2
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 b321ad4dcafd..bb01dab513dd 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -469,7 +469,7 @@ struct radeon_bo { struct list_head list; /* Protected by tbo.reserved */ u32 initial_domain; - u32 placements[3]; + struct ttm_place placements[3]; struct ttm_placement placement; struct ttm_buffer_object tbo; struct ttm_bo_kmap_obj kmap; |