Skip to content

port patch (sw swizzle surface in vaGetImage) from master #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hongbolv wants to merge 1 commit into
base: intel-media-kbl
Choose a base branch
from
Open

port patch (sw swizzle surface in vaGetImage) from master #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 46 additions & 3 deletions media_driver/linux/common/ddi/media_libva.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4327,6 +4327,41 @@ VAStatus DdiMedia_SetImagePalette(
return VA_STATUS_ERROR_UNIMPLEMENTED;
}

VAStatus SwizzleSurface(PDDI_MEDIA_CONTEXT mediaCtx, PGMM_RESOURCE_INFO pGmmResInfo, void *pLockedAddr, uint32_t TileType, uint8_t* pResourceBase, bool bUpload)
{
uint32_t uiSize, uiPitch;
GMM_RES_COPY_BLT gmmResCopyBlt;
uint32_t uiPicHeight;
uint32_t ulSwizzledSize;
VAStatus vaStatus = VA_STATUS_SUCCESS;

DDI_CHK_NULL(pGmmResInfo, "pGmmResInfo is NULL", VA_STATUS_ERROR_OPERATION_FAILED);
DDI_CHK_NULL(pLockedAddr, "pLockedAddr is NULL", VA_STATUS_ERROR_OPERATION_FAILED);
DDI_CHK_NULL(pResourceBase, "pResourceBase is NULL", VA_STATUS_ERROR_ALLOCATION_FAILED);

memset(&gmmResCopyBlt, 0x0, sizeof(GMM_RES_COPY_BLT));
uiPicHeight = pGmmResInfo->GetBaseHeight();
uiSize = pGmmResInfo->GetSizeSurface();
uiPitch = pGmmResInfo->GetRenderPitch();
gmmResCopyBlt.Gpu.pData = pLockedAddr;
gmmResCopyBlt.Sys.pData = pResourceBase;
gmmResCopyBlt.Sys.RowPitch = uiPitch;
gmmResCopyBlt.Sys.BufferSize = uiSize;
gmmResCopyBlt.Sys.SlicePitch = uiSize;
gmmResCopyBlt.Blt.Slices = 1;
gmmResCopyBlt.Blt.Upload = bUpload;

if(mediaCtx->pGmmClientContext->IsPlanar(pGmmResInfo->GetResourceFormat()) == true)
{
gmmResCopyBlt.Blt.Width = pGmmResInfo->GetBaseWidth();
gmmResCopyBlt.Blt.Height = uiSize/uiPitch;
}

pGmmResInfo->CpuBlt(&gmmResCopyBlt);

return vaStatus;
}

