Commit 2c86e55d authored by Matthew Auld's avatar Matthew Auld Committed by Chris Wilson
Browse files

drm/i915/gtt: split up i915_gem_gtt 



Attempt to split i915_gem_gtt.[ch] into more manageable chunks.

Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200107134009.3255354-1-chris@chris-wilson.co.uk
parent 7807a76b

drivers/gpu/drm/i915/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ gt-y += \ 
	gt/debugfs_engines.o \

	gt/debugfs_gt.o \

	gt/debugfs_gt_pm.o \

	gt/gen6_ppgtt.o \

	gt/gen8_ppgtt.o \

	gt/intel_breadcrumbs.o \

	gt/intel_context.o \

	gt/intel_engine_cs.o \
@@ -81,14 +83,17 @@ gt-y += \ 
	gt/intel_engine_pm.o \

	gt/intel_engine_pool.o \

	gt/intel_engine_user.o \

	gt/intel_ggtt.o \

	gt/intel_gt.o \

	gt/intel_gt_irq.o \

	gt/intel_gt_pm.o \

	gt/intel_gt_pm_irq.o \

	gt/intel_gt_requests.o \

	gt/intel_gtt.o \

	gt/intel_llc.o \

	gt/intel_lrc.o \

	gt/intel_mocs.o \

	gt/intel_ppgtt.o \

	gt/intel_rc6.o \

	gt/intel_renderstate.o \

	gt/intel_reset.o \

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

+3 −2
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 


#include <drm/i915_drm.h>



#include "gt/gen6_ppgtt.h"

#include "gt/intel_context.h"

#include "gt/intel_engine_heartbeat.h"

#include "gt/intel_engine_pm.h"
@@ -705,7 +706,7 @@ i915_gem_create_context(struct drm_i915_private *i915, unsigned int flags) 
	if (HAS_FULL_PPGTT(i915)) {

		struct i915_ppgtt *ppgtt;



		ppgtt = i915_ppgtt_create(i915);

		ppgtt = i915_ppgtt_create(&i915->gt);

		if (IS_ERR(ppgtt)) {

			DRM_DEBUG_DRIVER("PPGTT setup failed (%ld)\n",

					 PTR_ERR(ppgtt));
@@ -861,7 +862,7 @@ int i915_gem_vm_create_ioctl(struct drm_device *dev, void *data, 
	if (args->flags)

		return -EINVAL;



	ppgtt = i915_ppgtt_create(i915);

	ppgtt = i915_ppgtt_create(&i915->gt);

	if (IS_ERR(ppgtt))

		return PTR_ERR(ppgtt);

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

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#include "i915_drv.h"

#include "i915_gem.h"

#include "i915_gem_gtt.h"

#include "i915_scheduler.h"

#include "intel_device_info.h"

drivers/gpu/drm/i915/gem/i915_gem_object.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "display/intel_frontbuffer.h"

#include "i915_gem_object_types.h"

#include "i915_gem_gtt.h"

#include "i915_vma_types.h"



void i915_gem_init__objects(struct drm_i915_private *i915);

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

+1 −1
Original line number Diff line number Diff line
@@ -1865,7 +1865,7 @@ int i915_gem_huge_page_mock_selftests(void) 
	mkwrite_device_info(dev_priv)->ppgtt_type = INTEL_PPGTT_FULL;

	mkwrite_device_info(dev_priv)->ppgtt_size = 48;



	ppgtt = i915_ppgtt_create(dev_priv);

	ppgtt = i915_ppgtt_create(&dev_priv->gt);

	if (IS_ERR(ppgtt)) {

		err = PTR_ERR(ppgtt);

		goto out_unlock;

CRA Git | Maintained and supported by SUSTech CRA and CCSE