mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
Merge drm/drm-next into drm-intel-next
Sync the drm-intel-gt-next changes back to drm-intel-next via drm-next. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
@@ -139,21 +139,54 @@ static const char *stringify_vma_type(const struct i915_vma *vma)
|
||||
return "ppgtt";
|
||||
}
|
||||
|
||||
static const char *i915_cache_level_str(struct drm_i915_private *i915, int type)
|
||||
static const char *i915_cache_level_str(struct drm_i915_gem_object *obj)
|
||||
{
|
||||
switch (type) {
|
||||
case I915_CACHE_NONE: return " uncached";
|
||||
case I915_CACHE_LLC: return HAS_LLC(i915) ? " LLC" : " snooped";
|
||||
case I915_CACHE_L3_LLC: return " L3+LLC";
|
||||
case I915_CACHE_WT: return " WT";
|
||||
default: return "";
|
||||
struct drm_i915_private *i915 = obj_to_i915(obj);
|
||||
|
||||
if (IS_METEORLAKE(i915)) {
|
||||
switch (obj->pat_index) {
|
||||
case 0: return " WB";
|
||||
case 1: return " WT";
|
||||
case 2: return " UC";
|
||||
case 3: return " WB (1-Way Coh)";
|
||||
case 4: return " WB (2-Way Coh)";
|
||||
default: return " not defined";
|
||||
}
|
||||
} else if (IS_PONTEVECCHIO(i915)) {
|
||||
switch (obj->pat_index) {
|
||||
case 0: return " UC";
|
||||
case 1: return " WC";
|
||||
case 2: return " WT";
|
||||
case 3: return " WB";
|
||||
case 4: return " WT (CLOS1)";
|
||||
case 5: return " WB (CLOS1)";
|
||||
case 6: return " WT (CLOS2)";
|
||||
case 7: return " WT (CLOS2)";
|
||||
default: return " not defined";
|
||||
}
|
||||
} else if (GRAPHICS_VER(i915) >= 12) {
|
||||
switch (obj->pat_index) {
|
||||
case 0: return " WB";
|
||||
case 1: return " WC";
|
||||
case 2: return " WT";
|
||||
case 3: return " UC";
|
||||
default: return " not defined";
|
||||
}
|
||||
} else {
|
||||
switch (obj->pat_index) {
|
||||
case 0: return " UC";
|
||||
case 1: return HAS_LLC(i915) ?
|
||||
" LLC" : " snooped";
|
||||
case 2: return " L3+LLC";
|
||||
case 3: return " WT";
|
||||
default: return " not defined";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(obj->base.dev);
|
||||
struct i915_vma *vma;
|
||||
int pin_count = 0;
|
||||
|
||||
@@ -165,7 +198,7 @@ i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
|
||||
obj->base.size / 1024,
|
||||
obj->read_domains,
|
||||
obj->write_domain,
|
||||
i915_cache_level_str(dev_priv, obj->cache_level),
|
||||
i915_cache_level_str(obj),
|
||||
obj->mm.dirty ? " dirty" : "",
|
||||
obj->mm.madv == I915_MADV_DONTNEED ? " purgeable" : "");
|
||||
if (obj->base.name)
|
||||
|
||||
Reference in New Issue
Block a user