v3 of https://patchwork.freedesktop.org/series/105358/ Add a patch resolving guc time stamp logging related conflicts in the front, and remove the last two patches, for now, to avoid any potentially regressing functional changes. Leave them for later. Jani Nikula (14): drm/i915/guc: remove runtime info printing from time stamp logging drm/i915: combine device info printing into one drm/i915: add initial runtime info into device info drm/i915: move graphics.ver and graphics.rel to runtime info drm/i915: move fbc_mask to runtime info drm/i915: move page_sizes to runtime info drm/i915: move ppgtt_type and ppgtt_size to runtime info drm/i915: move has_pooled_eu to runtime info drm/i915: move memory_regions to runtime info drm/i915: move platform_engine_mask to runtime info drm/i915: move pipe_mask and cpu_transcoder_mask to runtime info drm/i915: move has_hdcp to runtime info drm/i915: move has_dmc to runtime info drm/i915: move has_dsc to runtime info drivers/gpu/drm/i915/display/intel_display.h | 4 +- drivers/gpu/drm/i915/display/intel_fbc.c | 6 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 4 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +- .../drm/i915/display/skl_universal_plane.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 +- .../gpu/drm/i915/gem/selftests/huge_pages.c | 18 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- drivers/gpu/drm/i915/gt/intel_sseu.c | 5 +- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 - drivers/gpu/drm/i915/i915_debugfs.c | 3 +- drivers/gpu/drm/i915/i915_driver.c | 11 +- drivers/gpu/drm/i915/i915_drv.h | 24 +- drivers/gpu/drm/i915/i915_gem.c | 3 +- drivers/gpu/drm/i915/i915_gpu_error.c | 3 +- drivers/gpu/drm/i915/i915_pci.c | 242 +++++++++--------- drivers/gpu/drm/i915/intel_device_info.c | 71 ++--- drivers/gpu/drm/i915/intel_device_info.h | 82 +++--- drivers/gpu/drm/i915/intel_uncore.c | 2 +- .../gpu/drm/i915/selftests/mock_gem_device.c | 8 +- 21 files changed, 256 insertions(+), 242 deletions(-) -- 2.34.1
