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

Factor out radeon_surface_initialize helper

Browse Source 
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2018-05-28 18:35:32 +02:00
committed by Michel Dänzer
parent ba5d5402b3
commit 5da2bf43e6
4 changed files with 132 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/drmmode_display.c
View File

@@ -116,7 +116,6 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
RADEONInfoPtr info = RADEONPTR(pScrn); RADEONInfoPtr info = RADEONPTR(pScrn);
ScreenPtr pScreen = pScrn->pScreen; ScreenPtr pScreen = pScrn->pScreen;
PixmapPtr pixmap; PixmapPtr pixmap;
uint32_t tiling;
pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth, pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth,
RADEON_CREATE_PIXMAP_SCANOUT); RADEON_CREATE_PIXMAP_SCANOUT);
@@ -137,37 +136,8 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
if (info->surf_man && !info->use_glamor) { if (info->surf_man && !info->use_glamor) {
struct radeon_surface *surface = radeon_get_pixmap_surface(pixmap); struct radeon_surface *surface = radeon_get_pixmap_surface(pixmap);
memset(surface, 0, sizeof(struct radeon_surface)); if (!radeon_surface_initialize(info, surface, width, height, bpp / 8,
surface->npix_x = width; radeon_get_pixmap_tiling_flags(pixmap), 0))
surface->npix_y = height;
surface->npix_z = 1;
surface->blk_w = 1;
surface->blk_h = 1;
surface->blk_d = 1;
surface->array_size = 1;
surface->last_level = 0;
surface->bpe = bpp / 8;
surface->nsamples = 1;
surface->flags = RADEON_SURF_SCANOUT;
/* we are requiring a recent enough libdrm version */
surface->flags |= RADEON_SURF_HAS_TILE_MODE_INDEX;
surface->flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE);
surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR_ALIGNED, MODE);
tiling = radeon_get_pixmap_tiling_flags(pixmap);
if (tiling & RADEON_TILING_MICRO) {
surface->flags = RADEON_SURF_CLR(surface->flags, MODE);
surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_1D, MODE);
}
if (tiling & RADEON_TILING_MACRO) {
surface->flags = RADEON_SURF_CLR(surface->flags, MODE);
surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_2D, MODE);
}
if (radeon_surface_best(info->surf_man, surface))
goto fail;
if (radeon_surface_init(info->surf_man, surface))
goto fail; goto fail;
} }
@@ -2301,36 +2271,10 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
base_align = 4096; base_align = 4096;
if (info->surf_man) { if (info->surf_man) {
memset(&surface, 0, sizeof(struct radeon_surface)); if (!radeon_surface_initialize(info, &surface, width, height,
surface.npix_x = width; cpp, tiling_flags, 0))
surface.npix_y = height;
surface.npix_z = 1;
surface.blk_w = 1;
surface.blk_h = 1;
surface.blk_d = 1;
surface.array_size = 1;
surface.last_level = 0;
surface.bpe = cpp;
surface.nsamples = 1;
surface.flags = RADEON_SURF_SCANOUT;
/* we are requiring a recent enough libdrm version */
surface.flags |= RADEON_SURF_HAS_TILE_MODE_INDEX;
surface.flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE);
surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR_ALIGNED, MODE);
if (tiling_flags & RADEON_TILING_MICRO) {
surface.flags = RADEON_SURF_CLR(surface.flags, MODE);
surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_1D, MODE);
}
if (tiling_flags & RADEON_TILING_MACRO) {
surface.flags = RADEON_SURF_CLR(surface.flags, MODE);
surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_2D, MODE);
}
if (radeon_surface_best(info->surf_man, &surface)) {
return FALSE; return FALSE;
}
if (radeon_surface_init(info->surf_man, &surface)) {
return FALSE;
}
screen_size = surface.bo_size; screen_size = surface.bo_size;
base_align = surface.bo_alignment; base_align = surface.bo_alignment;
pitch = surface.level[0].pitch_bytes; pitch = surface.level[0].pitch_bytes;

5
src/radeon.h
View File

@@ -643,6 +643,11 @@ extern void RADEONInit3DEngine(ScrnInfoPtr pScrn);
extern int radeon_cs_space_remaining(ScrnInfoPtr pScrn); extern int radeon_cs_space_remaining(ScrnInfoPtr pScrn);
/* radeon_bo_helper.c */ /* radeon_bo_helper.c */
extern Bool
radeon_surface_initialize(RADEONInfoPtr info, struct radeon_surface *surface,
int width, int height, int cpp, uint32_t tiling_flags,
int usage_hint);
extern Bool radeon_get_pixmap_handle(PixmapPtr pixmap, uint32_t *handle); extern Bool radeon_get_pixmap_handle(PixmapPtr pixmap, uint32_t *handle);
/* radeon_commonfuncs.c */ /* radeon_commonfuncs.c */

