Skip to content

Commit

Permalink
drm/i915: Move the GGTT from i915 private data to the GT
Browse files Browse the repository at this point in the history 
GGTT was available both through i915->ggtt and gt->ggtt, and we
eventually want to get rid of the i915->ggtt one.
Move the GGTT from i915 to gt and use to_gt() for accesssing the
ggtt.

Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
  • Loading branch information
@intel-lab-lkp
Andi Shyti authored and intel-lab-lkp committed Dec 12, 2021
1 parent b38b29c commit 98ef49d
Show file tree
Hide file tree
Showing 62 changed files with 173 additions and 176 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/display/intel_fbc.c
View file
Expand Up @@ -595,7 +595,7 @@ static void ivb_fbc_activate(struct intel_fbc *fbc)
else if (DISPLAY_VER(i915) == 9)
skl_fbc_program_cfb_stride(fbc);

if (to_gt(i915)->ggtt->num_fences)
if (to_gt(i915)->ggtt.num_fences)
snb_fbc_program_fence(fbc);

intel_de_write(i915, ILK_DPFC_CONTROL,
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/display/intel_fbdev.c
View file
Expand Up @@ -180,7 +180,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
struct drm_device *dev = helper->dev;
struct drm_i915_private *dev_priv = to_i915(dev);
struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);
struct i915_ggtt *ggtt = to_gt(dev_priv)->ggtt;
struct i915_ggtt *ggtt = &to_gt(dev_priv)->ggtt;
const struct i915_ggtt_view view = {
.type = I915_GGTT_VIEW_NORMAL,
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/display/intel_plane_initial.c
View file
Expand Up @@ -94,7 +94,7 @@ initial_plane_vma(struct drm_i915_private *i915,
goto err_obj;
}

vma = i915_vma_instance(obj, &to_gt(i915)->ggtt->vm, NULL);
vma = i915_vma_instance(obj, &to_gt(i915)->ggtt.vm, NULL);
if (IS_ERR(vma))
goto err_obj;

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/gem/i915_gem_context.h
View file
Expand Up @@ -174,7 +174,7 @@ i915_gem_context_get_eb_vm(struct i915_gem_context *ctx)

vm = ctx->vm;
if (!vm)
vm = &to_gt(ctx->i915)->ggtt->vm;
vm = &to_gt(ctx->i915)->ggtt.vm;
vm = i915_vm_get(vm);

return vm;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
View file
Expand Up @@ -1106,7 +1106,7 @@ static inline struct i915_ggtt *cache_to_ggtt(struct reloc_cache *cache)
{
struct drm_i915_private *i915 =
container_of(cache, struct i915_execbuffer, reloc_cache)->i915;
return to_gt(i915)->ggtt;
return &to_gt(i915)->ggtt;
}

static void reloc_cache_reset(struct reloc_cache *cache, struct i915_execbuffer *eb)
Expand Down Expand Up @@ -2242,7 +2242,7 @@ static int eb_parse(struct i915_execbuffer *eb)
trampoline = shadow;

shadow = shadow_batch_pin(eb, pool->obj,
&eb->gt->ggtt->vm,
&eb->gt->ggtt.vm,
PIN_GLOBAL);
if (IS_ERR(shadow)) {
err = PTR_ERR(shadow);
Expand Down
19 changes: 10 additions & 9 deletions drivers/gpu/drm/i915/gem/i915_gem_mman.c
View file
Expand Up @@ -295,7 +295,7 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
struct drm_device *dev = obj->base.dev;
struct drm_i915_private *i915 = to_i915(dev);
struct intel_runtime_pm *rpm = &i915->runtime_pm;
struct i915_ggtt *ggtt = to_gt(i915)->ggtt;
struct i915_ggtt *ggtt = &to_gt(i915)->ggtt;
bool write = area->vm_flags & VM_WRITE;
struct i915_gem_ww_ctx ww;
intel_wakeref_t wakeref;
Expand Down Expand Up @@ -388,16 +388,16 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)
assert_rpm_wakelock_held(rpm);

/* Mark as being mmapped into userspace for later revocation */
mutex_lock(&to_gt(i915)->ggtt->vm.mutex);
mutex_lock(&to_gt(i915)->ggtt.vm.mutex);
if (!i915_vma_set_userfault(vma) && !obj->userfault_count++)
list_add(&obj->userfault_link, &to_gt(i915)->ggtt->userfault_list);
mutex_unlock(&to_gt(i915)->ggtt->vm.mutex);
list_add(&obj->userfault_link, &to_gt(i915)->ggtt.userfault_list);
mutex_unlock(&to_gt(i915)->ggtt.vm.mutex);

/* Track the mmo associated with the fenced vma */
vma->mmo = mmo;

if (CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)
intel_wakeref_auto(&to_gt(i915)->ggtt->userfault_wakeref,
intel_wakeref_auto(&to_gt(i915)->ggtt.userfault_wakeref,
msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND));

if (write) {
Expand Down Expand Up @@ -512,7 +512,7 @@ void i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj)
* wakeref.
*/
wakeref = intel_runtime_pm_get(&i915->runtime_pm);
mutex_lock(&to_gt(i915)->ggtt->vm.mutex);
mutex_lock(&to_gt(i915)->ggtt.vm.mutex);

if (!obj->userfault_count)
goto out;
Expand All @@ -530,7 +530,7 @@ void i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj)
wmb();

