diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-03-01 22:57:40 +0100 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-05-16 19:59:11 +0100 |
| commit | 8d4fc8dabb5394636e4fea3ee1b18ffb02bde9dd (patch) | |
| tree | b0275dbc363248d01a6b8b5e53ba13234a7e6a78 /src/xvmc/i965_xvmc.c | |
| parent | 261aa1ccd93242816527d49166e8d288cf12efc8 (diff) | |
libIntelXvMC: kill ums leftovers
On i965 class hw, kernel_exec_fencing was 1 always, anyway. And on
i945, this patch kills a memory leak (dunno how, but it does).
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit 5018fd3097d77a5f31af4cb27e39daa37557b64e)
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
(oga: note that while we use UMS still, we can trust kernel_exec_fencing
to always be one because we have had modern GEM right from the start.)
Diffstat (limited to 'src/xvmc/i965_xvmc.c')
| -rw-r--r-- | src/xvmc/i965_xvmc.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/xvmc/i965_xvmc.c b/src/xvmc/i965_xvmc.c index ff67995f..3de60546 100644 --- a/src/xvmc/i965_xvmc.c +++ b/src/xvmc/i965_xvmc.c @@ -731,11 +731,8 @@ static Status render_surface(Display * display, } if (media_state.indirect_data.bo) { - if (xvmc_driver->kernel_exec_fencing) - drm_intel_gem_bo_unmap_gtt(media_state. - indirect_data.bo); - else - drm_intel_bo_unmap(media_state.indirect_data.bo); + drm_intel_gem_bo_unmap_gtt(media_state. + indirect_data.bo); drm_intel_bo_unreference(media_state.indirect_data.bo); } @@ -755,10 +752,7 @@ static Status render_surface(Display * display, interface_descriptor(&media_state); vfe_state(&media_state); - if (xvmc_driver->kernel_exec_fencing) - drm_intel_gem_bo_map_gtt(media_state.indirect_data.bo); - else - drm_intel_bo_map(media_state.indirect_data.bo, 1); + drm_intel_gem_bo_map_gtt(media_state.indirect_data.bo); block_ptr = media_state.indirect_data.bo->virtual; for (i = first_macroblock; i < num_macroblocks + first_macroblock; i++) { |