github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

- Fix BSC default context for Meteor Lake (Lucas)

Browse Source 
- Fix selftest-scheduler's modify_type (Andi)
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEbSBwaO7dZQkcLOKj+mJfZA7rE8oFAmPSyeoACgkQ+mJfZA7r
 E8rsgAf/YA+EawtGCIc3Gnv4cOSvqNsBANCEzt6zCqKuI8uBq0TAmGsMkBcvQZ6E
 nCGhhj0HFSlcwKMdEQ1wPw3seXdC1asZAs8TFVmLbUmtbfEfaGt12tdps8cUc/+K
 puv5kZAqNlIAoW9qn3iGglw1k3WGtcfLdA20xlj0x29h6Bx1B8JpV2emPuW5jDOR
 BfUCfcYfa1pth1gH2xy6PmWecxQDMzKlfFtFWKPybHnMhcW23sFjVRe+SWLs3ZhF
 NZy1IY+5ZOWftBBuuD8o5wL9FiBZn9Y7pBkNwJrvJTapeHWkB7S5nnVVtVdWsi1t
 3f6o1HCflcUzT9utdNkvZn+QdCa+ew==
 =7TS2
 -----END PGP SIGNATURE-----

Merge tag 'drm-intel-fixes-2023-01-26' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

- Fix BSC default context for Meteor Lake (Lucas)
- Fix selftest-scheduler's modify_type (Andi)

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y9LKD2J5bmICTyIP@intel.com
This commit is contained in:
Dave Airlie 2023-01-27 11:39:55 +10:00
commit af0af9087a
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/gpu/drm/i915/gt/intel_lrc.c
View File

@ -288,39 +288,6 @@ static const u8 dg2_xcs_offsets[] = {
END
};
static const u8 mtl_xcs_offsets[] = {
NOP(1),
LRI(13, POSTED),
REG16(0x244),
REG(0x034),
REG(0x030),
REG(0x038),
REG(0x03c),
REG(0x168),
REG(0x140),
REG(0x110),
REG(0x1c0),
REG(0x1c4),
REG(0x1c8),
REG(0x180),
REG16(0x2b4),
NOP(4),
NOP(1),
LRI(9, POSTED),
REG16(0x3a8),
REG16(0x28c),
REG16(0x288),
REG16(0x284),
REG16(0x280),
REG16(0x27c),
REG16(0x278),
REG16(0x274),
REG16(0x270),
END
};
static const u8 gen8_rcs_offsets[] = {
NOP(1),
LRI(14, POSTED),
@ -739,9 +706,7 @@ static const u8 *reg_offsets(const struct intel_engine_cs *engine)
else
return gen8_rcs_offsets;
} else {
if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 70))
return mtl_xcs_offsets;
else if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55))
if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 55))
return dg2_xcs_offsets;
else if (GRAPHICS_VER(engine->i915) >= 12)
return gen12_xcs_offsets;

3
drivers/gpu/drm/i915/selftests/intel_scheduler_helpers.c
View File

@ -28,8 +28,7 @@ struct intel_engine_cs *intel_selftest_find_any_engine(struct intel_gt *gt)
int intel_selftest_modify_policy(struct intel_engine_cs *engine,
struct intel_selftest_saved_policy *saved,
u32 modify_type)
enum selftest_scheduler_modify modify_type)
{
int err;