out:
mutex_unlock(&to_gt(i915)->ggtt->vm.mutex);
mutex_unlock(&to_gt(i915)->ggtt.vm.mutex);
intel_runtime_pm_put(&i915->runtime_pm, wakeref);
}

Expand Down Expand Up @@ -733,13 +733,14 @@ i915_gem_dumb_mmap_offset(struct drm_file *file,
u32 handle,
u64 *offset)
{
struct drm_i915_private *i915 = to_i915(dev);
enum i915_mmap_type mmap_type;

if (HAS_LMEM(to_i915(dev)))
mmap_type = I915_MMAP_TYPE_FIXED;
else if (boot_cpu_has(X86_FEATURE_PAT))
mmap_type = I915_MMAP_TYPE_WC;
else if (!i915_ggtt_has_aperture(&to_i915(dev)->ggtt))
else if (!i915_ggtt_has_aperture(&to_gt(i915)->ggtt))
return -ENODEV;
else
mmap_type = I915_MMAP_TYPE_GTT;
Expand Down Expand Up @@ -787,7 +788,7 @@ i915_gem_mmap_offset_ioctl(struct drm_device *dev, void *data,

switch (args->flags) {
case I915_MMAP_OFFSET_GTT:
if (!i915_ggtt_has_aperture(to_gt(i915)->ggtt))
if (!i915_ggtt_has_aperture(&to_gt(i915)->ggtt))
return -ENODEV;
type = I915_MMAP_TYPE_GTT;
break;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/gem/i915_gem_pm.c
View file
Expand Up @@ -23,7 +23,7 @@ void i915_gem_suspend(struct drm_i915_private *i915)
{
GEM_TRACE("%s\n", dev_name(i915->drm.dev));

intel_wakeref_auto(&to_gt(i915)->ggtt->userfault_wakeref, 0);
intel_wakeref_auto(&to_gt(i915)->ggtt.userfault_wakeref, 0);
flush_workqueue(i915->wq);

/*
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
View file
Expand Up @@ -403,9 +403,9 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr
I915_SHRINK_VMAPS);

/* We also want to clear any cached iomaps as they wrap vmap */
mutex_lock(&to_gt(i915)->ggtt->vm.mutex);
mutex_lock(&to_gt(i915)->ggtt.vm.mutex);
list_for_each_entry_safe(vma, next,
&to_gt(i915)->ggtt->vm.bound_list, vm_link) {
&to_gt(i915)->ggtt.vm.bound_list, vm_link) {
unsigned long count = vma->node.size >> PAGE_SHIFT;

if (!vma->iomap || i915_vma_is_active(vma))
Expand All @@ -414,7 +414,7 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr
if (__i915_vma_unbind(vma) == 0)
freed_pages += count;
}
mutex_unlock(&to_gt(i915)->ggtt->vm.mutex);
mutex_unlock(&to_gt(i915)->ggtt.vm.mutex);

*(unsigned long *)ptr += freed_pages;
return NOTIFY_DONE;
Expand Down
8 changes: 5 additions & 3 deletions drivers/gpu/drm/i915/gem/i915_gem_stolen.c
View file
Expand Up @@ -71,7 +71,7 @@ void i915_gem_stolen_remove_node(struct drm_i915_private *i915,
static int i915_adjust_stolen(struct drm_i915_private *i915,
struct resource *dsm)
{
struct i915_ggtt *ggtt = to_gt(i915)->ggtt;
struct i915_ggtt *ggtt = &to_gt(i915)->ggtt;
struct intel_uncore *uncore = ggtt->vm.gt->uncore;
struct resource *r;

Expand Down Expand Up @@ -579,14 +579,15 @@ i915_pages_create_for_stolen(struct drm_device *dev,

static int i915_gem_object_get_pages_stolen(struct drm_i915_gem_object *obj)
{
struct drm_i915_private *i915 = to_i915(obj->base.dev);
struct sg_table *pages =
i915_pages_create_for_stolen(obj->base.dev,
obj->stolen->start,
obj->stolen->size);
if (IS_ERR(pages))
return PTR_ERR(pages);

dbg_poison(&to_i915(obj->base.dev)->ggtt,
dbg_poison(&to_gt(i915)->ggtt,
sg_dma_address(pages->sgl),
sg_dma_len(pages->sgl),
POISON_INUSE);
Expand All @@ -599,9 +600,10 @@ static int i915_gem_object_get_pages_stolen(struct drm_i915_gem_object *obj)
static void i915_gem_object_put_pages_stolen(struct drm_i915_gem_object *obj,
struct sg_table *pages)
{
struct drm_i915_private *i915 = to_i915(obj->base.dev);
/* Should only be called from i915_gem_object_release_stolen() */

dbg_poison(&to_i915(obj->base.dev)->ggtt,
dbg_poison(&to_gt(i915)->ggtt,
sg_dma_address(pages->sgl),
sg_dma_len(pages->sgl),
POISON_FREE);
Expand Down
17 changes: 10 additions & 7 deletions drivers/gpu/drm/i915/gem/i915_gem_tiling.c
View file
Expand Up @@ -181,7 +181,8 @@ static int
i915_gem_object_fence_prepare(struct drm_i915_gem_object *obj,
int tiling_mode, unsigned int stride)
{
struct i915_ggtt *ggtt = &to_i915(obj->base.dev)->ggtt;
struct drm_i915_private *i915 = to_i915(obj->base.dev);
struct i915_ggtt *ggtt = &to_gt(i915)->ggtt;
struct i915_vma *vma, *vn;
LIST_HEAD(unbind);
int ret = 0;
Expand Down Expand Up @@ -336,7 +337,7 @@ i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
struct drm_i915_gem_object *obj;
int err;

if (!to_gt(dev_priv)->ggtt->num_fences)
if (!to_gt(dev_priv)->ggtt.num_fences)
return -EOPNOTSUPP;

obj = i915_gem_object_lookup(file, args->handle);
Expand All @@ -362,9 +363,11 @@ i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
args->stride = 0;
} else {
if (args->tiling_mode == I915_TILING_X)
args->swizzle_mode = to_i915(dev)->ggtt.bit_6_swizzle_x;
args->swizzle_mode =
to_gt(dev_priv)->ggtt.bit_6_swizzle_x;
else
args->swizzle_mode = to_i915(dev)->ggtt.bit_6_swizzle_y;
args->swizzle_mode =
to_gt(dev_priv)->ggtt.bit_6_swizzle_y;

/* Hide bit 17 swizzling from the user. This prevents old Mesa
* from aborting the application on sw fallbacks to bit 17,
Expand Down Expand Up @@ -419,7 +422,7 @@ i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
struct drm_i915_gem_object *obj;
int err = -ENOENT;

if (!to_gt(dev_priv)->ggtt->num_fences)
if (!to_gt(dev_priv)->ggtt.num_fences)
return -EOPNOTSUPP;

rcu_read_lock();
Expand All @@ -435,10 +438,10 @@ i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,

switch (args->tiling_mode) {
case I915_TILING_X:
args->swizzle_mode = to_gt(dev_priv)->ggtt->bit_6_swizzle_x;
args->swizzle_mode = to_gt(dev_priv)->ggtt.bit_6_swizzle_x;
break;
case I915_TILING_Y:
args->swizzle_mode = to_gt(dev_priv)->ggtt->bit_6_swizzle_y;
args->swizzle_mode = to_gt(dev_priv)->ggtt.bit_6_swizzle_y;
break;
default:
case I915_TILING_NONE:
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c
View file
Expand Up @@ -220,7 +220,7 @@ static u64 tiled_offset(const struct intel_gt *gt,
v += div64_u64_rem(x, 512, &x) << 12;
v += x;

swizzle = gt->ggtt->bit_6_swizzle_x;
swizzle = gt->ggtt.bit_6_swizzle_x;
} else {
const unsigned int ytile_span = 16;
const unsigned int ytile_height = 512;
Expand All @@ -230,7 +230,7 @@ static u64 tiled_offset(const struct intel_gt *gt,
v += div64_u64_rem(x, ytile_span, &x) * ytile_height;
v += x;

swizzle = gt->ggtt->bit_6_swizzle_y;
swizzle = gt->ggtt.bit_6_swizzle_y;
}

switch (swizzle) {
Expand Down Expand Up @@ -543,7 +543,7 @@ static bool has_bit17_swizzle(int sw)

static bool bad_swizzling(struct drm_i915_private *i915)
{
struct i915_ggtt *ggtt = to_gt(i915)->ggtt;
struct i915_ggtt *ggtt = &to_gt(i915)->ggtt;

if (i915->quirks & QUIRK_PIN_SWIZZLED_PAGES)
return true;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c
View file
Expand Up @@ -265,7 +265,7 @@ static bool needs_fence_registers(struct context *ctx)
if (intel_gt_is_wedged(gt))
return false;

return gt->ggtt->num_fences;
return gt->ggtt.num_fences;
}

static bool needs_mi_store_dword(struct context *ctx)
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
View file
Expand Up @@ -1374,7 +1374,7 @@ static int igt_ctx_readonly(void *arg)
goto out_file;
}

vm = ctx->vm ?: &to_gt(i915)->ggtt->alias->vm;
vm = ctx->vm ?: &to_gt(i915)->ggtt.alias->vm;
if (!vm || !vm->has_read_only) {
err = 0;
goto out_file;
Expand Down Expand Up @@ -1637,7 +1637,7 @@ static int read_from_scratch(struct i915_gem_context *ctx,
const u32 reg = engine->mmio_base + 0x420;

/* hsw: register access even to 3DPRIM! is protected */
vm = i915_vm_get(&engine->gt->ggtt->vm);
vm = i915_vm_get(&engine->gt->ggtt.vm);
vma = i915_vma_instance(obj, vm, NULL);
if (IS_ERR(vma)) {
err = PTR_ERR(vma);
Expand Down
21 changes: 11 additions & 10 deletions drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
View file
Expand Up @@ -307,7 +307,7 @@ static int igt_partial_tiling(void *arg)
int tiling;
int err;

if (!i915_ggtt_has_aperture(to_gt(i915)->ggtt))
if (!i915_ggtt_has_aperture(&to_gt(i915)->ggtt))
return 0;

/* We want to check the page mapping and fencing of a large object
Expand All @@ -320,7 +320,7 @@ static int igt_partial_tiling(void *arg)

obj = huge_gem_object(i915,
nreal << PAGE_SHIFT,
(1 + next_prime_number(to_gt(i915)->ggtt->vm.total >> PAGE_SHIFT)) << PAGE_SHIFT);
(1 + next_prime_number(to_gt(i915)->ggtt.vm.total >> PAGE_SHIFT)) << PAGE_SHIFT);
if (IS_ERR(obj))
return PTR_ERR(obj);

Expand Down Expand Up @@ -366,10 +366,10 @@ static int igt_partial_tiling(void *arg)
tile.tiling = tiling;
switch (tiling) {
case I915_TILING_X:
tile.swizzle = to_gt(i915)->ggtt->bit_6_swizzle_x;
tile.swizzle = to_gt(i915)->ggtt.bit_6_swizzle_x;
break;
case I915_TILING_Y:
tile.swizzle = to_gt(i915)->ggtt->bit_6_swizzle_y;
tile.swizzle = to_gt(i915)->ggtt.bit_6_swizzle_y;
break;
}

Expand Down Expand Up @@ -440,7 +440,7 @@ static int igt_smoke_tiling(void *arg)
IGT_TIMEOUT(end);
int err;

if (!i915_ggtt_has_aperture(to_gt(i915)->ggtt))
if (!i915_ggtt_has_aperture(&to_gt(i915)->ggtt))
return 0;

/*
Expand All @@ -457,7 +457,7 @@ static int igt_smoke_tiling(void *arg)

obj = huge_gem_object(i915,
nreal << PAGE_SHIFT,
(1 + next_prime_number(to_gt(i915)->ggtt->vm.total >> PAGE_SHIFT)) << PAGE_SHIFT);
(1 + next_prime_number(to_gt(i915)->ggtt.vm.total >> PAGE_SHIFT)) << PAGE_SHIFT);
if (IS_ERR(obj))
return PTR_ERR(obj);

Expand Down Expand Up @@ -486,10 +486,10 @@ static int igt_smoke_tiling(void *arg)
break;

case I915_TILING_X:
tile.swizzle = to_gt(i915)->ggtt->bit_6_swizzle_x;
tile.swizzle = to_gt(i915)->ggtt.bit_6_swizzle_x;
break;
case I915_TILING_Y:
tile.swizzle = to_gt(i915)->ggtt->bit_6_swizzle_y;
tile.swizzle = to_gt(i915)->ggtt.bit_6_swizzle_y;
break;
}

Expand Down Expand Up @@ -534,7 +534,7 @@ static int make_obj_busy(struct drm_i915_gem_object *obj)
struct i915_gem_ww_ctx ww;
int err;

vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL);
vma = i915_vma_instance(obj, &engine->gt->ggtt.vm, NULL);
if (IS_ERR(vma))
return PTR_ERR(vma);

Expand Down Expand Up @@ -856,6 +856,7 @@ static int wc_check(struct drm_i915_gem_object *obj)

static bool can_mmap(struct drm_i915_gem_object *obj, enum i915_mmap_type type)
{
struct drm_i915_private *i915 = to_i915(obj->base.dev);
bool no_map;

if (obj->ops->mmap_offset)
Expand All @@ -864,7 +865,7 @@ static bool can_mmap(struct drm_i915_gem_object *obj, enum i915_mmap_type type)
return false;

if (type == I915_MMAP_TYPE_GTT &&
!i915_ggtt_has_aperture(&to_i915(obj->base.dev)->ggtt))
!i915_ggtt_has_aperture(&to_gt(i915)->ggtt))
return false;

i915_gem_object_lock(obj, NULL);
Expand Down

0 comments on commit 98ef49d

Please sign in to comment.