diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-07-26 17:26:29 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-07-26 17:26:29 +1000 |
| commit | 5e580523d9128a4d8364fe89d36c38fc7819c8dd (patch) | |
| tree | 852fb2427d980830ae8686a91e4ca5873f259ab9 /drivers/gpu/drm/ttm | |
| parent | c11dea5b0290984fa48111957ba3fdc5b3bdae5a (diff) | |
| parent | 523d939ef98fd712632d93a5a2b588e477a7565e (diff) | |
| download | op-kernel-dev-5e580523d9128a4d8364fe89d36c38fc7819c8dd.zip op-kernel-dev-5e580523d9128a4d8364fe89d36c38fc7819c8dd.tar.gz | |
Backmerge tag 'v4.7' into drm-next
Linux 4.7
As requested by Daniel Vetter as the conflicts were getting messy.
Diffstat (limited to 'drivers/gpu/drm/ttm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index e340d0d6..3452748 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1044,9 +1044,9 @@ out_unlock: return ret; } -static bool ttm_bo_mem_compat(struct ttm_placement *placement, - struct ttm_mem_reg *mem, - uint32_t *new_flags) +bool ttm_bo_mem_compat(struct ttm_placement *placement, + struct ttm_mem_reg *mem, + uint32_t *new_flags) { int i; @@ -1078,6 +1078,7 @@ static bool ttm_bo_mem_compat(struct ttm_placement *placement, return false; } +EXPORT_SYMBOL(ttm_bo_mem_compat); int ttm_bo_validate(struct ttm_buffer_object *bo, struct ttm_placement *placement, |
