Skip to content
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

Nv12 #90

Closed
wants to merge 2 commits into from
Closed

Nv12 #90

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc577fd
Allocate Tile4 for NV12 decoder
yhe39 Dec 18, 2023
1af15f0
Align the nv12 format on dg2 to 4
yhe39 Dec 18, 2023
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
18 changes: 18 additions & 0 deletions i915.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,13 @@ static int i915_align_dimensions(struct bo *bo, uint32_t tiling, uint32_t *strid
break;
}

if ((bo->meta.format == DRM_FORMAT_NV12) && (i915->genx10 >= 125) && (bo->meta.use_flags & (BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN))) {
vertical_alignment = 4;
}
else if ((bo->meta.format == DRM_FORMAT_NV12_Y_TILED_INTEL) && (i915->genx10 >= 125)) {
vertical_alignment = 32;
}

*aligned_height = ALIGN(*aligned_height, vertical_alignment);

#ifdef USE_GRALLOC1
Expand Down Expand Up @@ -595,12 +602,15 @@ static int i915_bo_from_format(struct bo *bo, uint32_t width, uint32_t height, u
uint32_t offset;
size_t plane;
int ret, pagesize;
struct i915_device *i915 = (struct i915_device *)bo->drv->priv;

offset = 0;
pagesize = getpagesize();
for (plane = 0; plane < drv_num_planes_from_format(format); plane++) {
uint32_t stride = drv_stride_from_format(format, width, plane);
uint32_t plane_height = drv_height_from_format(format, height, plane);
if ((format == DRM_FORMAT_NV12) && (i915->genx10 >= 125))
bo->meta.tiling = I915_TILING_4;

if (bo->meta.tiling != I915_TILING_NONE)
assert(IS_ALIGNED(offset, pagesize));
Expand All @@ -623,6 +633,7 @@ static int i915_bo_from_format(struct bo *bo, uint32_t width, uint32_t height, u
static int i915_bo_compute_metadata(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
uint64_t use_flags, const uint64_t *modifiers, uint32_t count)
{
struct i915_device *i915 = (struct i915_device *)bo->drv->priv;
static const uint64_t modifier_order[] = {
I915_FORMAT_MOD_Y_TILED,
I915_FORMAT_MOD_X_TILED,
Expand Down Expand Up @@ -660,6 +671,11 @@ static int i915_bo_compute_metadata(struct bo *bo, uint32_t width, uint32_t heig
break;
}

if ((format == DRM_FORMAT_NV12) && (i915->genx10 >= 125)) {
bo->meta.tiling = I915_TILING_4;
modifier = I915_FORMAT_MOD_4_TILED;
}

bo->meta.format_modifiers[0] = modifier;

if (format == DRM_FORMAT_YVU420_ANDROID) {
Expand Down Expand Up @@ -753,6 +769,8 @@ static int i915_bo_create_from_metadata(struct bo *bo)
struct i915_device *i915_dev = (struct i915_device *)bo->drv->priv;
int64_t use_flags = bo->meta.use_flags;
bool local = is_need_local(use_flags);
if ((i915_dev->genx10 >= 125) && (bo->meta.format == DRM_FORMAT_NV12) && (bo->meta.use_flags & (BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN)))
local = true;
if (local && i915_dev->has_local_mem) {
if (!is_prelim_kernel) {
/* All new BOs we get from the kernel are zeroed, so we don't need to
Expand Down
Loading