On 23/07/2019 12:47, Chris Wilson wrote:
Cometlake is yet another Skylake refresh and used the same mocs
registers.
Bugzilla: https://bugzilla.freedesktop.org/show_bug.cgi?id=111137
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxxxxxxx>
---
lib/intel_chipset.h | 3 ++-
tests/i915/gem_mocs_settings.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
index 781486d02..2bd57f4f0 100644
--- a/lib/intel_chipset.h
+++ b/lib/intel_chipset.h
@@ -162,11 +162,12 @@ void intel_check_pch(void);
#define IS_HASWELL(devid) (intel_get_device_info(devid)->is_haswell)
#define IS_BROADWELL(devid) (intel_get_device_info(devid)->is_broadwell)
#define IS_CHERRYVIEW(devid) (intel_get_device_info(devid)->is_cherryview)
-#define IS_KABYLAKE(devid) (intel_get_device_info(devid)->is_kabylake)
#define IS_SKYLAKE(devid) (intel_get_device_info(devid)->is_skylake)
#define IS_BROXTON(devid) (intel_get_device_info(devid)->is_broxton)
+#define IS_KABYLAKE(devid) (intel_get_device_info(devid)->is_kabylake)
#define IS_GEMINILAKE(devid) (intel_get_device_info(devid)->is_geminilake)
#define IS_COFFEELAKE(devid) (intel_get_device_info(devid)->is_coffeelake)
+#define IS_COMETLAKE(devid) (intel_get_device_info(devid)->is_cometlake)
#define IS_CANNONLAKE(devid) (intel_get_device_info(devid)->is_cannonlake)
#define IS_ICELAKE(devid) (intel_get_device_info(devid)->is_icelake)
#define IS_TIGERLAKE(devid) (intel_get_device_info(devid)->is_tigerlake)
diff --git a/tests/i915/gem_mocs_settings.c b/tests/i915/gem_mocs_settings.c
index 1a311b8c0..f3ee8a7bc 100644
--- a/tests/i915/gem_mocs_settings.c
+++ b/tests/i915/gem_mocs_settings.c
@@ -137,7 +137,7 @@ static bool get_mocs_settings(int fd, struct mocs_table *table, bool dirty)
uint32_t devid = intel_get_drm_devid(fd);
bool result = false;
- if (IS_SKYLAKE(devid) || IS_KABYLAKE(devid)) {
+ if (IS_SKYLAKE(devid) || IS_KABYLAKE(devid) || IS_COMETLAKE(devid)) {
if (dirty) {
table->size = ARRAY_SIZE(dirty_skylake_mocs_table);
table->table = dirty_skylake_mocs_table;
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
