diff options
| author | Eric Anholt <eric@anholt.net> | 2007-03-30 12:56:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-03-30 12:56:08 -0700 |
| commit | cd4c82176f3f429e722ca3fac2abf231af479780 (patch) | |
| tree | 6c658f8ea8cbfcdbb5d3c8518a5f13ca90b465e3 /linux-core/drm_bo.c | |
| parent | 5d69640a6ad15522fa37c3b232eb34acef955892 (diff) | |
| parent | 3f70518f0bcf36a1e2c82db962324dbdee106f67 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'linux-core/drm_bo.c')
| -rw-r--r-- | linux-core/drm_bo.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c index d3e89af6..1bdc6fef 100644 --- a/linux-core/drm_bo.c +++ b/linux-core/drm_bo.c @@ -832,6 +832,9 @@ int drm_bo_mem_space(drm_buffer_object_t * bo, mem_type = prios[i]; man = &bm->man[mem_type]; + if (!man->has_type) + continue; + if (!drm_bo_mt_compatible(man, mem_type, mem->mask, &cur_flags)) continue; |