233
src/radeon_bo_helper.c
View File

@@ -59,6 +59,89 @@ static Bool RADEONMacroSwitch(int width, int height, int bpp,
} }
} }
static unsigned eg_tile_split_opp(unsigned tile_split)
{
switch (tile_split) {
case 0: tile_split = 64; break;
case 1: tile_split = 128; break;
case 2: tile_split = 256; break;
case 3: tile_split = 512; break;
default:
case 4: tile_split = 1024; break;
case 5: tile_split = 2048; break;
case 6: tile_split = 4096; break;
}
return tile_split;
}
Bool
radeon_surface_initialize(RADEONInfoPtr info, struct radeon_surface *surface,
int width, int height, int cpp, uint32_t tiling_flags,
int usage_hint)
{
memset(surface, 0, sizeof(struct radeon_surface));
surface->npix_x = width;
/* need to align height to 8 for old kernel */
surface->npix_y = RADEON_ALIGN(height, 8);
surface->npix_z = 1;
surface->blk_w = 1;
surface->blk_h = 1;
surface->blk_d = 1;
surface->array_size = 1;
surface->last_level = 0;
surface->bpe = cpp;
surface->nsamples = 1;
if (height < 128) {
/* disable 2d tiling for small surface to work around
* the fact that ddx align height to 8 pixel for old
* obscure reason i can't remember
*/
tiling_flags &= ~RADEON_TILING_MACRO;
}
surface->flags = RADEON_SURF_SCANOUT | RADEON_SURF_HAS_TILE_MODE_INDEX |
RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE);
if (usage_hint & RADEON_CREATE_PIXMAP_SZBUFFER) {
surface->flags |= RADEON_SURF_ZBUFFER;
surface->flags |= RADEON_SURF_SBUFFER;
}
if ((tiling_flags & RADEON_TILING_MACRO)) {
surface->flags = RADEON_SURF_CLR(surface->flags, MODE);
surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_2D, MODE);
} else if ((tiling_flags & RADEON_TILING_MICRO)) {
surface->flags = RADEON_SURF_CLR(surface->flags, MODE);
surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_1D, MODE);
} else
surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR, MODE);
if (info->ChipFamily >= CHIP_FAMILY_CEDAR) {
surface->bankw = (tiling_flags >> RADEON_TILING_EG_BANKW_SHIFT) &
RADEON_TILING_EG_BANKW_MASK;
surface->bankh = (tiling_flags >> RADEON_TILING_EG_BANKH_SHIFT) &
RADEON_TILING_EG_BANKH_MASK;
surface->tile_split = eg_tile_split_opp((tiling_flags >> RADEON_TILING_EG_TILE_SPLIT_SHIFT) &
RADEON_TILING_EG_TILE_SPLIT_MASK);
if (surface->flags & RADEON_SURF_SBUFFER) {
surface->stencil_tile_split =
(tiling_flags >> RADEON_TILING_EG_STENCIL_TILE_SPLIT_SHIFT) &
RADEON_TILING_EG_STENCIL_TILE_SPLIT_MASK;
}
surface->mtilea = (tiling_flags >> RADEON_TILING_EG_MACRO_TILE_ASPECT_SHIFT) &
RADEON_TILING_EG_MACRO_TILE_ASPECT_MASK;
}
if (radeon_surface_best(info->surf_man, surface))
return FALSE;
if (radeon_surface_init(info->surf_man, surface))
return FALSE;
return TRUE;
}
/* Calculate appropriate tiling and pitch for a pixmap and allocate a BO that /* Calculate appropriate tiling and pitch for a pixmap and allocate a BO that
* can hold it. * can hold it.
*/ */
@@ -108,77 +191,37 @@ radeon_alloc_pixmap_bo(ScrnInfoPtr pScrn, int width, int height, int depth,
base_align = drmmode_get_base_align(pScrn, cpp, tiling); base_align = drmmode_get_base_align(pScrn, cpp, tiling);
size = RADEON_ALIGN(heighta * pitch, RADEON_GPU_PAGE_SIZE); size = RADEON_ALIGN(heighta * pitch, RADEON_GPU_PAGE_SIZE);
if (info->surf_man) { if (width && info->surf_man) {
memset(&surface, 0, sizeof(struct radeon_surface)); if (!radeon_surface_initialize(info, &surface, width, height, cpp,
tiling, usage_hint))
return NULL;
if (width) { size = surface.bo_size;
surface.npix_x = width; base_align = surface.bo_alignment;
/* need to align height to 8 for old kernel */ pitch = surface.level[0].pitch_bytes;
surface.npix_y = RADEON_ALIGN(height, 8); tiling = 0;
surface.npix_z = 1; switch (surface.level[0].mode) {
surface.blk_w = 1; case RADEON_SURF_MODE_2D:
surface.blk_h = 1; tiling |= RADEON_TILING_MACRO;
surface.blk_d = 1; tiling |= surface.bankw << RADEON_TILING_EG_BANKW_SHIFT;
surface.array_size = 1; tiling |= surface.bankh << RADEON_TILING_EG_BANKH_SHIFT;
surface.last_level = 0; tiling |= surface.mtilea << RADEON_TILING_EG_MACRO_TILE_ASPECT_SHIFT;
surface.bpe = cpp; if (surface.tile_split)
surface.nsamples = 1; tiling |= eg_tile_split(surface.tile_split) << RADEON_TILING_EG_TILE_SPLIT_SHIFT;
if (height < 128) { if (surface.flags & RADEON_SURF_SBUFFER)
/* disable 2d tiling for small surface to work around tiling |= eg_tile_split(surface.stencil_tile_split) << RADEON_TILING_EG_STENCIL_TILE_SPLIT_SHIFT;
* the fact that ddx align height to 8 pixel for old break;
* obscure reason i can't remember case RADEON_SURF_MODE_1D:
*/ tiling |= RADEON_TILING_MICRO;
tiling &= ~RADEON_TILING_MACRO; break;
} default:
surface.flags = RADEON_SURF_SCANOUT; break;
/* we are requiring a recent enough libdrm version */
surface.flags |= RADEON_SURF_HAS_TILE_MODE_INDEX;
surface.flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE);
surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR, MODE);
if ((tiling & RADEON_TILING_MICRO)) {
surface.flags = RADEON_SURF_CLR(surface.flags, MODE);
surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_1D, MODE);
}
if ((tiling & RADEON_TILING_MACRO)) {
surface.flags = RADEON_SURF_CLR(surface.flags, MODE);
surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_2D, MODE);
}
if (usage_hint & RADEON_CREATE_PIXMAP_SZBUFFER) {
surface.flags |= RADEON_SURF_ZBUFFER;
surface.flags |= RADEON_SURF_SBUFFER;
}
if (radeon_surface_best(info->surf_man, &surface)) {
return NULL;
}
if (radeon_surface_init(info->surf_man, &surface)) {
return NULL;
}
size = surface.bo_size;
base_align = surface.bo_alignment;
pitch = surface.level[0].pitch_bytes;
tiling = 0;
switch (surface.level[0].mode) {
case RADEON_SURF_MODE_2D:
tiling |= RADEON_TILING_MACRO;
tiling |= surface.bankw << RADEON_TILING_EG_BANKW_SHIFT;
tiling |= surface.bankh << RADEON_TILING_EG_BANKH_SHIFT;
tiling |= surface.mtilea << RADEON_TILING_EG_MACRO_TILE_ASPECT_SHIFT;
if (surface.tile_split)
tiling |= eg_tile_split(surface.tile_split) << RADEON_TILING_EG_TILE_SPLIT_SHIFT;
tiling |= eg_tile_split(surface.stencil_tile_split) << RADEON_TILING_EG_STENCIL_TILE_SPLIT_SHIFT;
break;
case RADEON_SURF_MODE_1D:
tiling |= RADEON_TILING_MICRO;
break;
default:
break;
}
}
if (new_surface)
*new_surface = surface;
} }
if (new_surface)
*new_surface = surface;
}
if (tiling) if (tiling)
flags |= RADEON_GEM_NO_CPU_ACCESS; flags |= RADEON_GEM_NO_CPU_ACCESS;
@@ -308,21 +351,6 @@ Bool radeon_share_pixmap_backing(struct radeon_bo *bo, void **handle_p)
return TRUE; return TRUE;
} }
static unsigned eg_tile_split_opp(unsigned tile_split)
{
switch (tile_split) {
case 0: tile_split = 64; break;
case 1: tile_split = 128; break;
case 2: tile_split = 256; break;
case 3: tile_split = 512; break;
default:
case 4: tile_split = 1024; break;
case 5: tile_split = 2048; break;
case 6: tile_split = 4096; break;
}
return tile_split;
}
Bool radeon_set_shared_pixmap_backing(PixmapPtr ppix, void *fd_handle, Bool radeon_set_shared_pixmap_backing(PixmapPtr ppix, void *fd_handle,
struct radeon_surface *surface) struct radeon_surface *surface)
{ {
@@ -348,39 +376,14 @@ Bool radeon_set_shared_pixmap_backing(PixmapPtr ppix, void *fd_handle,
driver_priv = exaGetPixmapDriverPrivate(ppix); driver_priv = exaGetPixmapDriverPrivate(ppix);
tiling_flags = driver_priv->tiling_flags; tiling_flags = driver_priv->tiling_flags;
memset(surface, 0, sizeof(struct radeon_surface)); if (!radeon_surface_initialize(info, surface, ppix->drawable.width,
ppix->drawable.height,
ppix->drawable.bitsPerPixel / 8,
tiling_flags, 0)) {
ret = FALSE;
goto error;
}
surface->npix_x = ppix->drawable.width;
surface->npix_y = ppix->drawable.height;
surface->npix_z = 1;
surface->blk_w = 1;
surface->blk_h = 1;
surface->blk_d = 1;
surface->array_size = 1;
surface->bpe = ppix->drawable.bitsPerPixel / 8;
surface->nsamples = 1;
/* we are requiring a recent enough libdrm version */
surface->flags |= RADEON_SURF_HAS_TILE_MODE_INDEX;
surface->flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE);
if (tiling_flags & RADEON_TILING_MACRO)
surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_2D, MODE);
else if (tiling_flags & RADEON_TILING_MICRO)
surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_1D, MODE);
else
surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR_ALIGNED, MODE);
surface->bankw = (tiling_flags >> RADEON_TILING_EG_BANKW_SHIFT) & RADEON_TILING_EG_BANKW_MASK;
surface->bankh = (tiling_flags >> RADEON_TILING_EG_BANKH_SHIFT) & RADEON_TILING_EG_BANKH_MASK;
surface->tile_split = eg_tile_split_opp((tiling_flags >> RADEON_TILING_EG_TILE_SPLIT_SHIFT) & RADEON_TILING_EG_TILE_SPLIT_MASK);
surface->stencil_tile_split = (tiling_flags >> RADEON_TILING_EG_STENCIL_TILE_SPLIT_SHIFT) & RADEON_TILING_EG_STENCIL_TILE_SPLIT_MASK;
surface->mtilea = (tiling_flags >> RADEON_TILING_EG_MACRO_TILE_ASPECT_SHIFT) & RADEON_TILING_EG_MACRO_TILE_ASPECT_MASK;
if (radeon_surface_best(info->surf_man, surface)) {
ret = FALSE;
goto error;
}
if (radeon_surface_init(info->surf_man, surface)) {
ret = FALSE;
goto error;
}
/* we have to post hack the surface to reflect the actual size /* we have to post hack the surface to reflect the actual size
of the shared pixmap */ of the shared pixmap */
surface->level[0].pitch_bytes = ppix->devKind; surface->level[0].pitch_bytes = ppix->devKind;

