| Message ID | 20201209125357.64825ba6@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: build failure after merge of the drm tree | expand |
diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c index c60ca62b38df..ab6870242e18 100644 --- a/drivers/gpu/drm/i915/gt/intel_mocs.c +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c @@ -360,7 +360,7 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915, if (IS_DG1(i915)) { table->size = ARRAY_SIZE(dg1_mocs_table); table->table = dg1_mocs_table; - table->n_entries = GEN11_NUM_MOCS_ENTRIES; + table->n_entries = GEN9_NUM_MOCS_ENTRIES; } else if (INTEL_GEN(i915) >= 12) { table->size = ARRAY_SIZE(tgl_mocs_table); table->table = tgl_mocs_table;
Hi all, After merging the drm tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/gt/intel_mocs.c: In function 'get_mocs_settings': drivers/gpu/drm/i915/gt/intel_mocs.c:363:22: error: 'GEN11_NUM_MOCS_ENTRIES' undeclared (first use in this function); did you mean 'GEN9_NUM_MOCS_ENTRIES'? 363 | table->n_entries = GEN11_NUM_MOCS_ENTRIES; | ^~~~~~~~~~~~~~~~~~~~~~ | GEN9_NUM_MOCS_ENTRIES drivers/gpu/drm/i915/gt/intel_mocs.c:363:22: note: each undeclared identifier is reported only once for each function it appears in Caused by commit 2606b269234b ("drm/i915/dg1: Define MOCS table for DG1") interacting with commit 7c5c15dffe1e ("drm/i915/gt: Declare gen9 has 64 mocs entries!") from the drm-intel-fixes tree. I have applied the following merge fix patch for today: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 9 Dec 2020 12:47:45 +1100 Subject: [PATCH] fixup for "drm/i915/gt: Declare gen9 has 64 mocs entries!" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)