XLibre/xf86-video-ati
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-ati.git synced 2026-03-24 01:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set RADEON_GEM_NO_CPU_ACCESS flag for BOs which don't need CPU access

Browse Source 
Failing to do this was resulting in the kernel driver unnecessarily
leaving open the possibility of CPU access to those BOs.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2016-01-20 11:20:30 +09:00
committed by Michel Dänzer
parent 9483a3d777
commit d41fcccf2f
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/drmmode_display.c
View File

@@ -549,7 +549,8 @@ drmmode_crtc_scanout_allocate(xf86CrtcPtr crtc,
size = RADEON_ALIGN(rotate_pitch * aligned_height, RADEON_GPU_PAGE_SIZE);
scanout->bo = radeon_bo_open(drmmode->bufmgr, 0, size, base_align,
RADEON_GEM_DOMAIN_VRAM, 0);
RADEON_GEM_DOMAIN_VRAM,
RADEON_GEM_NO_CPU_ACCESS);
if (scanout->bo == NULL)
return NULL;
@@ -1917,7 +1918,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
info->front_bo = radeon_bo_open(info->bufmgr, 0, screen_size, base_align,
info->shadow_primary ?
RADEON_GEM_DOMAIN_GTT :
RADEON_GEM_DOMAIN_VRAM, 0);
RADEON_GEM_DOMAIN_VRAM,
tiling_flags ? RADEON_GEM_NO_CPU_ACCESS : 0);
if (!info->front_bo)
goto fail;

4
src/radeon.h
View File

@@ -66,6 +66,10 @@
#include "xf86drm.h"
#include "radeon_drm.h"
#ifndef RADEON_GEM_NO_CPU_ACCESS
#define RADEON_GEM_NO_CPU_ACCESS (1 << 4)
#endif
#ifdef DAMAGE
#include "damage.h"
#include "globals.h"

7
src/radeon_bo_helper.c
View File

@@ -74,7 +74,7 @@ radeon_alloc_pixmap_bo(ScrnInfoPtr pScrn, int width, int height, int depth,
int pitch, base_align;
uint32_t size, heighta;
int cpp = bitsPerPixel / 8;
uint32_t tiling = 0;
uint32_t tiling = 0, flags = 0;
struct radeon_surface surface;
struct radeon_bo *bo;
int domain = RADEON_GEM_DOMAIN_VRAM;
@@ -181,8 +181,11 @@ radeon_alloc_pixmap_bo(ScrnInfoPtr pScrn, int width, int height, int depth,
}
}
if (tiling)
flags |= RADEON_GEM_NO_CPU_ACCESS;
bo = radeon_bo_open(info->bufmgr, 0, size, base_align,
domain, 0);
domain, flags);
if (bo && tiling && radeon_bo_set_tiling(bo, tiling, pitch) == 0)
*new_tiling = tiling;

3
src/radeon_kms.c
View File

@@ -1981,7 +1981,8 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
base_align,
info->shadow_primary ?
RADEON_GEM_DOMAIN_GTT :
RADEON_GEM_DOMAIN_VRAM, 0);
RADEON_GEM_DOMAIN_VRAM,
tiling_flags ? RADEON_GEM_NO_CPU_ACCESS : 0);
if (info->r600_shadow_fb == TRUE) {
if (radeon_bo_map(info->front_bo, 1)) {
ErrorF("Failed to map cursor buffer memory\n");