leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/gt: Allocate i915_fence_reg array

Browse Source 
Since the number of fence regs can vary dramactically between platforms,
allocate the array on demand so we don't waste as much space.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200316113846.4974-4-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson
2020-03-16 11:38:46 +00:00
parent bd9a4dbc84
commit 0b6bc81dbd
5 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/gt/intel_ggtt.c
View File

@@ -698,11 +698,13 @@ static void ggtt_cleanup_hw(struct i915_ggtt *ggtt)
*/ */
void i915_ggtt_driver_release(struct drm_i915_private *i915) void i915_ggtt_driver_release(struct drm_i915_private *i915)
{ {
struct i915_ggtt *ggtt = &i915->ggtt;
struct pagevec *pvec; struct pagevec *pvec;
fini_aliasing_ppgtt(&i915->ggtt); fini_aliasing_ppgtt(ggtt);
ggtt_cleanup_hw(&i915->ggtt); intel_ggtt_fini_fences(ggtt);
ggtt_cleanup_hw(ggtt);
pvec = &i915->mm.wc_stash.pvec; pvec = &i915->mm.wc_stash.pvec;
if (pvec->nr) { if (pvec->nr) {

10
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
View File

@@ -857,6 +857,11 @@ void intel_ggtt_init_fences(struct i915_ggtt *ggtt)
if (intel_vgpu_active(i915)) if (intel_vgpu_active(i915))
num_fences = intel_uncore_read(uncore, num_fences = intel_uncore_read(uncore,
vgtif_reg(avail_rs.fence_num)); vgtif_reg(avail_rs.fence_num));
ggtt->fence_regs = kcalloc(num_fences,
sizeof(*ggtt->fence_regs),
GFP_KERNEL);
if (!ggtt->fence_regs)
num_fences = 0;
/* Initialize fence registers to zero */ /* Initialize fence registers to zero */
for (i = 0; i < num_fences; i++) { for (i = 0; i < num_fences; i++) {
@@ -871,6 +876,11 @@ void intel_ggtt_init_fences(struct i915_ggtt *ggtt)
intel_ggtt_restore_fences(ggtt); intel_ggtt_restore_fences(ggtt);
} }
void intel_ggtt_fini_fences(struct i915_ggtt *ggtt)
{
kfree(ggtt->fence_regs);
}
void intel_gt_init_swizzling(struct intel_gt *gt) void intel_gt_init_swizzling(struct intel_gt *gt)
{ {
struct drm_i915_private *i915 = gt->i915; struct drm_i915_private *i915 = gt->i915;

1
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.h
View File

@@ -64,6 +64,7 @@ void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj,
struct sg_table *pages); struct sg_table *pages);
void intel_ggtt_init_fences(struct i915_ggtt *ggtt); void intel_ggtt_init_fences(struct i915_ggtt *ggtt);
void intel_ggtt_fini_fences(struct i915_ggtt *ggtt);
void intel_gt_init_swizzling(struct intel_gt *gt); void intel_gt_init_swizzling(struct intel_gt *gt);

5
drivers/gpu/drm/i915/gt/intel_gtt.h
View File

@@ -26,7 +26,6 @@
#include <drm/drm_mm.h> #include <drm/drm_mm.h>
#include "gt/intel_reset.h" #include "gt/intel_reset.h"
#include "gt/intel_ggtt_fencing.h"
#include "i915_selftest.h" #include "i915_selftest.h"
#include "i915_vma_types.h" #include "i915_vma_types.h"
@@ -135,6 +134,8 @@ typedef u64 gen8_pte_t;
#define GEN8_PDE_IPS_64K BIT(11) #define GEN8_PDE_IPS_64K BIT(11)
#define GEN8_PDE_PS_2M BIT(7) #define GEN8_PDE_PS_2M BIT(7)
struct i915_fence_reg;
#define for_each_sgt_daddr(__dp, __iter, __sgt) \ #define for_each_sgt_daddr(__dp, __iter, __sgt) \
__for_each_sgt_daddr(__dp, __iter, __sgt, I915_GTT_PAGE_SIZE) __for_each_sgt_daddr(__dp, __iter, __sgt, I915_GTT_PAGE_SIZE)
@@ -333,7 +334,7 @@ struct i915_ggtt {
u32 pin_bias; u32 pin_bias;
unsigned int num_fences; unsigned int num_fences;
struct i915_fence_reg fence_regs[I915_MAX_NUM_FENCES]; struct i915_fence_reg *fence_regs;
struct list_head fence_list; struct list_head fence_list;
/** /**

1
drivers/gpu/drm/i915/i915_vma.h
View File

@@ -30,6 +30,7 @@
#include <drm/drm_mm.h> #include <drm/drm_mm.h>
#include "gt/intel_ggtt_fencing.h"
#include "gem/i915_gem_object.h" #include "gem/i915_gem_object.h"
#include "i915_gem_gtt.h" #include "i915_gem_gtt.h"