35
src/radeon_kms.c
View File

@@ -2702,38 +2702,11 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen)
screen_size = RADEON_ALIGN(pScrn->virtualY, drmmode_get_height_align(pScrn, tiling_flags)) * pitch; screen_size = RADEON_ALIGN(pScrn->virtualY, drmmode_get_height_align(pScrn, tiling_flags)) * pitch;
base_align = drmmode_get_base_align(pScrn, cpp, tiling_flags); base_align = drmmode_get_base_align(pScrn, cpp, tiling_flags);
if (info->surf_man) { if (info->surf_man) {
memset(&surface, 0, sizeof(struct radeon_surface)); if (!radeon_surface_initialize(info, &surface, pScrn->virtualX,
surface.npix_x = pScrn->virtualX; pScrn->virtualY, cpp,
surface.npix_y = pScrn->virtualY; tiling_flags, 0)) {
surface.npix_z = 1;
surface.blk_w = 1;
surface.blk_h = 1;
surface.blk_d = 1;
surface.array_size = 1;
surface.last_level = 0;
surface.bpe = cpp;
surface.nsamples = 1;
surface.flags = RADEON_SURF_SCANOUT;
/* we are requiring a recent enough libdrm version */
surface.flags |= RADEON_SURF_HAS_TILE_MODE_INDEX;
surface.flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE);
surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR_ALIGNED, MODE);
if (tiling_flags & RADEON_TILING_MICRO) {
surface.flags = RADEON_SURF_CLR(surface.flags, MODE);
surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_1D, MODE);
}
if (tiling_flags & RADEON_TILING_MACRO) {
surface.flags = RADEON_SURF_CLR(surface.flags, MODE);
surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_2D, MODE);
}
if (radeon_surface_best(info->surf_man, &surface)) {
xf86DrvMsg(pScreen->myNum, X_ERROR, xf86DrvMsg(pScreen->myNum, X_ERROR,
"radeon_surface_best failed\n"); "radeon_surface_initialize failed\n");
return FALSE;
}
if (radeon_surface_init(info->surf_man, &surface)) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"radeon_surface_init failed\n");
return FALSE; return FALSE;
} }
pitch = surface.level[0].pitch_bytes; pitch = surface.level[0].pitch_bytes;