Commit ab53497b authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Rename i915_hw_ppgtt to i915_ppgtt 



Keeping the _hw_ in there does not help to distinguish it from its
only brethren i915_ggtt, so drop it.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190611091238.15808-2-chris@chris-wilson.co.uk
parent e568ac38

drivers/gpu/drm/i915/gem/i915_gem_context.c

+4 −4
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ i915_gem_create_context(struct drm_i915_private *dev_priv, unsigned int flags) 
		return ctx;



	if (HAS_FULL_PPGTT(dev_priv)) {

		struct i915_hw_ppgtt *ppgtt;

		struct i915_ppgtt *ppgtt;



		ppgtt = i915_ppgtt_create(dev_priv);

		if (IS_ERR(ppgtt)) {
@@ -818,7 +818,7 @@ int i915_gem_vm_create_ioctl(struct drm_device *dev, void *data, 
	struct drm_i915_private *i915 = to_i915(dev);

	struct drm_i915_gem_vm_control *args = data;

	struct drm_i915_file_private *file_priv = file->driver_priv;

	struct i915_hw_ppgtt *ppgtt;

	struct i915_ppgtt *ppgtt;

	int err;



	if (!HAS_FULL_PPGTT(i915))
@@ -1037,7 +1037,7 @@ static int emit_ppgtt_update(struct i915_request *rq, void *data) 
	int i;



	if (i915_vm_is_4lvl(vm)) {

		struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);

		struct i915_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);

		const dma_addr_t pd_daddr = px_dma(&ppgtt->pml4);



		cs = intel_ring_begin(rq, 6);
@@ -1054,7 +1054,7 @@ static int emit_ppgtt_update(struct i915_request *rq, void *data) 
		*cs++ = MI_NOOP;

		intel_ring_advance(rq, cs);

	} else if (HAS_LOGICAL_RING_CONTEXTS(engine->i915)) {

		struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);

		struct i915_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);



		cs = intel_ring_begin(rq, 4 * GEN8_3LVL_PDPES + 2);

		if (IS_ERR(cs))

drivers/gpu/drm/i915/gem/selftests/huge_pages.c

+6 −6
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static int igt_check_page_sizes(struct i915_vma *vma) 


static int igt_mock_exhaust_device_supported_pages(void *arg)

{

	struct i915_hw_ppgtt *ppgtt = arg;

	struct i915_ppgtt *ppgtt = arg;

	struct drm_i915_private *i915 = ppgtt->vm.i915;

	unsigned int saved_mask = INTEL_INFO(i915)->page_sizes;

	struct drm_i915_gem_object *obj;
@@ -447,7 +447,7 @@ out_device: 


static int igt_mock_ppgtt_misaligned_dma(void *arg)

{

	struct i915_hw_ppgtt *ppgtt = arg;

	struct i915_ppgtt *ppgtt = arg;

	struct drm_i915_private *i915 = ppgtt->vm.i915;

	unsigned long supported = INTEL_INFO(i915)->page_sizes;

	struct drm_i915_gem_object *obj;
@@ -575,7 +575,7 @@ out_put: 
}



static void close_object_list(struct list_head *objects,

			      struct i915_hw_ppgtt *ppgtt)

			      struct i915_ppgtt *ppgtt)

{

	struct drm_i915_gem_object *obj, *on;
@@ -595,7 +595,7 @@ static void close_object_list(struct list_head *objects, 


static int igt_mock_ppgtt_huge_fill(void *arg)

{

	struct i915_hw_ppgtt *ppgtt = arg;

	struct i915_ppgtt *ppgtt = arg;

	struct drm_i915_private *i915 = ppgtt->vm.i915;

	unsigned long max_pages = ppgtt->vm.total >> PAGE_SHIFT;

	unsigned long page_num;
@@ -716,7 +716,7 @@ static int igt_mock_ppgtt_huge_fill(void *arg) 


static int igt_mock_ppgtt_64K(void *arg)

{

	struct i915_hw_ppgtt *ppgtt = arg;

	struct i915_ppgtt *ppgtt = arg;

	struct drm_i915_private *i915 = ppgtt->vm.i915;

	struct drm_i915_gem_object *obj;

	const struct object_info {
@@ -1683,7 +1683,7 @@ int i915_gem_huge_page_mock_selftests(void) 
		SUBTEST(igt_mock_ppgtt_64K),

	};

	struct drm_i915_private *dev_priv;

	struct i915_hw_ppgtt *ppgtt;

	struct i915_ppgtt *ppgtt;

	int err;



	dev_priv = mock_gem_device();

drivers/gpu/drm/i915/gem/selftests/mock_context.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ mock_context(struct drm_i915_private *i915, 
		goto err_engines;



	if (name) {

		struct i915_hw_ppgtt *ppgtt;

		struct i915_ppgtt *ppgtt;



		ctx->name = kstrdup(name, GFP_KERNEL);

		if (!ctx->name)

drivers/gpu/drm/i915/gt/intel_lrc.c

+2 −2
Original line number Diff line number Diff line
@@ -1621,7 +1621,7 @@ static int gen8_emit_init_breadcrumb(struct i915_request *rq) 
static int emit_pdps(struct i915_request *rq)

{

	const struct intel_engine_cs * const engine = rq->engine;

	struct i915_hw_ppgtt * const ppgtt =

	struct i915_ppgtt * const ppgtt =

		i915_vm_to_ppgtt(rq->gem_context->vm);

	int err, i;

	u32 *cs;
@@ -2825,7 +2825,7 @@ static void execlists_init_reg_state(u32 *regs, 
				     struct intel_engine_cs *engine,

				     struct intel_ring *ring)

{

	struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(ce->gem_context->vm);

	struct i915_ppgtt *ppgtt = i915_vm_to_ppgtt(ce->gem_context->vm);

	bool rcs = engine->class == RENDER_CLASS;

	u32 base = engine->mmio_base;

drivers/gpu/drm/i915/gt/intel_ringbuffer.c

+2 −3
Original line number Diff line number Diff line
@@ -1508,8 +1508,7 @@ static const struct intel_context_ops ring_context_ops = { 
	.destroy = ring_context_destroy,

};



static int load_pd_dir(struct i915_request *rq,

		       const struct i915_hw_ppgtt *ppgtt)

static int load_pd_dir(struct i915_request *rq, const struct i915_ppgtt *ppgtt)

{

	const struct intel_engine_cs * const engine = rq->engine;

	u32 *cs;
@@ -1713,7 +1712,7 @@ static int switch_context(struct i915_request *rq) 
	GEM_BUG_ON(HAS_EXECLISTS(rq->i915));



	if (vm) {

		struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);

		struct i915_ppgtt *ppgtt = i915_vm_to_ppgtt(vm);

		int loops;



		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE