daemonratte/xf86-video-ati
Watch
1
0
Fork
You've already forked xf86-video-ati
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

radeon: use direct mapping for fast fb access.

Browse source 
Signed-off-by: Samuel Li <samuel.li@amd.com>
This commit is contained in:
Samuel Li 2013-03-20 11:59:58 -04:00 • committed by Michel Dänzer
commit 365e571d9d
5 changed files with 42 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
man/radeon.man
View file

@ -232,7 +232,7 @@ The default value is
for R/RV3XX, R/RV4XX, R/RV5XX, RS6XX, RS740, R/RV6XX, R/RV7XX, RS780, RS880,
EVERGREEN, CAYMAN, and ARUBA and
.B off
for R/RV/RS1XX, R/RV/RS2XX, and RS3XX.
for R/RV/RS1XX, R/RV/RS2XX, RS3XX, and RS690/RS780/RS880 when fast fb feature is enabled.
.TP
.BI "Option \*qColorTiling2D\*q \*q" "boolean" \*q
The framebuffer can be addressed either in linear, 1D, or 2D tiled modes. 2D tiled mode can
@ -280,7 +280,7 @@ we use a heuristic based on VRAM amount to determine whether to allow EXA
to use VRAM for non-essential pixmaps. This option allows us to override the
heuristic. The default is
.B on
with > 32MB VRAM, off with < 32MB.
with > 32MB VRAM, off with < 32MB or when fast fb feature is enabled for RS690/RS780/RS880.
.TP
.BI "Option \*qSwapbuffersWait\*q \*q" boolean \*q
This option controls the behavior of glXSwapBuffers and glXCopySubBufferMESA

3
src/r600_exa.c
View file

@ -1542,6 +1542,9 @@ R600UploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
if (!radeon_bo_is_busy(driver_priv->bo, &dst_domain))
goto copy;
}
/* use cpu copy for fast fb access */
if (info->is_fast_fb)
goto copy;
}
scratch_pitch = RADEON_ALIGN(w, drmmode_get_pitch_align(pScrn, (bpp / 8), 0));

1
src/radeon.h
View file

@ -425,6 +425,7 @@ typedef struct {
Bool exa_pixmaps;
Bool exa_force_create;
XF86ModReqInfo exaReq;
Bool is_fast_fb; /* use direct mapping for fast fb access */
unsigned int xv_max_width;
unsigned int xv_max_height;

3
src/radeon_exa_funcs.c
View file

@ -412,6 +412,9 @@ RADEONUploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
if (!radeon_bo_is_busy(driver_priv->bo, &dst_domain))
goto copy;
}
/* use cpu copy for fast fb access */
if (info->is_fast_fb)
goto copy;
}
size = scratch_pitch * h;

36
src/radeon_kms.c
View file

@ -319,6 +319,28 @@ radeon_flush_callback(CallbackListPtr *list,
}
}
static Bool RADEONIsFastFBWorking(ScrnInfoPtr pScrn)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
struct drm_radeon_info ginfo;
int r;
uint32_t tmp = 0;
#ifndef RADEON_INFO_FASTFB_WORKING
#define RADEON_INFO_FASTFB_WORKING 0x14
#endif
memset(&ginfo, 0, sizeof(ginfo));
ginfo.request = RADEON_INFO_FASTFB_WORKING;
ginfo.value = (uintptr_t)&tmp;
r = drmCommandWriteRead(info->dri2.drm_fd, DRM_RADEON_INFO, &ginfo, sizeof(ginfo));
if (r) {
return FALSE;
}
if (tmp == 1)
return TRUE;
return FALSE;
}
static Bool RADEONIsFusionGARTWorking(ScrnInfoPtr pScrn)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
@ -464,6 +486,12 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn)
return FALSE;
}
/* Check whether direct mapping is used for fast fb access*/
if (RADEONIsFastFBWorking(pScrn)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct mapping of fb aperture is enabled for fast fb access.\n");
info->is_fast_fb = TRUE;
}
if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE) ||
(!RADEONIsAccelWorking(pScrn))) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@ -839,7 +867,8 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
* with proper bit, in the meantime you need to set tiling option in
* xorg configuration files
*/
info->ChipFamily <= CHIP_FAMILY_ARUBA;
info->ChipFamily <= CHIP_FAMILY_ARUBA &&
!info->is_fast_fb;
/* 2D color tiling */
if (info->ChipFamily >= CHIP_FAMILY_R600) {
@ -935,8 +964,9 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
if (!info->use_glamor) {
info->exa_pixmaps = xf86ReturnOptValBool(info->Options,
OPTION_EXA_PIXMAPS,
((info->vram_size > (32 * 1024 * 1024) &&
info->RenderAccel)));
(info->vram_size > (32 * 1024 * 1024) &&
info->RenderAccel &&
!info->is_fast_fb));
if (info->exa_pixmaps)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"EXA: Driver will allow EXA pixmaps in VRAM\n");