//!
//! \brief Retrive surface data into a VAImage
//! \details Image must be in a format supported by the implementation
Expand Down Expand Up @@ -4424,7 +4459,7 @@ VAStatus DdiMedia_GetImage(
DDI_CHK_NULL(mediaSurface->bo, "nullptr mediaSurface->bo.", VA_STATUS_ERROR_INVALID_PARAMETER);

//Lock Surface
void *surfData = DdiMediaUtil_LockSurface(mediaSurface, (MOS_LOCKFLAG_READONLY | MOS_LOCKFLAG_WRITEONLY));
void *surfData = DdiMediaUtil_LockSurface(mediaSurface, (MOS_LOCKFLAG_READONLY | MOS_LOCKFLAG_NO_SWIZZLE));
if (surfData == nullptr)
{
DDI_ASSERTMESSAGE("nullptr surfData.");
Expand All @@ -4448,8 +4483,16 @@ VAStatus DdiMedia_GetImage(
}

//Copy data from surface to image
MOS_STATUS eStatus = MOS_SecureMemcpy(imageData, vaimg->data_size, surfData, vaimg->data_size);
if (eStatus != MOS_STATUS_SUCCESS)
if(mediaSurface->TileType == I915_TILING_NONE)
{
vaStatus = MOS_SecureMemcpy(imageData, vaimg->data_size, surfData, vaimg->data_size);
}
else
{
//Mos_SwizzleData((uint8_t*)surfData, (uint8_t *)imageData, (MOS_TILE_TYPE)mediaSurface->TileType, MOS_TILE_LINEAR, vaimg->data_size / mediaSurface->iPitch, mediaSurface->iPitch, mediaSurface->uiMapFlag);
vaStatus = SwizzleSurface(mediaSurface->pMediaCtx,mediaSurface->pGmmResourceInfo, surfData, (MOS_TILE_TYPE)mediaSurface->TileType, (uint8_t *)imageData, false);
}
if (vaStatus != MOS_STATUS_SUCCESS)
{
DDI_ASSERTMESSAGE("DDI:Failed to copy surface to image buffer data!");
DdiMediaUtil_UnlockSurface(mediaSurface);
Expand Down
2 changes: 2 additions & 0 deletions media_driver/linux/common/ddi/media_libva_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,8 @@ typedef struct _DDI_MEDIA_SURFACE
PMEDIA_SEM_T pReferenceFrameSemaphore; // to sync reference frame surface. when this semaphore is posted, the surface is not used as reference frame, and safe to be destroied

uint8_t *pSystemShadow; // Shadow surface in system memory

uint32_t uiMapFlag;
} DDI_MEDIA_SURFACE, *PDDI_MEDIA_SURFACE;

typedef struct _DDI_MEDIA_BUFFER
Expand Down
9 changes: 9 additions & 0 deletions media_driver/linux/common/ddi/media_libva_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,12 +884,17 @@ void* DdiMediaUtil_LockSurface(DDI_MEDIA_SURFACE *surface, uint32_t flag)
{
mos_gem_bo_map_gtt(surface->bo);
}
else if (flag & MOS_LOCKFLAG_NO_SWIZZLE)
{
mos_bo_map(surface->bo, flag & MOS_LOCKFLAG_READONLY);
}
else
{
mos_gem_bo_map_unsynchronized(surface->bo); // only call mmap_gtt ioctl
mos_gem_bo_start_gtt_access(surface->bo, 0); // set to GTT domain,0 means readonly
}
}
surface->uiMapFlag = flag;
surface->pData = surface->pSystemShadow ? surface->pSystemShadow : (uint8_t*) surface->bo->virt;
surface->bMapped = true;
}
Expand Down Expand Up @@ -944,6 +949,10 @@ void DdiMediaUtil_UnlockSurface(DDI_MEDIA_SURFACE *surface)

mos_bo_unmap(surface->bo);
}
else if(surface->uiMapFlag & MOS_LOCKFLAG_NO_SWIZZLE)
{
mos_bo_unmap(surface->bo);
}
else
{
mos_gem_bo_unmap_gtt(surface->bo);
Expand Down
2 changes: 2 additions & 0 deletions media_driver/linux/common/os/mos_os_specific.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ enum DdiSurfaceFormat
#define MOS_LOCKFLAG_WRITEONLY OSKM_LOCKFLAG_WRITEONLY
#define MOS_LOCKFLAG_READONLY OSKM_LOCKFLAG_READONLY
#define MOS_LOCKFLAG_NOOVERWRITE OSKM_LOCKFLAG_NOOVERWRITE
#define MOS_LOCKFLAG_NO_SWIZZLE OSKM_LOCKFLAG_NO_SWIZZLE

#define MOS_DIR_SEPERATOR '/'

Expand All @@ -117,6 +118,7 @@ enum DdiSurfaceFormat
#define OSKM_LOCKFLAG_WRITEONLY 0x00000001
#define OSKM_LOCKFLAG_READONLY 0x00000002
#define OSKM_LOCKFLAG_NOOVERWRITE 0x00000004
#define OSKM_LOCKFLAG_NO_SWIZZLE 0x00000008

// should be defined in libdrm, this is a temporary solution to pass QuickBuild
#define I915_EXEC_VEBOX (4<<0)
Expand Down