Skip to content

L
linux
Commit 1b9d8406 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Jani Nikula
Browse files
Options

drm/i915/gt: replace gen use in intel_engine_cs 

Start using the new fields graphics_version for the previous gen checks.
Here we rename the "gen" field and replace the comparisons using it to
start using the new GRAPHICS_VER(). Other uses of INTEL_GEN() were left
as is for automatic conversion later.
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210413051002.92589-6-lucas.demarchi@intel.com
parent 93babb06
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
drivers/gpu/drm/i915/gt/intel_engine_cs.c
View file @ 1b9d8406
...@@ -45,9 +45,9 @@ struct engine_info { ...@@ -45,9 +45,9 @@ struct engine_info {
unsigned int hw_id; unsigned int hw_id;
u8 class; u8 class;
u8 instance; u8 instance;
/* mmio bases table *must* be sorted in reverse gen order */ /* mmio bases table *must* be sorted in reverse graphics_ver order */
struct engine_mmio_base { struct engine_mmio_base {
u32 gen : 8; u32 graphics_ver : 8;
u32 base : 24; u32 base : 24;
} mmio_bases[MAX_MMIO_BASES]; } mmio_bases[MAX_MMIO_BASES];
}; };
...@@ -58,7 +58,7 @@ static const struct engine_info intel_engines[] = { ...@@ -58,7 +58,7 @@ static const struct engine_info intel_engines[] = {
.class = RENDER_CLASS, .class = RENDER_CLASS,
.instance = 0, .instance = 0,
.mmio_bases = { .mmio_bases = {
{ .gen = 1, .base = RENDER_RING_BASE } { .graphics_ver = 1, .base = RENDER_RING_BASE }
}, },
}, },
[BCS0] = { [BCS0] = {
...@@ -66,7 +66,7 @@ static const struct engine_info intel_engines[] = { ...@@ -66,7 +66,7 @@ static const struct engine_info intel_engines[] = {
.class = COPY_ENGINE_CLASS, .class = COPY_ENGINE_CLASS,
.instance = 0, .instance = 0,
.mmio_bases = { .mmio_bases = {
{ .gen = 6, .base = BLT_RING_BASE } { .graphics_ver = 6, .base = BLT_RING_BASE }
}, },
}, },
[VCS0] = { [VCS0] = {
...@@ -74,9 +74,9 @@ static const struct engine_info intel_engines[] = { ...@@ -74,9 +74,9 @@ static const struct engine_info intel_engines[] = {
.class = VIDEO_DECODE_CLASS, .class = VIDEO_DECODE_CLASS,
.instance = 0, .instance = 0,
.mmio_bases = { .mmio_bases = {
{ .gen = 11, .base = GEN11_BSD_RING_BASE }, { .graphics_ver = 11, .base = GEN11_BSD_RING_BASE },
{ .gen = 6, .base = GEN6_BSD_RING_BASE }, { .graphics_ver = 6, .base = GEN6_BSD_RING_BASE },
{ .gen = 4, .base = BSD_RING_BASE } { .graphics_ver = 4, .base = BSD_RING_BASE }
}, },
}, },
[VCS1] = { [VCS1] = {
...@@ -84,8 +84,8 @@ static const struct engine_info intel_engines[] = { ...@@ -84,8 +84,8 @@ static const struct engine_info intel_engines[] = {
.class = VIDEO_DECODE_CLASS, .class = VIDEO_DECODE_CLASS,
.instance = 1, .instance = 1,
.mmio_bases = { .mmio_bases = {
{ .gen = 11, .base = GEN11_BSD2_RING_BASE }, { .graphics_ver = 11, .base = GEN11_BSD2_RING_BASE },
{ .gen = 8, .base = GEN8_BSD2_RING_BASE } { .graphics_ver = 8, .base = GEN8_BSD2_RING_BASE }
}, },
}, },
[VCS2] = { [VCS2] = {
...@@ -93,7 +93,7 @@ static const struct engine_info intel_engines[] = { ...@@ -93,7 +93,7 @@ static const struct engine_info intel_engines[] = {
.class = VIDEO_DECODE_CLASS, .class = VIDEO_DECODE_CLASS,
.instance = 2, .instance = 2,
.mmio_bases = { .mmio_bases = {
{ .gen = 11, .base = GEN11_BSD3_RING_BASE } { .graphics_ver = 11, .base = GEN11_BSD3_RING_BASE }
}, },
}, },
[VCS3] = { [VCS3] = {
...@@ -101,7 +101,7 @@ static const struct engine_info intel_engines[] = { ...@@ -101,7 +101,7 @@ static const struct engine_info intel_engines[] = {
.class = VIDEO_DECODE_CLASS, .class = VIDEO_DECODE_CLASS,
.instance = 3, .instance = 3,
.mmio_bases = { .mmio_bases = {
{ .gen = 11, .base = GEN11_BSD4_RING_BASE } { .graphics_ver = 11, .base = GEN11_BSD4_RING_BASE }
}, },
}, },
[VECS0] = { [VECS0] = {
...@@ -109,8 +109,8 @@ static const struct engine_info intel_engines[] = { ...@@ -109,8 +109,8 @@ static const struct engine_info intel_engines[] = {
.class = VIDEO_ENHANCEMENT_CLASS, .class = VIDEO_ENHANCEMENT_CLASS,
.instance = 0, .instance = 0,
.mmio_bases = { .mmio_bases = {
{ .gen = 11, .base = GEN11_VEBOX_RING_BASE }, { .graphics_ver = 11, .base = GEN11_VEBOX_RING_BASE },
{ .gen = 7, .base = VEBOX_RING_BASE } { .graphics_ver = 7, .base = VEBOX_RING_BASE }
}, },
}, },
[VECS1] = { [VECS1] = {
...@@ -118,7 +118,7 @@ static const struct engine_info intel_engines[] = { ...@@ -118,7 +118,7 @@ static const struct engine_info intel_engines[] = {
.class = VIDEO_ENHANCEMENT_CLASS, .class = VIDEO_ENHANCEMENT_CLASS,
.instance = 1, .instance = 1,
.mmio_bases = { .mmio_bases = {
{ .gen = 11, .base = GEN11_VEBOX2_RING_BASE } { .graphics_ver = 11, .base = GEN11_VEBOX2_RING_BASE }
}, },
}, },
}; };
...@@ -146,9 +146,9 @@ u32 intel_engine_context_size(struct intel_gt *gt, u8 class) ...@@ -146,9 +146,9 @@ u32 intel_engine_context_size(struct intel_gt *gt, u8 class)
switch (class) { switch (class) {
case RENDER_CLASS: case RENDER_CLASS:
switch (INTEL_GEN(gt->i915)) { switch (GRAPHICS_VER(gt->i915)) {
default: default:
MISSING_CASE(INTEL_GEN(gt->i915)); MISSING_CASE(GRAPHICS_VER(gt->i915));
return DEFAULT_LR_CONTEXT_RENDER_SIZE; return DEFAULT_LR_CONTEXT_RENDER_SIZE;
case 12: case 12:
case 11: case 11:
...@@ -184,8 +184,8 @@ u32 intel_engine_context_size(struct intel_gt *gt, u8 class) ...@@ -184,8 +184,8 @@ u32 intel_engine_context_size(struct intel_gt *gt, u8 class)
*/ */
cxt_size = intel_uncore_read(uncore, CXT_SIZE) + 1; cxt_size = intel_uncore_read(uncore, CXT_SIZE) + 1;
drm_dbg(&gt->i915->drm, drm_dbg(&gt->i915->drm,
"gen%d CXT_SIZE = %d bytes [0x%08x]\n", "graphics_ver = %d CXT_SIZE = %d bytes [0x%08x]\n",
INTEL_GEN(gt->i915), cxt_size * 64, GRAPHICS_VER(gt->i915), cxt_size * 64,
cxt_size - 1); cxt_size - 1);
return round_up(cxt_size * 64, PAGE_SIZE); return round_up(cxt_size * 64, PAGE_SIZE);
case 3: case 3:
...@@ -201,7 +201,7 @@ u32 intel_engine_context_size(struct intel_gt *gt, u8 class) ...@@ -201,7 +201,7 @@ u32 intel_engine_context_size(struct intel_gt *gt, u8 class)
case VIDEO_DECODE_CLASS: case VIDEO_DECODE_CLASS:
case VIDEO_ENHANCEMENT_CLASS: case VIDEO_ENHANCEMENT_CLASS:
case COPY_ENGINE_CLASS: case COPY_ENGINE_CLASS:
if (INTEL_GEN(gt->i915) < 8) if (GRAPHICS_VER(gt->i915) < 8)
return 0; return 0;
return GEN8_LR_CONTEXT_OTHER_SIZE; return GEN8_LR_CONTEXT_OTHER_SIZE;
} }
...@@ -213,7 +213,7 @@ static u32 __engine_mmio_base(struct drm_i915_private *i915, ...@@ -213,7 +213,7 @@ static u32 __engine_mmio_base(struct drm_i915_private *i915,
int i; int i;
for (i = 0; i < MAX_MMIO_BASES; i++) for (i = 0; i < MAX_MMIO_BASES; i++)
if (INTEL_GEN(i915) >= bases[i].gen) if (GRAPHICS_VER(i915) >= bases[i].graphics_ver)
break; break;
GEM_BUG_ON(i == MAX_MMIO_BASES); GEM_BUG_ON(i == MAX_MMIO_BASES);
......
drivers/gpu/drm/i915/gt/selftest_engine_cs.c
View file @ 1b9d8406
...@@ -376,34 +376,34 @@ static int intel_mmio_bases_check(void *arg) ...@@ -376,34 +376,34 @@ static int intel_mmio_bases_check(void *arg)
u8 prev = U8_MAX; u8 prev = U8_MAX;
for (j = 0; j < MAX_MMIO_BASES; j++) { for (j = 0; j < MAX_MMIO_BASES; j++) {
u8 gen = info->mmio_bases[j].gen; u8 ver = info->mmio_bases[j].graphics_ver;
u32 base = info->mmio_bases[j].base; u32 base = info->mmio_bases[j].base;
if (gen >= prev) { if (ver >= prev) {
pr_err("%s(%s, class:%d, instance:%d): mmio base for gen %x is before the one for gen %x\n", pr_err("%s(%s, class:%d, instance:%d): mmio base for graphics ver %u is before the one for ver %u\n",
__func__, __func__,
intel_engine_class_repr(info->class), intel_engine_class_repr(info->class),
info->class, info->instance, info->class, info->instance,
prev, gen); prev, ver);
return -EINVAL; return -EINVAL;
} }
if (gen == 0) if (ver == 0)
break; break;
if (!base) { if (!base) {
pr_err("%s(%s, class:%d, instance:%d): invalid mmio base (%x) for gen %x at entry %u\n", pr_err("%s(%s, class:%d, instance:%d): invalid mmio base (%x) for graphics ver %u at entry %u\n",
__func__, __func__,
intel_engine_class_repr(info->class), intel_engine_class_repr(info->class),
info->class, info->instance, info->class, info->instance,
base, gen, j); base, ver, j);
return -EINVAL; return -EINVAL;
} }
prev = gen; prev = ver;
} }
pr_debug("%s: min gen supported for %s%d is %d\n", pr_debug("%s: min graphics version supported for %s%d is %u\n",
__func__, __func__,
intel_engine_class_repr(info->class), intel_engine_class_repr(info->class),
info->instance, info->instance,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7