Skip to content

Commit

Permalink
drm/xe: Remove unused xe parameter
Browse files Browse the repository at this point in the history
Remove the xe parameter from the pde_encode_pat_index and
pte_encode_pat_index functions, as it is no longer used.

Signed-off-by: Himal Prasad Ghimiray <[email protected]>
Reviewed-by: Tejas Upadhyay <[email protected]>
Reviewed-by: Lucas De Marchi <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by: Lucas De Marchi <[email protected]>
  • Loading branch information
hghimira authored and lucasdemarchi committed Aug 13, 2024
1 parent 1d734a3 commit 4b498d1
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions drivers/gpu/drm/xe/xe_vm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ static const struct drm_gpuvm_ops gpuvm_ops = {
.vm_free = xe_vm_free,
};

static u64 pde_encode_pat_index(struct xe_device *xe, u16 pat_index)
static u64 pde_encode_pat_index(u16 pat_index)
{
u64 pte = 0;

Expand All @@ -1204,8 +1204,7 @@ static u64 pde_encode_pat_index(struct xe_device *xe, u16 pat_index)
return pte;
}

static u64 pte_encode_pat_index(struct xe_device *xe, u16 pat_index,
u32 pt_level)
static u64 pte_encode_pat_index(u16 pat_index, u32 pt_level)
{
u64 pte = 0;

Expand Down Expand Up @@ -1246,25 +1245,23 @@ static u64 pte_encode_ps(u32 pt_level)
static u64 xelp_pde_encode_bo(struct xe_bo *bo, u64 bo_offset,
const u16 pat_index)
{
struct xe_device *xe = xe_bo_device(bo);
u64 pde;

pde = xe_bo_addr(bo, bo_offset, XE_PAGE_SIZE);
pde |= XE_PAGE_PRESENT | XE_PAGE_RW;
pde |= pde_encode_pat_index(xe, pat_index);
pde |= pde_encode_pat_index(pat_index);

return pde;
}

static u64 xelp_pte_encode_bo(struct xe_bo *bo, u64 bo_offset,
u16 pat_index, u32 pt_level)
{
struct xe_device *xe = xe_bo_device(bo);
u64 pte;

pte = xe_bo_addr(bo, bo_offset, XE_PAGE_SIZE);
pte |= XE_PAGE_PRESENT | XE_PAGE_RW;
pte |= pte_encode_pat_index(xe, pat_index, pt_level);
pte |= pte_encode_pat_index(pat_index, pt_level);
pte |= pte_encode_ps(pt_level);

if (xe_bo_is_vram(bo) || xe_bo_is_stolen_devmem(bo))
Expand All @@ -1276,14 +1273,12 @@ static u64 xelp_pte_encode_bo(struct xe_bo *bo, u64 bo_offset,
static u64 xelp_pte_encode_vma(u64 pte, struct xe_vma *vma,
u16 pat_index, u32 pt_level)
{
struct xe_device *xe = xe_vma_vm(vma)->xe;

pte |= XE_PAGE_PRESENT;

if (likely(!xe_vma_read_only(vma)))
pte |= XE_PAGE_RW;

pte |= pte_encode_pat_index(xe, pat_index, pt_level);
pte |= pte_encode_pat_index(pat_index, pt_level);
pte |= pte_encode_ps(pt_level);

if (unlikely(xe_vma_is_null(vma)))
Expand All @@ -1303,7 +1298,7 @@ static u64 xelp_pte_encode_addr(struct xe_device *xe, u64 addr,

pte = addr;
pte |= XE_PAGE_PRESENT | XE_PAGE_RW;
pte |= pte_encode_pat_index(xe, pat_index, pt_level);
pte |= pte_encode_pat_index(pat_index, pt_level);
pte |= pte_encode_ps(pt_level);

if (devmem)
Expand Down

0 comments on commit 4b498d1

Please sign in to comment.