drm/i915: stop modifying "const" device info
Subsystems (3)
v3 cover drm/i915: stop modifying "const" device info
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(-)
Signature · 1 line
2.34.1
PATCH v3 1/14 drm/i915/guc: remove runtime info printing from time stamp logging
Commit 368d179adbac ("drm/i915/guc: Add GuC <-> kernel time stamp translation information") added intel_device_info_print_runtime() in the time info dump for no obvious reason or explanation in the commit message. It only logs the rawclk freq. Remove it.
--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc.c +0 -2
@@ -365,8 +365,6 @@ void intel_guc_dump_time_info(struct intel_guc *guc, struct drm_printer *p)u32 stamp =0 ;u64 ktime; -intel_device_info_print_runtime (RUNTIME_INFO (gt->i915), p); -with_intel_runtime_pm (>->i915->runtime_pm, wakeref) stamp = intel_uncore_read(gt->uncore, GUCPMTIMESTAMP); ktime =ktime_get_boottime_ns ();
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v3 01/14] drm/i915/guc: remove runtime info printing from time stamp logging
Quoted 8 lines · Jani Nikula
Commit
368d179adbac("drm/i915/guc: Add GuC <-> kernel time stamp translation information") addedintel_device_info_print_runtime()in the time info dump for no obvious reason or explanation in the commit message. It only logs the rawclk freq. Remove it.Cc John Harrison <[email protected]>Cc Alan Previn <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 17 lines
--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-2@@ -365,8 +365,6 @@ void intel_guc_dump_time_info(struct intel_guc *guc, struct drm_printer *p)u32 stamp =0 ;u64 ktime; -intel_device_info_print_runtime (RUNTIME_INFO (gt->i915), p); -with_intel_runtime_pm (>->i915->runtime_pm, wakeref) stamp = intel_uncore_read(gt->uncore, GUCPMTIMESTAMP); ktime =ktime_get_boottime_ns ();
Re: [Intel-gfx] [PATCH v3 01/14] drm/i915/guc: remove runtime info printing from time stamp logging
Quoted 10 lines · John Harrison
Quoted 8 lines · Jani Nikula
Commit
368d179adbac("drm/i915/guc: Add GuC <-> kernel time stamp translation information") addedintel_device_info_print_runtime()in the time info dump for no obvious reason or explanation in the commit message. It only logs the rawclk freq. Remove it.Cc John Harrison <[email protected]>Cc Alan Previn <[email protected]>Signed-off-by Jani Nikula <[email protected]>Reviewed-by John Harrison <[email protected]>
Thanks, this one pushed to drm-intel-gt-next.
BR,
Jani.
Quoted 19 lines
Quoted 18 lines
--- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/i915/gt/uc/intel_guc.c +0
-2@@ -365,8 +365,6 @@ void intel_guc_dump_time_info(struct intel_guc *guc, struct drm_printer *p)u32 stamp =0 ;u64 ktime; -intel_device_info_print_runtime (RUNTIME_INFO (gt->i915), p); -with_intel_runtime_pm (>->i915->runtime_pm, wakeref) stamp = intel_uncore_read(gt->uncore, GUCPMTIMESTAMP); ktime =ktime_get_boottime_ns ();
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
PATCH v3 2/14 drm/i915: combine device info printing into one
In reply to Jani NikulaWe'll be moving info between static and runtime info. Combine the printing functions into one to keep the output sensible and (mostly) unchanged in the process.
--- drivers/gpu/drm/i915/i915_debugfs.c | 3 +-- drivers/gpu/drm/i915/i915_driver.c | 4 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 3 +-- drivers/gpu/drm/i915/intel_device_info.c | 11 ++++------- drivers/gpu/drm/i915/intel_device_info.h | 7 +++---- 5 files changed, 11 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -2
@@ -66,8 +66,7 @@ static int i915_capabilities(struct seq_file *m, void *data)seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (i915)); -intel_device_info_print_static (INTEL_INFO (i915), &p); -intel_device_info_print_runtime (RUNTIME_INFO (i915), &p); +intel_device_info_print (INTEL_INFO (i915),RUNTIME_INFO (i915), &p);i915_print_iommu_status (i915, &p);intel_gt_info_print (&to_gt (i915)->info, &p);intel_driver_caps_print (&i915->caps, &p);
drivers/gpu/drm/i915/i915_driver.c +2 -2
@@ -793,8 +793,8 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv) INTEL_INFO(dev_priv)->platform), GRAPHICS_VER(dev_priv)); -intel_device_info_print_static (INTEL_INFO (dev_priv), &p); -intel_device_info_print_runtime (RUNTIME_INFO (dev_priv), &p); +intel_device_info_print (INTEL_INFO (dev_priv), +RUNTIME_INFO (dev_priv), &p);i915_print_iommu_status (dev_priv, &p);intel_gt_info_print (&to_gt (dev_priv)->info, &p); }
drivers/gpu/drm/i915/i915_gpu_error.c +1 -2
@@ -646,8 +646,7 @@ static void err_print_capabilities(struct drm_i915_error_state_buf *m, {struct drm_printer p =i915_error_printer (m); -intel_device_info_print_static (&error->device_info, &p); -intel_device_info_print_runtime (&error->runtime_info, &p); +intel_device_info_print (&error->device_info, &error->runtime_info, &p);intel_driver_caps_print (&error->driver_caps, &p); }
drivers/gpu/drm/i915/intel_device_info.c +4 -7
@@ -88,8 +88,9 @@ const char *intel_platform_name(enum intel_platform platform)return platform_names[platform]; } -void intel_device_info_print_static (const struct intel_device_info *info, -struct drm_printer *p) +void intel_device_info_print (const struct intel_device_info *info, +const struct intel_runtime_info *runtime, +struct drm_printer *p) {if (info->graphics.rel) drm_printf(p, "graphics version: %u.%02u\n", info->graphics.ver,
@@ -122,12 +123,8 @@ void intel_device_info_print_static(const struct intel_device_info *info,#define PRINT_FLAG (name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->display.name))DEV_INFO_DISPLAY_FOR_EACH_FLAG (PRINT_FLAG );#undef PRINT_FLAG -} -void intel_device_info_print_runtime (const struct intel_runtime_info *info, -struct drm_printer *p) -{ -drm_printf (p,"rawclk rate: %u kHz\n" , info->rawclk_freq); +drm_printf (p,"rawclk rate: %u kHz\n" , runtime->rawclk_freq); }#undef INTEL_VGA_DEVICE
drivers/gpu/drm/i915/intel_device_info.h +3 -4
@@ -291,10 +291,9 @@ const char *intel_platform_name(enum intel_platform platform);void intel_device_info_subplatform_init (struct drm_i915_private *dev_priv);void intel_device_info_runtime_init (struct drm_i915_private *dev_priv); -void intel_device_info_print_static (const struct intel_device_info *info, -struct drm_printer *p); -void intel_device_info_print_runtime (const struct intel_runtime_info *info, -struct drm_printer *p); +void intel_device_info_print (const struct intel_device_info *info, +const struct intel_runtime_info *runtime, +struct drm_printer *p);void intel_driver_caps_print (const struct intel_driver_caps *caps,struct drm_printer *p);
Signature · 1 line
2.34.1
PATCH v3 3/14 drm/i915: add initial runtime info into device info
In reply to Jani NikulaAdd initial runtime info that we can copy to runtime info at i915 creation time. This lets us define the initial values for runtime info statically while making it possible to change them runtime. This will be the new home for the current "const" device info members that are modified runtime anyway.
--- drivers/gpu/drm/i915/i915_driver.c | 7 +++- drivers/gpu/drm/i915/intel_device_info.h | 41 +++++++++++++----------- 2 files changed, 29 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/i915_driver.c +6 -1
@@ -814,6 +814,7 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent)const struct intel_device_info *match_info = (struct intel_device_info *)ent->driver_data;struct intel_device_info *device_info; +struct intel_runtime_info *runtime;struct drm_i915_private *i915; i915 = devm_drm_dev_alloc(&pdev->dev, &i915_drm_driver,
@@ -829,7 +830,11 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent)/* Setup the write-once "constant" device info */ device_info =mkwrite_device_info (i915);memcpy (device_info, match_info,sizeof (*device_info)); -RUNTIME_INFO (i915)->device_id = pdev->device; + +/* Initialize initial runtime info from static const data and pdev. */ + runtime =RUNTIME_INFO (i915); +memcpy (runtime, &INTEL_INFO (i915)->__runtime,sizeof (*runtime)); + runtime->device_id = pdev->device;return i915; }
drivers/gpu/drm/i915/intel_device_info.h +23 -18
56 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 4/14 drm/i915: move graphics.ver and graphics.rel to runtime info
In reply to Jani NikulaIf it's modified runtime, it's runtime info.
mock_gem_device() is the only one that modifies them. If that could be fixed, we wouldn't have to do this.
--- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- drivers/gpu/drm/i915/i915_pci.c | 18 +++++++++--------- drivers/gpu/drm/i915/intel_device_info.c | 8 ++++---- drivers/gpu/drm/i915/intel_device_info.h | 3 ++- .../gpu/drm/i915/selftests/mock_gem_device.c | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -3
@@ -856,9 +856,9 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915)#define IP_VER (ver, rel) ((ver) << 8 | (rel)) -#define GRAPHICS_VER (i915) (INTEL_INFO(i915)->graphics.ver) -#define GRAPHICS_VER_FULL (i915) IP_VER(INTEL_INFO(i915)->graphics.ver, \ - INTEL_INFO(i915)->graphics.rel) +#define GRAPHICS_VER (i915) (RUNTIME_INFO(i915)->graphics.ver) +#define GRAPHICS_VER_FULL (i915) IP_VER(RUNTIME_INFO(i915)->graphics.ver, \ + RUNTIME_INFO(i915)->graphics.rel)#define IS_GRAPHICS_VER (i915, from, until) \ (GRAPHICS_VER(i915) >= (from) && GRAPHICS_VER(i915) <= (until))
drivers/gpu/drm/i915/i915_pci.c +9 -9
@@ -34,7 +34,7 @@#define PLATFORM (x) .platform = (x)#define GEN (x) \ - .graphics.ver = (x), \ + .__runtime.graphics.ver = (x), \ .media.ver = (x), \ .display.ver = (x)
@@ -919,7 +919,7 @@ static const struct intel_device_info rkl_info = {static const struct intel_device_info dg1_info = {GEN12_FEATURES ,DGFX_FEATURES , - .graphics.rel =10 , + .__runtime.graphics.rel =10 ,PLATFORM (INTEL_DG1 ), .display.pipe_mask =BIT (PIPE_A ) |BIT (PIPE_B ) |BIT (PIPE_C ) |BIT (PIPE_D ), .require_force_probe =1 ,
@@ -1006,8 +1006,8 @@ static const struct intel_device_info adl_p_info = { I915_GTT_PAGE_SIZE_2M#define XE_HP_FEATURES \ - .graphics.ver = 12, \ - .graphics.rel = 50, \ + .__runtime.graphics.ver = 12, \ + .__runtime.graphics.rel = 50, \ XE_HP_PAGE_SIZES, \ .dma_mask_size = 46, \ .has_3d_pipeline = 1, \
@@ -1053,7 +1053,7 @@ static const struct intel_device_info xehpsdv_info = {XE_HP_FEATURES , \XE_HPM_FEATURES , \DGFX_FEATURES , \ - .graphics.rel = 55, \ + .__runtime.graphics.rel = 55, \ .media.rel = 55, \PLATFORM (INTEL_DG2 ), \ .has_4tile = 1, \
@@ -1096,7 +1096,7 @@ static const struct intel_device_info pvc_info = {XE_HPC_FEATURES ,XE_HPM_FEATURES ,DGFX_FEATURES , - .graphics.rel = 60, + .__runtime.graphics.rel = 60, .media.rel = 60,PLATFORM (INTEL_PONTEVECCHIO ), .display = { 0 },
@@ -1122,8 +1122,8 @@ static const struct intel_device_info mtl_info = {* Real graphics IP version will be obtained from hardware GMD_ID * register. Value provided here is just for sanity checking. */ - .graphics.ver = 12, - .graphics.rel = 70, + .__runtime.graphics.ver = 12, + .__runtime.graphics.rel = 70, .media.ver =13 ,PLATFORM (INTEL_METEORLAKE ), .display.has_modular_fia = 1,
@@ -1280,7 +1280,7 @@ bool i915_pci_resource_valid(struct pci_dev *pdev, int bar)static bool intel_mmio_bar_valid (struct pci_dev *pdev,struct intel_device_info *intel_info) { -int gttmmaddr_bar = intel_info->graphics.ver ==2 ?GEN2_GTTMMADR_BAR :GTTMMADR_BAR ; +int gttmmaddr_bar = intel_info->__runtime.graphics.ver ==2 ?GEN2_GTTMMADR_BAR :GTTMMADR_BAR ;return i915_pci_resource_valid (pdev, gttmmaddr_bar); }
drivers/gpu/drm/i915/intel_device_info.c +4 -4
@@ -92,11 +92,11 @@ void intel_device_info_print(const struct intel_device_info *info, const struct intel_runtime_info *runtime, struct drm_printer *p) { - if (info->graphics.rel) - drm_printf(p, "graphics version: %u.%02u\n", info->graphics.ver, - info->graphics.rel); + if (runtime->graphics.rel) + drm_printf(p, "graphics version: %u.%02u\n", runtime->graphics.ver, + runtime->graphics.rel); else - drm_printf(p, "graphics version: %u\n", info->graphics.ver); + drm_printf(p, "graphics version: %u\n", runtime->graphics.ver);if (info->media.rel)drm_printf (p,"media version: %u.%02u\n" , info->media.ver, info->media.rel);
drivers/gpu/drm/i915/intel_device_info.h +2 -1
@@ -203,6 +203,8 @@ struct ip_version { };struct intel_runtime_info { +struct ip_version graphics; +/* * Platform mask is used for optimizing or-ed IS_PLATFORM calls into * into single runtime conditionals, and also to provide groundwork
@@ -224,7 +226,6 @@ struct intel_runtime_info { };struct intel_device_info { -struct ip_version graphics;struct ip_version media;intel_engine_mask_t platform_engine_mask;/* Engines supported by the HW */
drivers/gpu/drm/i915/selftests/mock_gem_device.c +1 -1
@@ -172,7 +172,7 @@ struct drm_i915_private *mock_gem_device(void)/* Using the global GTT may ask questions about KMS users, so prepare */ drm_mode_config_init (&i915->drm); -mkwrite_device_info (i915)->graphics.ver =-1 ; +RUNTIME_INFO (i915)->graphics.ver =-1 ;mkwrite_device_info (i915)->page_sizes = I915_GTT_PAGE_SIZE_4K |
Signature · 1 line
2.34.1
PATCH v3 5/14 drm/i915: move fbc_mask to runtime info
In reply to Jani NikulaIf it's modified runtime, it's runtime info.
v2: Rebase on mtl fbc_mask
--- drivers/gpu/drm/i915/display/intel_fbc.c | 6 ++--- .../drm/i915/display/skl_universal_plane.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_pci.c | 24 +++++++++---------- drivers/gpu/drm/i915/intel_device_info.c | 6 ++--- drivers/gpu/drm/i915/intel_device_info.h | 12 ++++++---- 6 files changed, 28 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/display/intel_fbc.c +3 -3
@@ -55,7 +55,7 @@#define for_each_fbc_id (__dev_priv, __fbc_id) \ for ((__fbc_id) = INTEL_FBC_A; (__fbc_id) < I915_MAX_FBCS; (__fbc_id)++) \ - for_each_if(INTEL_INFO(__dev_priv)->display.fbc_mask & BIT(__fbc_id)) + for_each_if(RUNTIME_INFO(__dev_priv)->fbc_mask & BIT(__fbc_id))#define for_each_intel_fbc (__dev_priv, __fbc, __fbc_id) \ for_each_fbc_id((__dev_priv), (__fbc_id)) \
@@ -1710,10 +1710,10 @@ void intel_fbc_init(struct drm_i915_private *i915)enum intel_fbc_id fbc_id;if (!drm_mm_initialized (&i915->mm.stolen)) -mkwrite_device_info (i915)->display.fbc_mask =0 ; +RUNTIME_INFO (i915)->fbc_mask =0 ;if (need_fbc_vtd_wa (i915)) -mkwrite_device_info (i915)->display.fbc_mask =0 ; +RUNTIME_INFO (i915)->fbc_mask =0 ; i915->params.enable_fbc =intel_sanitize_fbc_option (i915); drm_dbg_kms(&i915->drm, "Sanitized enable_fbc value: %d\n",
drivers/gpu/drm/i915/display/skl_universal_plane.c +1 -1
@@ -1928,7 +1928,7 @@ static enum intel_fbc_id skl_fbc_id_for_pipe(enum pipe pipe)static bool skl_plane_has_fbc (struct drm_i915_private *dev_priv,enum intel_fbc_id fbc_id,enum plane_id plane_id) { -if ((INTEL_INFO (dev_priv)->display.fbc_mask &BIT (fbc_id)) ==0 ) +if ((RUNTIME_INFO (dev_priv)->fbc_mask &BIT (fbc_id)) ==0 )return false;return plane_id ==PLANE_PRIMARY ;
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1249,7 +1249,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define I915_HAS_HOTPLUG (dev_priv) (INTEL_INFO(dev_priv)->display.has_hotplug)#define HAS_FW_BLC (dev_priv) (DISPLAY_VER(dev_priv) > 2) -#define HAS_FBC (dev_priv) (INTEL_INFO(dev_priv)->display.fbc_mask != 0) +#define HAS_FBC (dev_priv) (RUNTIME_INFO(dev_priv)->fbc_mask != 0)#define HAS_CUR_FBC (dev_priv) (!HAS_GMCH(dev_priv) && DISPLAY_VER(dev_priv) >= 7)#define HAS_IPS (dev_priv) (IS_HSW_ULT(dev_priv) || IS_BROADWELL(dev_priv))
drivers/gpu/drm/i915/i915_pci.c +12 -12
@@ -222,13 +222,13 @@ static const struct intel_device_info i845g_info = {static const struct intel_device_info i85x_info = {I830_FEATURES ,PLATFORM (INTEL_I85X ), - .display.fbc_mask =BIT (INTEL_FBC_A ), + .__runtime.fbc_mask =BIT (INTEL_FBC_A ), };static const struct intel_device_info i865g_info = {I845_FEATURES ,PLATFORM (INTEL_I865G ), - .display.fbc_mask =BIT (INTEL_FBC_A ), + .__runtime.fbc_mask =BIT (INTEL_FBC_A ), };#define GEN3_FEATURES \
@@ -267,7 +267,7 @@ static const struct intel_device_info i915gm_info = { .display.has_overlay = 1, .display.overlay_needs_physical = 1, .display.supports_tv = 1, - .display.fbc_mask = BIT(INTEL_FBC_A), + .__runtime.fbc_mask = BIT(INTEL_FBC_A), .hws_needs_physical = 1, .unfenced_needs_alignment = 1, };
@@ -292,7 +292,7 @@ static const struct intel_device_info i945gm_info = { .display.has_overlay = 1, .display.overlay_needs_physical = 1, .display.supports_tv = 1, - .display.fbc_mask = BIT(INTEL_FBC_A), + .__runtime.fbc_mask = BIT(INTEL_FBC_A), .hws_needs_physical = 1, .unfenced_needs_alignment = 1, };
@@ -352,7 +352,7 @@ static const struct intel_device_info i965gm_info = {GEN4_FEATURES ,PLATFORM (INTEL_I965GM ), .is_mobile = 1, - .display.fbc_mask = BIT(INTEL_FBC_A), + .__runtime.fbc_mask = BIT(INTEL_FBC_A), .display.has_overlay = 1, .display.supports_tv = 1, .hws_needs_physical = 1,
@@ -370,7 +370,7 @@ static const struct intel_device_info gm45_info = {GEN4_FEATURES ,PLATFORM (INTEL_GM45 ), .is_mobile = 1, - .display.fbc_mask = BIT(INTEL_FBC_A), + .__runtime.fbc_mask = BIT(INTEL_FBC_A), .display.supports_tv = 1, .platform_engine_mask = BIT(RCS0) | BIT(VCS0), .gpu_reset_clobbers_display = false,
@@ -404,7 +404,7 @@ static const struct intel_device_info ilk_m_info = { PLATFORM(INTEL_IRONLAKE), .is_mobile = 1, .has_rps = true, - .display.fbc_mask = BIT(INTEL_FBC_A), + .__runtime.fbc_mask = BIT(INTEL_FBC_A), };#define GEN6_FEATURES \
@@ -412,7 +412,7 @@ static const struct intel_device_info ilk_m_info = { .display.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B), \ .display.cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B), \ .display.has_hotplug = 1, \ - .display.fbc_mask = BIT(INTEL_FBC_A), \ + .__runtime.fbc_mask = BIT(INTEL_FBC_A), \ .platform_engine_mask = BIT(RCS0) | BIT(VCS0) | BIT(BCS0), \ .has_3d_pipeline = 1, \ .has_coherent_ggtt = true, \
@@ -464,7 +464,7 @@ static const struct intel_device_info snb_m_gt2_info = { .display.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C), \ .display.cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | BIT(TRANSCODER_C), \ .display.has_hotplug = 1, \ - .display.fbc_mask = BIT(INTEL_FBC_A), \ + .__runtime.fbc_mask = BIT(INTEL_FBC_A), \ .platform_engine_mask = BIT(RCS0) | BIT(VCS0) | BIT(BCS0), \ .has_3d_pipeline = 1, \ .has_coherent_ggtt = true, \
@@ -707,7 +707,7 @@ static const struct intel_device_info skl_gt4_info = { .has_64bit_reloc = 1, \ .display.has_ddi = 1, \ .display.has_fpga_dbg = 1, \ - .display.fbc_mask = BIT(INTEL_FBC_A), \ + .__runtime.fbc_mask = BIT(INTEL_FBC_A), \ .display.has_hdcp = 1, \ .display.has_psr = 1, \ .display.has_psr_hw_tracking = 1, \
@@ -956,7 +956,7 @@ static const struct intel_device_info adl_s_info = { .display.has_dp_mst = 1, \ .display.has_dsb = 1, \ .display.has_dsc = 1, \ - .display.fbc_mask = BIT(INTEL_FBC_A), \ + .__runtime.fbc_mask = BIT(INTEL_FBC_A), \ .display.has_fpga_dbg = 1, \ .display.has_hdcp = 1, \ .display.has_hotplug = 1, \
@@ -1112,7 +1112,7 @@ static const struct intel_device_info pvc_info = { XE_LPD_FEATURES, \ .display.ver = 14, \ .display.has_cdclk_crawl = 1, \ - .display.fbc_mask = BIT(INTEL_FBC_A) | BIT(INTEL_FBC_B) + .__runtime.fbc_mask = BIT(INTEL_FBC_A) | BIT(INTEL_FBC_B)__maybe_unused static const struct intel_device_info mtl_info = {
drivers/gpu/drm/i915/intel_device_info.c +3 -3
@@ -363,7 +363,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) "Display fused off, disabling\n"); info->display.pipe_mask =0 ; info->display.cpu_transcoder_mask =0 ; - info->display.fbc_mask =0 ; + runtime->fbc_mask =0 ; }else if (fuse_strap &IVB_PIPE_C_DISABLE ) {drm_info (&dev_priv->drm,"PipeC fused off\n" ); info->display.pipe_mask &= ~BIT (PIPE_C );
@@ -375,7 +375,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)if (dfsm &SKL_DFSM_PIPE_A_DISABLE ) { info->display.pipe_mask &= ~BIT (PIPE_A ); info->display.cpu_transcoder_mask &= ~BIT (TRANSCODER_A ); - info->display.fbc_mask &= ~BIT (INTEL_FBC_A ); + runtime->fbc_mask &= ~BIT (INTEL_FBC_A ); }if (dfsm &SKL_DFSM_PIPE_B_DISABLE ) { info->display.pipe_mask &= ~BIT (PIPE_B );
@@ -396,7 +396,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) info->display.has_hdcp =0 ;if (dfsm &SKL_DFSM_DISPLAY_PM_DISABLE ) - info->display.fbc_mask =0 ; + runtime->fbc_mask =0 ;if (DISPLAY_VER (dev_priv) >=11 && (dfsm &ICL_DFSM_DMC_DISABLE )) info->display.has_dmc =0 ;
drivers/gpu/drm/i915/intel_device_info.h +8 -4
@@ -217,12 +217,17 @@ struct intel_runtime_info {u16 device_id; -u8 num_sprites[I915_MAX_PIPES ]; -u8 num_scalers[I915_MAX_PIPES ]; -u32 rawclk_freq;struct intel_step_info step; + +/* display */ +struct { +u8 num_sprites[I915_MAX_PIPES ]; +u8 num_scalers[I915_MAX_PIPES ]; + +u8 fbc_mask; + }; };struct intel_device_info {
@@ -253,7 +258,6 @@ struct intel_device_info {u8 pipe_mask;u8 cpu_transcoder_mask; -u8 fbc_mask;u8 abox_mask;struct {
Signature · 1 line
2.34.1
PATCH v3 6/14 drm/i915: move page_sizes to runtime info
In reply to Jani NikulaIf it's modified runtime, it's runtime info.
--- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 +- .../gpu/drm/i915/gem/selftests/huge_pages.c | 14 +++++++------- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem.c | 3 +-- drivers/gpu/drm/i915/i915_pci.c | 18 +++++++++--------- drivers/gpu/drm/i915/intel_device_info.c | 2 +- drivers/gpu/drm/i915/intel_device_info.h | 4 ++-- .../gpu/drm/i915/selftests/mock_gem_device.c | 2 +- 8 files changed, 23 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_pages.c +1 -1
@@ -20,7 +20,7 @@ void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj, unsigned int sg_page_sizes) {struct drm_i915_private *i915 =to_i915 (obj->base.dev); -unsigned long supported =INTEL_INFO (i915)->page_sizes; +unsigned long supported =RUNTIME_INFO (i915)->page_sizes;bool shrinkable;int i;
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +7 -7
@@ -358,7 +358,7 @@ fake_huge_pages_object(struct drm_i915_private *i915, u64 size, bool single)static int igt_check_page_sizes (struct i915_vma *vma) {struct drm_i915_private *i915 = vma->vm->i915; -unsigned int supported =INTEL_INFO (i915)->page_sizes; +unsigned int supported =RUNTIME_INFO (i915)->page_sizes;struct drm_i915_gem_object *obj = vma->obj;int err;
@@ -419,7 +419,7 @@ static int igt_mock_exhaust_device_supported_pages(void *arg) {struct i915_ppgtt *ppgtt = arg;struct drm_i915_private *i915 = ppgtt->vm.i915; -unsigned int saved_mask =INTEL_INFO (i915)->page_sizes; +unsigned int saved_mask =RUNTIME_INFO (i915)->page_sizes;struct drm_i915_gem_object *obj;struct i915_vma *vma;int i, j, single;
@@ -438,7 +438,7 @@ static int igt_mock_exhaust_device_supported_pages(void *arg) combination |= page_sizes[j]; } -mkwrite_device_info (i915)->page_sizes = combination; +RUNTIME_INFO (i915)->page_sizes = combination;for (single =0 ; single <=1 ; ++single) { obj =fake_huge_pages_object (i915, combination, !!single);
@@ -485,7 +485,7 @@ static int igt_mock_exhaust_device_supported_pages(void *arg) out_put:i915_gem_object_put (obj); out_device: -mkwrite_device_info (i915)->page_sizes = saved_mask; +RUNTIME_INFO (i915)->page_sizes = saved_mask;return err; }
@@ -495,7 +495,7 @@ static int igt_mock_memory_region_huge_pages(void *arg)const unsigned int flags[] = {0 ,I915_BO_ALLOC_CONTIGUOUS };struct i915_ppgtt *ppgtt = arg;struct drm_i915_private *i915 = ppgtt->vm.i915; -unsigned long supported =INTEL_INFO (i915)->page_sizes; +unsigned long supported =RUNTIME_INFO (i915)->page_sizes;struct intel_memory_region *mem;struct drm_i915_gem_object *obj;struct i915_vma *vma;
@@ -573,7 +573,7 @@ static int igt_mock_ppgtt_misaligned_dma(void *arg) {struct i915_ppgtt *ppgtt = arg;struct drm_i915_private *i915 = ppgtt->vm.i915; -unsigned long supported =INTEL_INFO (i915)->page_sizes; +unsigned long supported =RUNTIME_INFO (i915)->page_sizes;struct drm_i915_gem_object *obj;int bit;int err;
@@ -1390,7 +1390,7 @@ static int igt_ppgtt_smoke_huge(void *arg)static int igt_ppgtt_sanity_check (void *arg) {struct drm_i915_private *i915 = arg; -unsigned int supported =INTEL_INFO (i915)->page_sizes; +unsigned int supported =RUNTIME_INFO (i915)->page_sizes;struct {igt_create_fn fn;unsigned int flags;
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1218,7 +1218,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_PAGE_SIZES (dev_priv, sizes) ({ \ GEM_BUG_ON((sizes) == 0); \ - ((sizes) & ~INTEL_INFO(dev_priv)->page_sizes) == 0; \ + ((sizes) & ~RUNTIME_INFO(dev_priv)->page_sizes) == 0; \ })#define HAS_OVERLAY (dev_priv) (INTEL_INFO(dev_priv)->display.has_overlay)
drivers/gpu/drm/i915/i915_gem.c +1 -2
@@ -1091,8 +1091,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)/* We need to fallback to 4K pages if host doesn't support huge gtt. */ if (intel_vgpu_active (dev_priv) && !intel_vgpu_has_huge_gtt (dev_priv)) -mkwrite_device_info (dev_priv)->page_sizes = -I915_GTT_PAGE_SIZE_4K ; +RUNTIME_INFO (dev_priv)->page_sizes =I915_GTT_PAGE_SIZE_4K ; ret =i915_gem_init_userptr (dev_priv);if (ret)
drivers/gpu/drm/i915/i915_pci.c +9 -9
@@ -160,7 +160,7 @@/* Keep in gen based order, and chronological order within a gen */ #define GEN_DEFAULT_PAGE_SIZES \ - .page_sizes = I915_GTT_PAGE_SIZE_4K + .__runtime.page_sizes = I915_GTT_PAGE_SIZE_4K#define GEN_DEFAULT_REGIONS \ .memory_regions = REGION_SMEM | REGION_STOLEN_SMEM
@@ -647,8 +647,8 @@ static const struct intel_device_info chv_info = { };#define GEN9_DEFAULT_PAGE_SIZES \ - .page_sizes = I915_GTT_PAGE_SIZE_4K | \ - I915_GTT_PAGE_SIZE_64K + .__runtime.page_sizes = I915_GTT_PAGE_SIZE_4K | \ + I915_GTT_PAGE_SIZE_64K#define GEN9_FEATURES \ GEN8_FEATURES, \
@@ -802,9 +802,9 @@ static const struct intel_device_info cml_gt2_info = { };#define GEN11_DEFAULT_PAGE_SIZES \ - .page_sizes = I915_GTT_PAGE_SIZE_4K | \ - I915_GTT_PAGE_SIZE_64K | \ - I915_GTT_PAGE_SIZE_2M + .__runtime.page_sizes = I915_GTT_PAGE_SIZE_4K | \ + I915_GTT_PAGE_SIZE_64K | \ + I915_GTT_PAGE_SIZE_2M#define GEN11_FEATURES \ GEN9_FEATURES, \
@@ -1001,9 +1001,9 @@ static const struct intel_device_info adl_p_info = {#undef GEN#define XE_HP_PAGE_SIZES \ - .page_sizes = I915_GTT_PAGE_SIZE_4K | \ - I915_GTT_PAGE_SIZE_64K | \ - I915_GTT_PAGE_SIZE_2M + .__runtime.page_sizes = I915_GTT_PAGE_SIZE_4K | \ + I915_GTT_PAGE_SIZE_64K | \ + I915_GTT_PAGE_SIZE_2M#define XE_HP_FEATURES \ .__runtime.graphics.ver = 12, \
drivers/gpu/drm/i915/intel_device_info.c +1 -1
@@ -110,7 +110,7 @@ void intel_device_info_print(const struct intel_device_info *info,drm_printf (p,"gt: %d\n" , info->gt);drm_printf (p,"memory-regions: %x\n" , info->memory_regions); -drm_printf (p,"page-sizes: %x\n" , info->page_sizes); +drm_printf (p,"page-sizes: %x\n" , runtime->page_sizes);drm_printf (p,"platform: %s\n" ,intel_platform_name (info->platform));drm_printf (p,"ppgtt-size: %d\n" , info->ppgtt_size);drm_printf (p,"ppgtt-type: %d\n" , info->ppgtt_type);
drivers/gpu/drm/i915/intel_device_info.h +2 -2
@@ -221,6 +221,8 @@ struct intel_runtime_info {struct intel_step_info step; +unsigned int page_sizes;/* page sizes supported by the HW */ +/* display */ struct {u8 num_sprites[I915_MAX_PIPES ];
@@ -242,8 +244,6 @@ struct intel_device_info {enum intel_ppgtt_type ppgtt_type;unsigned int ppgtt_size;/* log2, e.g. 31/32/48 bits */ -unsigned int page_sizes;/* page sizes supported by the HW */ -u32 memory_regions;/* regions supported by the HW */ u8 gt;/* GT number, 0 if undefined */
drivers/gpu/drm/i915/selftests/mock_gem_device.c +1 -1
@@ -174,7 +174,7 @@ struct drm_i915_private *mock_gem_device(void)RUNTIME_INFO (i915)->graphics.ver =-1 ; -mkwrite_device_info (i915)->page_sizes = +RUNTIME_INFO (i915)->page_sizes =I915_GTT_PAGE_SIZE_4K |I915_GTT_PAGE_SIZE_64K |I915_GTT_PAGE_SIZE_2M ;
Signature · 1 line
2.34.1
PATCH v3 7/14 drm/i915: move ppgtt_type and ppgtt_size to runtime info
In reply to Jani NikulaIf it's modified runtime, it's runtime info.
--- .../gpu/drm/i915/gem/selftests/huge_pages.c | 4 +-- drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_pci.c | 36 +++++++++---------- drivers/gpu/drm/i915/intel_device_info.c | 6 ++-- drivers/gpu/drm/i915/intel_device_info.h | 6 ++-- 6 files changed, 28 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +2 -2
@@ -1764,8 +1764,8 @@ int i915_gem_huge_page_mock_selftests(void)return -ENOMEM ;/* Pretend to be a device which supports the 48b PPGTT */ -mkwrite_device_info (dev_priv)->ppgtt_type =INTEL_PPGTT_FULL ; -mkwrite_device_info (dev_priv)->ppgtt_size =48 ; +RUNTIME_INFO (dev_priv)->ppgtt_type =INTEL_PPGTT_FULL ; +RUNTIME_INFO (dev_priv)->ppgtt_size =48 ; ppgtt =i915_ppgtt_create (to_gt (dev_priv),0 );if (IS_ERR (ppgtt)) {
drivers/gpu/drm/i915/gt/intel_ppgtt.c +1 -1
@@ -312,7 +312,7 @@ void ppgtt_init(struct i915_ppgtt *ppgtt, struct intel_gt *gt, ppgtt->vm.gt = gt; ppgtt->vm.i915 = i915; ppgtt->vm.dma = i915->drm.dev; - ppgtt->vm.total =BIT_ULL (INTEL_INFO (i915)->ppgtt_size); + ppgtt->vm.total =BIT_ULL (RUNTIME_INFO (i915)->ppgtt_size); ppgtt->vm.lmem_pt_obj_flags = lmem_pt_obj_flags;dma_resv_init (&ppgtt->vm._resv);
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1210,7 +1210,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_EXECLISTS (dev_priv) HAS_LOGICAL_RING_CONTEXTS(dev_priv) -#define INTEL_PPGTT (dev_priv) (INTEL_INFO(dev_priv)->ppgtt_type) +#define INTEL_PPGTT (dev_priv) (RUNTIME_INFO(dev_priv)->ppgtt_type)#define HAS_PPGTT (dev_priv) \ (INTEL_PPGTT(dev_priv) != INTEL_PPGTT_NONE)#define HAS_FULL_PPGTT (dev_priv) \
drivers/gpu/drm/i915/i915_pci.c +18 -18
@@ -421,8 +421,8 @@ static const struct intel_device_info ilk_m_info = { .has_rc6p = 1, \ .has_rps = true, \ .dma_mask_size = 40, \ - .ppgtt_type = INTEL_PPGTT_ALIASING, \ - .ppgtt_size =31 , \ + .__runtime.ppgtt_type = INTEL_PPGTT_ALIASING, \ + .__runtime.ppgtt_size =31 , \I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \ ILK_COLORS, \
@@ -474,8 +474,8 @@ static const struct intel_device_info snb_m_gt2_info = { .has_reset_engine = true, \ .has_rps = true, \ .dma_mask_size = 40, \ - .ppgtt_type = INTEL_PPGTT_ALIASING, \ - .ppgtt_size =31 , \ + .__runtime.ppgtt_type = INTEL_PPGTT_ALIASING, \ + .__runtime.ppgtt_size =31 , \IVB_PIPE_OFFSETS , \IVB_CURSOR_OFFSETS , \ IVB_COLORS, \
@@ -535,8 +535,8 @@ static const struct intel_device_info vlv_info = { .display.has_gmch = 1, .display.has_hotplug = 1, .dma_mask_size = 40, - .ppgtt_type = INTEL_PPGTT_ALIASING, - .ppgtt_size = 31, + .__runtime.ppgtt_type = INTEL_PPGTT_ALIASING, + .__runtime.ppgtt_size = 31, .has_snoop = true, .has_coherent_ggtt = false, .platform_engine_mask = BIT(RCS0) | BIT(VCS0) | BIT(BCS0),
@@ -585,8 +585,8 @@ static const struct intel_device_info hsw_gt3_info = { GEN(8), \ .has_logical_ring_contexts = 1, \ .dma_mask_size = 39, \ - .ppgtt_type = INTEL_PPGTT_FULL, \ - .ppgtt_size = 48, \ + .__runtime.ppgtt_type = INTEL_PPGTT_FULL, \ + .__runtime.ppgtt_size = 48, \ .has_64bit_reloc = 1#define BDW_PLATFORM \
@@ -633,8 +633,8 @@ static const struct intel_device_info chv_info = { .has_logical_ring_contexts = 1, .display.has_gmch = 1, .dma_mask_size = 39, - .ppgtt_type = INTEL_PPGTT_FULL, - .ppgtt_size = 32, + .__runtime.ppgtt_type = INTEL_PPGTT_FULL, + .__runtime.ppgtt_size = 32, .has_reset_engine = 1, .has_snoop = true, .has_coherent_ggtt = false,
@@ -719,8 +719,8 @@ static const struct intel_device_info skl_gt4_info = { .has_logical_ring_contexts = 1, \ .has_gt_uc = 1, \ .dma_mask_size = 39, \ - .ppgtt_type = INTEL_PPGTT_FULL, \ - .ppgtt_size = 48, \ + .__runtime.ppgtt_type = INTEL_PPGTT_FULL, \ + .__runtime.ppgtt_size = 48, \ .has_reset_engine = 1, \ .has_snoop = true, \ .has_coherent_ggtt = false, \
@@ -848,14 +848,14 @@ static const struct intel_device_info ehl_info = {GEN11_FEATURES ,PLATFORM (INTEL_ELKHARTLAKE ), .platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(VCS0) | BIT(VECS0), - .ppgtt_size = 36, + .__runtime.ppgtt_size = 36, };static const struct intel_device_info jsl_info = {GEN11_FEATURES ,PLATFORM (INTEL_JASPERLAKE ), .platform_engine_mask =BIT (RCS0 ) |BIT (BCS0 ) |BIT (VCS0 ) |BIT (VECS0 ), - .ppgtt_size =36 , + .__runtime.ppgtt_size =36 , };#define GEN12_FEATURES \
@@ -927,7 +927,7 @@ static const struct intel_device_info dg1_info = {BIT (RCS0 ) |BIT (BCS0 ) |BIT (VECS0 ) | BIT(VCS0) | BIT(VCS2),/* Wa_16011227922 */ - .ppgtt_size = 47, + .__runtime.ppgtt_size = 47, };static const struct intel_device_info adl_s_info = {
@@ -994,7 +994,7 @@ static const struct intel_device_info adl_p_info = { .display.has_psr_hw_tracking = 0, .platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2), - .ppgtt_size = 48, + .__runtime.ppgtt_size = 48, .dma_mask_size = 39, };
@@ -1023,8 +1023,8 @@ static const struct intel_device_info adl_p_info = { .has_reset_engine = 1, \ .has_rps = 1, \ .has_runtime_pm = 1, \ - .ppgtt_size = 48, \ - .ppgtt_type = INTEL_PPGTT_FULL + .__runtime.ppgtt_size = 48, \ + .__runtime.ppgtt_type = INTEL_PPGTT_FULL#define XE_HPM_FEATURES \ .media.ver = 12, \
drivers/gpu/drm/i915/intel_device_info.c +3 -3
@@ -112,8 +112,8 @@ void intel_device_info_print(const struct intel_device_info *info,drm_printf (p,"memory-regions: %x\n" , info->memory_regions);drm_printf (p,"page-sizes: %x\n" , runtime->page_sizes);drm_printf (p,"platform: %s\n" ,intel_platform_name (info->platform)); -drm_printf (p,"ppgtt-size: %d\n" , info->ppgtt_size); -drm_printf (p,"ppgtt-type: %d\n" , info->ppgtt_type); +drm_printf (p,"ppgtt-size: %d\n" , runtime->ppgtt_size); +drm_printf (p,"ppgtt-type: %d\n" , runtime->ppgtt_type);drm_printf (p,"dma_mask_size: %u\n" , info->dma_mask_size);#define PRINT_FLAG (name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->name))
@@ -409,7 +409,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)if (GRAPHICS_VER (dev_priv) ==6 &&i915_vtd_active (dev_priv)) {drm_info (&dev_priv->drm,"Disabling ppGTT for VT-d support\n" ); - info->ppgtt_type =INTEL_PPGTT_NONE ; + runtime->ppgtt_type =INTEL_PPGTT_NONE ; } runtime->rawclk_freq =intel_read_rawclk (dev_priv);
drivers/gpu/drm/i915/intel_device_info.h +3 -3
@@ -223,6 +223,9 @@ struct intel_runtime_info {unsigned int page_sizes;/* page sizes supported by the HW */ +enum intel_ppgtt_type ppgtt_type; +unsigned int ppgtt_size;/* log2, e.g. 31/32/48 bits */ +/* display */ struct {u8 num_sprites[I915_MAX_PIPES ];
@@ -241,9 +244,6 @@ struct intel_device_info {unsigned int dma_mask_size;/* available DMA address bits */ -enum intel_ppgtt_type ppgtt_type; -unsigned int ppgtt_size;/* log2, e.g. 31/32/48 bits */ -u32 memory_regions;/* regions supported by the HW */ u8 gt;/* GT number, 0 if undefined */
Signature · 1 line
2.34.1
PATCH v3 8/14 drm/i915: move has_pooled_eu to runtime info
In reply to Jani NikulaIf it's modified runtime, it's runtime info.
Curiously, the flag was never initialized statically.
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 5 ++--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 2 ++ drivers/gpu/drm/i915/intel_device_info.h | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +2 -3
@@ -382,7 +382,6 @@ static void cherryview_sseu_info_init(struct intel_gt *gt)static void gen9_sseu_info_init (struct intel_gt *gt) {struct drm_i915_private *i915 = gt->i915; -struct intel_device_info *info =mkwrite_device_info (i915);struct sseu_dev_info *sseu = >->info.sseu;struct intel_uncore *uncore = gt->uncore;u32 fuse2, eu_disable, subslice_mask;
@@ -471,10 +470,10 @@ static void gen9_sseu_info_init(struct intel_gt *gt)if (IS_GEN9_LP (i915)) {#define IS_SS_DISABLED (ss) (!(sseu->subslice_mask.hsw[0] & BIT(ss))) - info->has_pooled_eu =hweight8 (sseu->subslice_mask.hsw[0 ]) ==3 ; +RUNTIME_INFO (i915)->has_pooled_eu =hweight8 (sseu->subslice_mask.hsw[0 ]) ==3 ; sseu->min_eu_in_pool =0 ; -if (info->has_pooled_eu) { +if (HAS_POOLED_EU (i915)) {if (IS_SS_DISABLED (2 ) ||IS_SS_DISABLED (0 )) sseu->min_eu_in_pool =3 ;else if (IS_SS_DISABLED (1 ))
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1313,7 +1313,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_GT_UC (dev_priv) (INTEL_INFO(dev_priv)->has_gt_uc) -#define HAS_POOLED_EU (dev_priv) (INTEL_INFO(dev_priv)->has_pooled_eu) +#define HAS_POOLED_EU (dev_priv) (RUNTIME_INFO(dev_priv)->has_pooled_eu)#define HAS_GLOBAL_MOCS_REGISTERS (dev_priv) (INTEL_INFO(dev_priv)->has_global_mocs)
drivers/gpu/drm/i915/intel_device_info.c +2 -0
@@ -120,6 +120,8 @@ void intel_device_info_print(const struct intel_device_info *info,DEV_INFO_FOR_EACH_FLAG (PRINT_FLAG );#undef PRINT_FLAG +drm_printf (p,"has_pooled_eu: %s\n" ,str_yes_no (runtime->has_pooled_eu)); +#define PRINT_FLAG (name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->display.name))DEV_INFO_DISPLAY_FOR_EACH_FLAG (PRINT_FLAG );#undef PRINT_FLAG
drivers/gpu/drm/i915/intel_device_info.h +2 -1
@@ -164,7 +164,6 @@ enum intel_ppgtt_type {func (has_media_ratio_mode); \func (has_mslice_steering); \func (has_one_eu_per_fuse_bit); \ -func (has_pooled_eu); \func (has_pxp); \func (has_rc6); \func (has_rc6p); \
@@ -226,6 +225,8 @@ struct intel_runtime_info {enum intel_ppgtt_type ppgtt_type;unsigned int ppgtt_size;/* log2, e.g. 31/32/48 bits */ +bool has_pooled_eu; +/* display */ struct {u8 num_sprites[I915_MAX_PIPES ];
Signature · 1 line
2.34.1
PATCH v3 9/14 drm/i915: move memory_regions to runtime info
In reply to Jani NikulaIf it's modified runtime, it's runtime info.
mock_gem_device() is the only one that modifies it. If that could be fixed, we wouldn't have to do this.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_pci.c | 6 +++--- drivers/gpu/drm/i915/intel_device_info.c | 2 +- drivers/gpu/drm/i915/intel_device_info.h | 4 ++-- drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1302,7 +1302,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_IPC (dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc) -#define HAS_REGION (i915, i) (INTEL_INFO(i915)->memory_regions & (i)) +#define HAS_REGION (i915, i) (RUNTIME_INFO(i915)->memory_regions & (i))#define HAS_LMEM (i915) HAS_REGION(i915, REGION_LMEM)/*
drivers/gpu/drm/i915/i915_pci.c +3 -3
@@ -163,7 +163,7 @@ .__runtime.page_sizes = I915_GTT_PAGE_SIZE_4K#define GEN_DEFAULT_REGIONS \ - .memory_regions = REGION_SMEM | REGION_STOLEN_SMEM + .__runtime.memory_regions = REGION_SMEM | REGION_STOLEN_SMEM#define I830_FEATURES \ GEN(2), \
@@ -909,7 +909,7 @@ static const struct intel_device_info rkl_info = { };#define DGFX_FEATURES \ - .memory_regions = REGION_SMEM | REGION_LMEM | REGION_STOLEN_LMEM, \ + .__runtime.memory_regions = REGION_SMEM | REGION_LMEM | REGION_STOLEN_LMEM, \ .has_llc = 0, \ .has_pxp = 0, \ .has_snoop = 1, \
@@ -1129,7 +1129,7 @@ static const struct intel_device_info mtl_info = { .display.has_modular_fia = 1, .has_flat_ccs = 0, .has_snoop = 1, - .memory_regions = REGION_SMEM | REGION_STOLEN_LMEM, + .__runtime.memory_regions = REGION_SMEM | REGION_STOLEN_LMEM, .platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(CCS0), .require_force_probe = 1, };
drivers/gpu/drm/i915/intel_device_info.c +1 -1
@@ -109,7 +109,7 @@ void intel_device_info_print(const struct intel_device_info *info,drm_printf (p,"display version: %u\n" , info->display.ver);drm_printf (p,"gt: %d\n" , info->gt); -drm_printf (p,"memory-regions: %x\n" , info->memory_regions); +drm_printf (p,"memory-regions: %x\n" , runtime->memory_regions);drm_printf (p,"page-sizes: %x\n" , runtime->page_sizes);drm_printf (p,"platform: %s\n" ,intel_platform_name (info->platform));drm_printf (p,"ppgtt-size: %d\n" , runtime->ppgtt_size);
drivers/gpu/drm/i915/intel_device_info.h +2 -2
@@ -225,6 +225,8 @@ struct intel_runtime_info {enum intel_ppgtt_type ppgtt_type;unsigned int ppgtt_size;/* log2, e.g. 31/32/48 bits */ +u32 memory_regions;/* regions supported by the HW */ +bool has_pooled_eu;/* display */
@@ -245,8 +247,6 @@ struct intel_device_info {unsigned int dma_mask_size;/* available DMA address bits */ -u32 memory_regions;/* regions supported by the HW */ -u8 gt;/* GT number, 0 if undefined */ #define DEFINE_FLAG (name) u8 name:1
drivers/gpu/drm/i915/selftests/mock_gem_device.c +1 -1
@@ -179,7 +179,7 @@ struct drm_i915_private *mock_gem_device(void)I915_GTT_PAGE_SIZE_64K |I915_GTT_PAGE_SIZE_2M ; -mkwrite_device_info (i915)->memory_regions =REGION_SMEM ; +RUNTIME_INFO (i915)->memory_regions =REGION_SMEM ;intel_memory_regions_hw_probe (i915);spin_lock_init (&i915->gpu_error.lock);
Signature · 1 line
2.34.1
PATCH v3 10/14 drm/i915: move platform_engine_mask to runtime info
In reply to Jani NikulaIf it's modified runtime, it's runtime info.
mock_gem_device() is the only one that modifies it. If that could be fixed, we wouldn't have to do this.
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/i915_pci.c | 58 +++++++++---------- drivers/gpu/drm/i915/intel_device_info.h | 4 +- drivers/gpu/drm/i915/intel_uncore.c | 2 +- .../gpu/drm/i915/selftests/mock_gem_device.c | 2 +- 5 files changed, 34 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +1 -1
@@ -736,7 +736,7 @@ static intel_engine_mask_t init_engine_mask(struct intel_gt *gt)u16 vdbox_mask;u16 vebox_mask; - info->engine_mask =INTEL_INFO (i915)->platform_engine_mask; + info->engine_mask =RUNTIME_INFO (i915)->platform_engine_mask;if (GRAPHICS_VER (i915) <11 )return info->engine_mask;
drivers/gpu/drm/i915/i915_pci.c +29 -29
232 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.h +2 -2
@@ -216,6 +216,8 @@ struct intel_runtime_info {u16 device_id; +intel_engine_mask_t platform_engine_mask;/* Engines supported by the HW */ +u32 rawclk_freq;struct intel_step_info step;
@@ -241,8 +243,6 @@ struct intel_runtime_info {struct intel_device_info {struct ip_version media; -intel_engine_mask_t platform_engine_mask;/* Engines supported by the HW */ -enum intel_platform platform;unsigned int dma_mask_size;/* available DMA address bits */
drivers/gpu/drm/i915/intel_uncore.c +1 -1
@@ -2067,7 +2067,7 @@ static int intel_uncore_fw_domains_init(struct intel_uncore *uncore)if (GRAPHICS_VER (i915) >=11 ) {/* we'll prune the domains of missing engines later */ -intel_engine_mask_t emask =INTEL_INFO (i915)->platform_engine_mask; +intel_engine_mask_t emask =RUNTIME_INFO (i915)->platform_engine_mask;int i; uncore->fw_get_funcs = &uncore_get_fallback;
drivers/gpu/drm/i915/selftests/mock_gem_device.c +1 -1
@@ -209,7 +209,7 @@ struct drm_i915_private *mock_gem_device(void)mock_init_ggtt (to_gt (i915));to_gt (i915)->vm =i915_vm_get (&to_gt (i915)->ggtt->vm); -mkwrite_device_info (i915)->platform_engine_mask =BIT (0 ); +RUNTIME_INFO (i915)->platform_engine_mask =BIT (0 );to_gt (i915)->info.engine_mask =BIT (0 );to_gt (i915)->engine[RCS0 ] =mock_engine (i915,"mock" ,RCS0 );
Signature · 1 line
2.34.1
PATCH v3 11/14 drm/i915: move pipe_mask and cpu_transcoder_mask to runtime info
In reply to Jani NikulaIf it's modified runtime, it's runtime info.
--- drivers/gpu/drm/i915/display/intel_display.h | 4 +- drivers/gpu/drm/i915/i915_drv.h | 6 +- drivers/gpu/drm/i915/i915_pci.c | 66 ++++++++++---------- drivers/gpu/drm/i915/intel_device_info.c | 24 +++---- drivers/gpu/drm/i915/intel_device_info.h | 5 +- 5 files changed, 53 insertions(+), 52 deletions(-)
drivers/gpu/drm/i915/display/intel_display.h +2 -2
@@ -375,7 +375,7 @@ enum hpd_pin {#define for_each_pipe (__dev_priv, __p) \ for ((__p) = 0; (__p) < I915_MAX_PIPES; (__p)++) \ - for_each_if(INTEL_INFO(__dev_priv)->display.pipe_mask & BIT(__p)) + for_each_if(RUNTIME_INFO(__dev_priv)->pipe_mask & BIT(__p))#define for_each_pipe_masked (__dev_priv, __p, __mask) \ for_each_pipe(__dev_priv, __p) \
@@ -383,7 +383,7 @@ enum hpd_pin {#define for_each_cpu_transcoder (__dev_priv, __t) \ for ((__t) = 0; (__t) < I915_MAX_TRANSCODERS; (__t)++) \ - for_each_if (INTEL_INFO(__dev_priv)->display.cpu_transcoder_mask & BIT(__t)) + for_each_if (RUNTIME_INFO(__dev_priv)->cpu_transcoder_mask & BIT(__t))#define for_each_cpu_transcoder_masked (__dev_priv, __t, __mask) \ for_each_cpu_transcoder(__dev_priv, __t) \
drivers/gpu/drm/i915/i915_drv.h +3 -3
@@ -1264,7 +1264,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_PSR_HW_TRACKING (dev_priv) \ (INTEL_INFO(dev_priv)->display.has_psr_hw_tracking)#define HAS_PSR2_SEL_FETCH (dev_priv) (DISPLAY_VER(dev_priv) >= 12) -#define HAS_TRANSCODER (dev_priv, trans) ((INTEL_INFO(dev_priv)->display.cpu_transcoder_mask & BIT(trans)) != 0) +#define HAS_TRANSCODER (dev_priv, trans) ((RUNTIME_INFO(dev_priv)->cpu_transcoder_mask & BIT(trans)) != 0)#define HAS_RC6 (dev_priv) (INTEL_INFO(dev_priv)->has_rc6)#define HAS_RC6p (dev_priv) (INTEL_INFO(dev_priv)->has_rc6p)
@@ -1335,9 +1335,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define GT_FREQUENCY_MULTIPLIER 50#define GEN9_FREQ_SCALER 3 -#define INTEL_NUM_PIPES (dev_priv) (hweight8(INTEL_INFO(dev_priv)->display.pipe_mask)) +#define INTEL_NUM_PIPES (dev_priv) (hweight8(RUNTIME_INFO(dev_priv)->pipe_mask)) -#define HAS_DISPLAY (dev_priv) (INTEL_INFO(dev_priv)->display.pipe_mask != 0) +#define HAS_DISPLAY (dev_priv) (RUNTIME_INFO(dev_priv)->pipe_mask != 0)#define HAS_VRR (i915) (DISPLAY_VER(i915) >= 11)
drivers/gpu/drm/i915/i915_pci.c +33 -33
186 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.c +12 -12
@@ -363,35 +363,35 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) !(sfuse_strap & SFUSE_STRAP_FUSE_LOCK))) {drm_info (&dev_priv->drm,"Display fused off, disabling\n" ); - info->display.pipe_mask =0 ; - info->display.cpu_transcoder_mask =0 ; + runtime->pipe_mask =0 ; + runtime->cpu_transcoder_mask =0 ; runtime->fbc_mask =0 ; } else if (fuse_strap & IVB_PIPE_C_DISABLE) {drm_info (&dev_priv->drm,"PipeC fused off\n" ); - info->display.pipe_mask &= ~BIT (PIPE_C ); - info->display.cpu_transcoder_mask &= ~BIT (TRANSCODER_C ); + runtime->pipe_mask &= ~BIT (PIPE_C ); + runtime->cpu_transcoder_mask &= ~BIT (TRANSCODER_C ); } }else if (HAS_DISPLAY (dev_priv) &&DISPLAY_VER (dev_priv) >=9 ) {u32 dfsm =intel_de_read (dev_priv,SKL_DFSM );if (dfsm &SKL_DFSM_PIPE_A_DISABLE ) { - info->display.pipe_mask &= ~BIT (PIPE_A ); - info->display.cpu_transcoder_mask &= ~BIT (TRANSCODER_A ); + runtime->pipe_mask &= ~BIT (PIPE_A ); + runtime->cpu_transcoder_mask &= ~BIT (TRANSCODER_A ); runtime->fbc_mask &= ~BIT (INTEL_FBC_A ); }if (dfsm &SKL_DFSM_PIPE_B_DISABLE ) { - info->display.pipe_mask &= ~BIT (PIPE_B ); - info->display.cpu_transcoder_mask &= ~BIT (TRANSCODER_B ); + runtime->pipe_mask &= ~BIT (PIPE_B ); + runtime->cpu_transcoder_mask &= ~BIT (TRANSCODER_B ); }if (dfsm &SKL_DFSM_PIPE_C_DISABLE ) { - info->display.pipe_mask &= ~BIT (PIPE_C ); - info->display.cpu_transcoder_mask &= ~BIT (TRANSCODER_C ); + runtime->pipe_mask &= ~BIT (PIPE_C ); + runtime->cpu_transcoder_mask &= ~BIT (TRANSCODER_C ); }if (DISPLAY_VER (dev_priv) >=12 && (dfsm &TGL_DFSM_PIPE_D_DISABLE )) { - info->display.pipe_mask &= ~BIT (PIPE_D ); - info->display.cpu_transcoder_mask &= ~BIT (TRANSCODER_D ); + runtime->pipe_mask &= ~BIT (PIPE_D ); + runtime->cpu_transcoder_mask &= ~BIT (TRANSCODER_D ); }if (dfsm &SKL_DFSM_DISPLAY_HDCP_DISABLE )
drivers/gpu/drm/i915/intel_device_info.h +3 -2
@@ -233,6 +233,9 @@ struct intel_runtime_info {/* display */ struct { +u8 pipe_mask; +u8 cpu_transcoder_mask; +u8 num_sprites[I915_MAX_PIPES ];u8 num_scalers[I915_MAX_PIPES ];
@@ -257,8 +260,6 @@ struct intel_device_info {u8 ver;u8 rel; -u8 pipe_mask; -u8 cpu_transcoder_mask;u8 abox_mask;struct {
Signature · 1 line
2.34.1
PATCH v3 12/14 drm/i915: move has_hdcp to runtime info
In reply to Jani NikulaIf it's modified runtime, it's runtime info.
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++-- drivers/gpu/drm/i915/i915_pci.c | 6 +++--- drivers/gpu/drm/i915/intel_device_info.c | 4 +++- drivers/gpu/drm/i915/intel_device_info.h | 3 ++- 4 files changed, 10 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +2 -2
@@ -1110,8 +1110,8 @@ static void intel_hdcp_prop_work(struct work_struct *work)bool is_hdcp_supported (struct drm_i915_private *dev_priv,enum port port) { -return INTEL_INFO (dev_priv)->display.has_hdcp && - (DISPLAY_VER (dev_priv) >=12 || port <PORT_E ); +return RUNTIME_INFO (dev_priv)->has_hdcp && + (DISPLAY_VER (dev_priv) >=12 || port <PORT_E ); } static int
drivers/gpu/drm/i915/i915_pci.c +3 -3
@@ -656,7 +656,7 @@ static const struct intel_device_info chv_info = { GEN9_DEFAULT_PAGE_SIZES, \ .display.has_dmc = 1, \ .has_gt_uc = 1, \ - .display.has_hdcp = 1, \ + .__runtime.has_hdcp = 1, \ .display.has_ipc = 1, \ .display.has_psr = 1, \ .display.has_psr_hw_tracking = 1, \
@@ -708,7 +708,7 @@ static const struct intel_device_info skl_gt4_info = { .display.has_ddi = 1, \ .display.has_fpga_dbg = 1, \ .__runtime.fbc_mask = BIT(INTEL_FBC_A), \ - .display.has_hdcp = 1, \ + .__runtime.has_hdcp = 1, \ .display.has_psr = 1, \ .display.has_psr_hw_tracking = 1, \ .has_runtime_pm = 1, \
@@ -958,7 +958,7 @@ static const struct intel_device_info adl_s_info = { .display.has_dsc = 1, \ .__runtime.fbc_mask = BIT(INTEL_FBC_A), \ .display.has_fpga_dbg = 1, \ - .display.has_hdcp = 1, \ + .__runtime.has_hdcp = 1, \ .display.has_hotplug = 1, \ .display.has_ipc = 1, \ .display.has_psr = 1, \
drivers/gpu/drm/i915/intel_device_info.c +3 -1
@@ -126,6 +126,8 @@ void intel_device_info_print(const struct intel_device_info *info,DEV_INFO_DISPLAY_FOR_EACH_FLAG (PRINT_FLAG );#undef PRINT_FLAG +drm_printf (p,"has_hdcp: %s\n" ,str_yes_no (runtime->has_hdcp)); +drm_printf (p,"rawclk rate: %u kHz\n" , runtime->rawclk_freq); }
@@ -395,7 +397,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) }if (dfsm &SKL_DFSM_DISPLAY_HDCP_DISABLE ) - info->display.has_hdcp =0 ; + runtime->has_hdcp =0 ;if (dfsm &SKL_DFSM_DISPLAY_PM_DISABLE ) runtime->fbc_mask =0 ;
drivers/gpu/drm/i915/intel_device_info.h +2 -1
@@ -185,7 +185,6 @@ enum intel_ppgtt_type {func (has_dsc); \func (has_fpga_dbg); \func (has_gmch); \ -func (has_hdcp); \func (has_hotplug); \func (has_hti); \func (has_ipc); \
@@ -240,6 +239,8 @@ struct intel_runtime_info {u8 num_scalers[I915_MAX_PIPES ];u8 fbc_mask; + +bool has_hdcp; }; };
Signature · 1 line
2.34.1
PATCH v3 13/14 drm/i915: move has_dmc to runtime info
In reply to Jani NikulaIf it's modified runtime, it's runtime info.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_pci.c | 6 +++--- drivers/gpu/drm/i915/intel_device_info.c | 3 ++- drivers/gpu/drm/i915/intel_device_info.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1272,7 +1272,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_RPS (dev_priv) (INTEL_INFO(dev_priv)->has_rps) -#define HAS_DMC (dev_priv) (INTEL_INFO(dev_priv)->display.has_dmc) +#define HAS_DMC (dev_priv) (RUNTIME_INFO(dev_priv)->has_dmc)#define HAS_HECI_PXP (dev_priv) \ (INTEL_INFO(dev_priv)->has_heci_pxp)
drivers/gpu/drm/i915/i915_pci.c +3 -3
@@ -654,7 +654,7 @@ static const struct intel_device_info chv_info = {GEN8_FEATURES , \GEN (9 ), \GEN9_DEFAULT_PAGE_SIZES , \ - .display.has_dmc = 1, \ + .__runtime.has_dmc = 1, \ .has_gt_uc = 1, \ .__runtime.has_hdcp = 1, \ .display.has_ipc = 1, \
@@ -712,7 +712,7 @@ static const struct intel_device_info skl_gt4_info = { .display.has_psr = 1, \ .display.has_psr_hw_tracking = 1, \ .has_runtime_pm = 1, \ - .display.has_dmc = 1, \ + .__runtime.has_dmc = 1, \ .has_rc6 = 1, \ .has_rps = true, \ .display.has_dp_mst = 1, \
@@ -952,7 +952,7 @@ static const struct intel_device_info adl_s_info = { .display.dbuf.slice_mask = BIT(DBUF_S1) | BIT(DBUF_S2) | BIT(DBUF_S3) | \ BIT(DBUF_S4), \ .display.has_ddi = 1, \ - .display.has_dmc = 1, \ + .__runtime.has_dmc = 1, \ .display.has_dp_mst = 1, \ .display.has_dsb = 1, \ .display.has_dsc = 1, \
drivers/gpu/drm/i915/intel_device_info.c +2 -1
@@ -127,6 +127,7 @@ void intel_device_info_print(const struct intel_device_info *info,#undef PRINT_FLAGdrm_printf (p,"has_hdcp: %s\n" ,str_yes_no (runtime->has_hdcp)); +drm_printf (p,"has_dmc: %s\n" ,str_yes_no (runtime->has_dmc));drm_printf (p,"rawclk rate: %u kHz\n" , runtime->rawclk_freq); }
@@ -403,7 +404,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) runtime->fbc_mask =0 ;if (DISPLAY_VER (dev_priv) >=11 && (dfsm &ICL_DFSM_DMC_DISABLE )) - info->display.has_dmc =0 ; + runtime->has_dmc =0 ;if (DISPLAY_VER (dev_priv) >=10 && (dfsm &GLK_DFSM_DISPLAY_DSC_DISABLE ))
drivers/gpu/drm/i915/intel_device_info.h +1 -1
@@ -178,7 +178,6 @@ enum intel_ppgtt_type {/* Keep in alphabetical order */ \func (cursor_needs_physical); \func (has_cdclk_crawl); \ -func (has_dmc); \func (has_ddi); \func (has_dp_mst); \func (has_dsb); \
@@ -241,6 +240,7 @@ struct intel_runtime_info {u8 fbc_mask;bool has_hdcp; +bool has_dmc; }; };
Signature · 1 line
2.34.1
PATCH v3 14/14 drm/i915: move has_dsc to runtime info
In reply to Jani NikulaIf it's modified runtime, it's runtime info.
--- drivers/gpu/drm/i915/display/intel_vdsc.c | 2 +- drivers/gpu/drm/i915/i915_pci.c | 4 ++-- drivers/gpu/drm/i915/intel_device_info.c | 3 ++- drivers/gpu/drm/i915/intel_device_info.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_vdsc.c +1 -1
@@ -344,7 +344,7 @@ bool intel_dsc_source_support(const struct intel_crtc_state *crtc_state)struct drm_i915_private *i915 =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; -if (!INTEL_INFO (i915)->display.has_dsc) +if (!RUNTIME_INFO (i915)->has_dsc)return false;if (DISPLAY_VER (i915) >=12 )
drivers/gpu/drm/i915/i915_pci.c +2 -2
@@ -833,7 +833,7 @@ static const struct intel_device_info cml_gt2_info = { ICL_COLORS, \ .display.dbuf.size = 2048, \ .display.dbuf.slice_mask = BIT(DBUF_S1) | BIT(DBUF_S2), \ - .display.has_dsc = 1, \ + .__runtime.has_dsc = 1, \ .has_coherent_ggtt = false, \ .has_logical_ring_elsq = 1
@@ -955,7 +955,7 @@ static const struct intel_device_info adl_s_info = { .__runtime.has_dmc = 1, \ .display.has_dp_mst = 1, \ .display.has_dsb = 1, \ - .display.has_dsc = 1, \ + .__runtime.has_dsc = 1, \ .__runtime.fbc_mask = BIT(INTEL_FBC_A), \ .display.has_fpga_dbg = 1, \ .__runtime.has_hdcp = 1, \
drivers/gpu/drm/i915/intel_device_info.c +2 -1
@@ -128,6 +128,7 @@ void intel_device_info_print(const struct intel_device_info *info,drm_printf (p,"has_hdcp: %s\n" ,str_yes_no (runtime->has_hdcp));drm_printf (p,"has_dmc: %s\n" ,str_yes_no (runtime->has_dmc)); +drm_printf (p,"has_dsc: %s\n" ,str_yes_no (runtime->has_dsc));drm_printf (p,"rawclk rate: %u kHz\n" , runtime->rawclk_freq); }
@@ -408,7 +409,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)if (DISPLAY_VER (dev_priv) >=10 && (dfsm &GLK_DFSM_DISPLAY_DSC_DISABLE )) - info->display.has_dsc =0 ; + runtime->has_dsc =0 ; }if (GRAPHICS_VER (dev_priv) ==6 &&i915_vtd_active (dev_priv)) {
drivers/gpu/drm/i915/intel_device_info.h +1 -1
@@ -181,7 +181,6 @@ enum intel_ppgtt_type {func (has_ddi); \func (has_dp_mst); \func (has_dsb); \ -func (has_dsc); \func (has_fpga_dbg); \func (has_gmch); \func (has_hotplug); \
@@ -241,6 +240,7 @@ struct intel_runtime_info {bool has_hdcp;bool has_dmc; +bool has_dsc; }; };
Signature · 1 line
2.34.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: stop modifying "const" device info (rev3)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: stop modifying "const" device info (rev3)
URL : https://patchwork.freedesktop.org/series/105358/
State : warning
== Summary ==
Error: dim checkpatch failedb0d2dc3296d2 drm/i915/guc: remove runtime info printing from time stamp logging ca2ba90a7f98 drm/i915: combine device info printing into one ab44989bcb61 drm/i915: add initial runtime info into device info -:51: WARNING:REPEATED_WORD: Possible repeated word: 'into'
#51: FILE: drivers/gpu/drm/i915/intel_device_info.h:208:
+ * Platform mask is used for optimizing or-ed IS_PLATFORM calls into
+ * into single runtime conditionals, and also to provide groundwork
total: 0 errors, 1 warnings, 0 checks, 75 lines checked71e774dd9e8f drm/i915: move graphics.ver and graphics.rel to runtime info -:26: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #26: FILE: drivers/gpu/drm/i915/i915_drv.h:860:
+#define GRAPHICS_VER_FULL(i915) IP_VER(RUNTIME_INFO(i915)->graphics.ver, \
+ RUNTIME_INFO(i915)->graphics.rel)
-:98: WARNING:LONG_LINE: line length of 103 exceeds 100 columns #98: FILE: drivers/gpu/drm/i915/i915_pci.c:1283:
+ int gttmmaddr_bar = intel_info->__runtime.graphics.ver == 2 ? GEN2_GTTMMADR_BAR : GTTMMADR_BAR;
total: 0 errors, 1 warnings, 1 checks, 110 lines checked99de4de7e04e drm/i915: move fbc_mask to runtime info61b6bc9097c5 drm/i915: move page_sizes to runtime infofcf384b10cc8 drm/i915: move ppgtt_type and ppgtt_size to runtime info 0902f0150e0b drm/i915: move has_pooled_eu to runtime info4d5aeb8c0dde drm/i915: move memory_regions to runtime info04bd7c48a683 drm/i915: move platform_engine_mask to runtime info e4604743924d drm/i915: move pipe_mask and cpu_transcoder_mask to runtime info -:30: WARNING:SPACING: space prohibited between function name and open parenthesis '(' #30: FILE: drivers/gpu/drm/i915/display/intel_display.h:386:
+ for_each_if (RUNTIME_INFO(__dev_priv)->cpu_transcoder_mask & BIT(__t))
-:43: WARNING:LONG_LINE: line length of 106 exceeds 100 columns #43: FILE: drivers/gpu/drm/i915/i915_drv.h:1267:
+#define HAS_TRANSCODER(dev_priv, trans) ((RUNTIME_INFO(dev_priv)->cpu_transcoder_mask & BIT(trans)) != 0)
-:136: WARNING:LONG_LINE: line length of 101 exceeds 100 columns #136: FILE: drivers/gpu/drm/i915/i915_pci.c:465:
+ .__runtime.cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | BIT(TRANSCODER_C), \
total: 0 errors, 3 warnings, 0 checks, 285 lines checked 3205ead7dc2a drm/i915: move has_hdcp to runtime info 196f272a50df drm/i915: move has_dmc to runtime info 6bb1a3f667f9 drm/i915: move has_dsc to runtime info
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: stop modifying "const" device info (rev3)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: stop modifying "const" device info (rev3)
URL : https://patchwork.freedesktop.org/series/105358/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: stop modifying "const" device info (rev3)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: stop modifying "const" device info (rev3)
URL : https://patchwork.freedesktop.org/series/105358/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12014 -> Patchwork_105358v3
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/index.html
Participating hosts (30 -> 38)
------------------------------
Additional (8): fi-rkl-11600 bat-dg1-5 bat-dg2-8 bat-adlp-4 bat-jsl-3 bat-rplp-1 bat-rpls-1 bat-dg2-10
Known issues
------------
Here are the changes found in Patchwork_105358v3 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@fbdev@info:
- bat-adlp-4: NOTRUN -> [SKIP][1] ([i915#2582]) +4 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
* igt@fbdev@read:
- bat-dg1-5: NOTRUN -> [SKIP][2] ([i915#2582]) +4 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-rkl-11600: NOTRUN -> [SKIP][3] ([i915#2190])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-rkl-11600: NOTRUN -> [SKIP][4] ([i915#4613]) +3 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@[email protected]
* igt@gem_lmem_swapping@verify-random:
- bat-adlp-4: NOTRUN -> [SKIP][5] ([i915#4613]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
* igt@gem_mmap@basic:
- bat-dg1-5: NOTRUN -> [SKIP][6] ([i915#4083])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@gem_tiled_fence_blits@basic:
- bat-dg1-5: NOTRUN -> [SKIP][7] ([i915#4077]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@gem_tiled_pread_basic:
- fi-rkl-11600: NOTRUN -> [SKIP][8] ([i915#3282])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@gem_tiled_pread_basic.html
- bat-dg1-5: NOTRUN -> [SKIP][9] ([i915#4079]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@gem_tiled_pread_basic.html
- bat-adlp-4: NOTRUN -> [SKIP][10] ([i915#3282])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- fi-rkl-11600: NOTRUN -> [SKIP][11] ([i915#3012])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][12] ([i915#1155])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
- bat-adlp-4: NOTRUN -> [SKIP][13] ([i915#1155])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
* igt@i915_pm_rps@basic-api:
- bat-dg1-5: NOTRUN -> [SKIP][14] ([i915#6621])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
- bat-adlp-4: NOTRUN -> [SKIP][15] ([i915#6621])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- bat-dg1-5: NOTRUN -> [DMESG-FAIL][16] ([i915#4494] / [i915#4957])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@i915_selftest@[email protected]
* igt@i915_suspend@basic-s2idle-without-i915:
- bat-dg1-5: NOTRUN -> [INCOMPLETE][17] ([i915#6011])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: NOTRUN -> [INCOMPLETE][18] ([i915#5982])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@[email protected]
- fi-hsw-4770: NOTRUN -> [INCOMPLETE][19] ([i915#4817] / [i915#6598])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-hsw-4770/igt@[email protected]
* igt@kms_addfb_basic@basic-x-tiled-legacy:
- bat-dg1-5: NOTRUN -> [SKIP][20] ([i915#4212]) +7 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg1-5: NOTRUN -> [SKIP][21] ([i915#4215])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@kms_busy@basic:
- bat-dg1-5: NOTRUN -> [SKIP][22] ([i915#1845] / [i915#4303])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- bat-adlp-4: NOTRUN -> [SKIP][23] ([fdo#111827]) +8 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-rkl-11600: NOTRUN -> [SKIP][24] ([fdo#111827]) +7 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][25] ([fdo#111827]) +7 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- fi-rkl-11600: NOTRUN -> [SKIP][26] ([i915#4103])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@[email protected]
* igt@kms_flip@basic-plain-flip:
- bat-adlp-4: NOTRUN -> [SKIP][27] ([i915#3637]) +3 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-rkl-11600: NOTRUN -> [SKIP][28] ([fdo#109285] / [i915#4098])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][29] ([fdo#109285])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@kms_force_connector_basic@prune-stale-modes:
- bat-adlp-4: NOTRUN -> [SKIP][30] ([i915#4093]) +3 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- bat-adlp-4: NOTRUN -> [SKIP][31] ([i915#4342])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc:
- bat-dg1-5: NOTRUN -> [SKIP][32] ([i915#4078]) +13 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc:
- bat-adlp-4: NOTRUN -> [SKIP][33] ([i915#3546]) +10 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
* igt@kms_psr@sprite_plane_onoff:
- fi-rkl-11600: NOTRUN -> [SKIP][34] ([i915#1072]) +3 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@kms_psr@sprite_plane_onoff.html
- bat-dg1-5: NOTRUN -> [SKIP][35] ([i915#1072] / [i915#4078]) +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@kms_psr@sprite_plane_onoff.html
- bat-adlp-4: NOTRUN -> [SKIP][36] ([i915#1072]) +3 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-rkl-11600: NOTRUN -> [SKIP][37] ([i915#3555] / [i915#4098])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][38] ([i915#3555])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
- bat-adlp-4: NOTRUN -> [SKIP][39] ([i915#3555] / [i915#4579])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- bat-adlp-4: NOTRUN -> [SKIP][40] ([fdo#109295] / [i915#3546] / [i915#3708])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][41] ([i915#1845] / [i915#3708])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@prime_vgem@basic-fence-read:
- bat-dg1-5: NOTRUN -> [SKIP][42] ([i915#3708]) +2 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@prime_vgem@basic-gtt:
- bat-dg1-5: NOTRUN -> [SKIP][43] ([i915#3708] / [i915#4077]) +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
* igt@prime_vgem@basic-read:
- fi-rkl-11600: NOTRUN -> [SKIP][44] ([fdo#109295] / [i915#3291] / [i915#3708]) +2 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- bat-adlp-4: NOTRUN -> [SKIP][45] ([fdo#109295] / [i915#3301] / [i915#3708])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][46] ([i915#3708] / [i915#4873])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
- fi-rkl-11600: NOTRUN -> [SKIP][47] ([fdo#109295] / [i915#3301] / [i915#3708])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-rkl-11600/igt@[email protected]
* igt@prime_vgem@basic-write:
- bat-adlp-4: NOTRUN -> [SKIP][48] ([fdo#109295] / [i915#3291] / [i915#3708]) +2 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-adlp-4/igt@[email protected]
* igt@runner@aborted:
- bat-dg1-5: NOTRUN -> [FAIL][49] ([i915#4312] / [i915#5257])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-5/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [INCOMPLETE][50] ([i915#4785]) -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/fi-hsw-4770/igt@i915_selftest@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-hsw-4770/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@i915_selftest@live@hangcheck:
- bat-dg1-6: [DMESG-FAIL][52] ([i915#4494] / [i915#4957]) -> [DMESG-FAIL][53] ([i915#4957])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/bat-dg1-6/igt@i915_selftest@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/bat-dg1-6/igt@i915_selftest@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- fi-elk-e7500: [INCOMPLETE][54] ([i915#6648]) -> [INCOMPLETE][55] ([i915#6598] / [i915#6601] / [i915#6648])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/fi-elk-e7500/igt@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/fi-elk-e7500/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3003]: https://gitlab.freedesktop.org/drm/intel/issues/3003
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3595]: https://gitlab.freedesktop.org/drm/intel/issues/3595
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4093]: https://gitlab.freedesktop.org/drm/intel/issues/4093
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4303]: https://gitlab.freedesktop.org/drm/intel/issues/4303
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4342]: https://gitlab.freedesktop.org/drm/intel/issues/4342
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4817]: https://gitlab.freedesktop.org/drm/intel/issues/4817
[i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
[i915#4957]: https://gitlab.freedesktop.org/drm/intel/issues/4957
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5982]: https://gitlab.freedesktop.org/drm/intel/issues/5982
[i915#6011]: https://gitlab.freedesktop.org/drm/intel/issues/6011
[i915#6530]: https://gitlab.freedesktop.org/drm/intel/issues/6530
[i915#6598]: https://gitlab.freedesktop.org/drm/intel/issues/6598
[i915#6601]: https://gitlab.freedesktop.org/drm/intel/issues/6601
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6642]: https://gitlab.freedesktop.org/drm/intel/issues/6642
[i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645
[i915#6648]: https://gitlab.freedesktop.org/drm/intel/issues/6648
Build changes
-------------
* Linux: CI_DRM_12014 -> Patchwork_105358v3
CI-20190529: 20190529
CI_DRM_12014: 1de33826aa86910c175ca773bc8f92d5948d094e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6634: e01fe99f00692864b709253638c809231d1fb333 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_105358v3: 1de33826aa86910c175ca773bc8f92d5948d094e @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
ca6598fe6d21 drm/i915: move has_dsc to runtime infoe3b6900726f5 drm/i915: move has_dmc to runtime infoaccfd74725b4 drm/i915: move has_hdcp to runtime infob82fd8c3d0fc drm/i915: move pipe_mask and cpu_transcoder_mask to runtime info 440a987a6620 drm/i915: move platform_engine_mask to runtime info 33da828941d6 drm/i915: move memory_regions to runtime info d9bc6d4fd824 drm/i915: move has_pooled_eu to runtime info 041aba682cca drm/i915: move ppgtt_type and ppgtt_size to runtime info 4a635d6b0471 drm/i915: move page_sizes to runtime info 42b269136513 drm/i915: move fbc_mask to runtime info47b01115e1ed drm/i915: move graphics.ver and graphics.rel to runtime info b0a2900c175a drm/i915: add initial runtime info into device info 5bd53f64f603 drm/i915: combine device info printing into one c314db28d09d drm/i915/guc: remove runtime info printing from time stamp logging
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: stop modifying "const" device info (rev3)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: stop modifying "const" device info (rev3)
URL : https://patchwork.freedesktop.org/series/105358/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12014_full -> Patchwork_105358v3_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_105358v3_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_105358v3_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Participating hosts (13 -> 11)
------------------------------
Missing (2): shard-rkl shard-dg1
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_105358v3_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_pipe_crc_basic@suspend-read-crc@pipe-a-hdmi-a-1:
- shard-glk: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-glk9/igt@kms_pipe_crc_basic@[email protected]
Known issues
------------
Here are the changes found in Patchwork_105358v3_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@kms:
- shard-tglb: [PASS][2] -> [FAIL][3] ([i915#5784])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-tglb7/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-tglb3/igt@[email protected]
* igt@gem_exec_balancer@parallel:
- shard-iclb: [PASS][4] -> [SKIP][5] ([i915#4525])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-iclb4/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-iclb3/igt@[email protected]
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [PASS][6] -> [FAIL][7] ([i915#2842]) +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-kbl4/igt@gem_exec_fair@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-glk: NOTRUN -> [FAIL][8] ([i915#2842])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-glk9/igt@gem_exec_fair@[email protected]
* igt@gem_huc_copy@huc-copy:
- shard-glk: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#2190])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-glk9/igt@[email protected]
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [PASS][10] -> [FAIL][11] ([i915#644])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-glk3/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-glk7/igt@[email protected]
* igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#3886])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-glk9/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_chamelium@hdmi-hpd-for-each-pipe:
- shard-kbl: NOTRUN -> [SKIP][13] ([fdo#109271] / [fdo#111827])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl1/igt@[email protected]
* igt@kms_chamelium@vga-hpd-enable-disable-mode:
- shard-glk: NOTRUN -> [SKIP][14] ([fdo#109271] / [fdo#111827]) +2 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-glk5/igt@[email protected]
* igt@kms_cursor_legacy@cursor-vs-flip@varying-size:
- shard-iclb: [PASS][15] -> [FAIL][16] ([i915#5072]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-iclb6/igt@kms_cursor_legacy@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-iclb7/igt@kms_cursor_legacy@[email protected]
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-tglb: [PASS][17] -> [INCOMPLETE][18] ([i915#2411] / [i915#6021] / [i915#6598])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-tglb7/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-tglb5/igt@[email protected]
* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-kbl: [PASS][19] -> [DMESG-WARN][20] ([i915#180]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-kbl1/igt@kms_flip@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl7/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][21] ([i915#2672]) +7 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-iclb5/igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][22] ([i915#2672] / [i915#3555])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-iclb1/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-valid-mode.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-onoff:
- shard-kbl: NOTRUN -> [SKIP][23] ([fdo#109271]) +45 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl1/igt@[email protected]
* igt@kms_hdr@bpc-switch-dpms@pipe-a-dp-1:
- shard-kbl: [PASS][24] -> [FAIL][25] ([i915#1188]) +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-kbl1/igt@kms_hdr@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl7/igt@kms_hdr@[email protected]
* igt@kms_plane_scaling@plane-upscale-with-rotation-factor-0-25@pipe-a-hdmi-a-1:
- shard-glk: NOTRUN -> [SKIP][26] ([fdo#109271]) +28 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-glk9/igt@kms_plane_scaling@[email protected]
* igt@kms_psr2_su@page_flip-xrgb8888:
- shard-kbl: NOTRUN -> [SKIP][27] ([fdo#109271] / [i915#658])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl1/igt@kms_psr2_su@page_flip-xrgb8888.html
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][28] -> [SKIP][29] ([fdo#109441]) +2 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-iclb6/igt@kms_psr@psr2_no_drrs.html
* igt@perf_pmu@busy-start@rcs0:
- shard-glk: [PASS][30] -> [DMESG-WARN][31] ([i915#118])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-glk1/igt@perf_pmu@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-glk5/igt@perf_pmu@[email protected]
* igt@sysfs_clients@split-50:
- shard-glk: NOTRUN -> [SKIP][32] ([fdo#109271] / [i915#2994])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-glk9/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@preservation-s3@bcs0:
- shard-kbl: [DMESG-WARN][33] ([i915#180]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-kbl7/igt@gem_ctx_isolation@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl7/igt@gem_ctx_isolation@[email protected]
* igt@gem_eio@in-flight-contexts-immediate:
- shard-tglb: [TIMEOUT][35] ([i915#3063]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-tglb7/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-tglb3/igt@[email protected]
* igt@gem_eio@reset-stress:
- shard-tglb: [FAIL][37] ([i915#5784]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-tglb3/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-tglb7/igt@[email protected]
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: [FAIL][39] ([i915#2842]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-tglb7/igt@gem_exec_fair@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-tglb7/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [FAIL][41] ([i915#2842]) -> [PASS][42] +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-apl2/igt@gem_exec_fair@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-apl1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none@vecs0:
- shard-kbl: [FAIL][43] ([i915#2842]) -> [PASS][44] +3 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-kbl4/igt@gem_exec_fair@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [FAIL][45] ([i915#2842]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-glk6/igt@gem_exec_fair@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-glk2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@bcs0:
- shard-iclb: [FAIL][47] ([i915#2842]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-iclb7/igt@gem_exec_fair@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-iclb8/igt@gem_exec_fair@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [DMESG-WARN][49] ([i915#5566] / [i915#716]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-glk1/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-glk5/igt@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-kbl: [DMESG-WARN][51] ([i915#5566] / [i915#716]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-kbl7/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl1/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][53] ([i915#454]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-iclb6/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-iclb5/igt@[email protected]
* igt@kms_plane_scaling@planes-unity-scaling-downscale-factor-0-5@pipe-c-edp-1:
- shard-iclb: [SKIP][55] ([i915#5235]) -> [PASS][56] +5 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-iclb2/igt@kms_plane_scaling@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-iclb7/igt@kms_plane_scaling@[email protected]
#### Warnings ####
* igt@gem_exec_balancer@parallel-ordering:
- shard-iclb: [FAIL][57] ([i915#6117]) -> [SKIP][58] ([i915#4525])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-iclb2/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-iclb7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-suspend:
- shard-iclb: [INCOMPLETE][59] ([i915#1982] / [i915#6598]) -> [INCOMPLETE][60] ([i915#6598])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-iclb8/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-iclb2/igt@[email protected]
* igt@runner@aborted:
- shard-kbl: ([FAIL][61], [FAIL][62], [FAIL][63], [FAIL][64]) ([fdo#109271] / [i915#180] / [i915#3002] / [i915#4312] / [i915#5257] / [i915#716]) -> ([FAIL][65], [FAIL][66], [FAIL][67], [FAIL][68]) ([i915#180] / [i915#3002] / [i915#4312] / [i915#5257])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-kbl7/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-kbl1/igt@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-kbl7/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12014/shard-kbl7/igt@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl1/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl7/igt@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl7/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/shard-kbl7/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2530]: https://gitlab.freedesktop.org/drm/intel/issues/2530
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3063]: https://gitlab.freedesktop.org/drm/intel/issues/3063
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5072]: https://gitlab.freedesktop.org/drm/intel/issues/5072
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5287]: https://gitlab.freedesktop.org/drm/intel/issues/5287
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6021]: https://gitlab.freedesktop.org/drm/intel/issues/6021
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6598]: https://gitlab.freedesktop.org/drm/intel/issues/6598
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
Build changes
-------------
* Linux: CI_DRM_12014 -> Patchwork_105358v3
CI-20190529: 20190529
CI_DRM_12014: 1de33826aa86910c175ca773bc8f92d5948d094e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6634: e01fe99f00692864b709253638c809231d1fb333 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_105358v3: 1de33826aa86910c175ca773bc8f92d5948d094e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_105358v3/index.html
Quoted 5 lines · Jani Nikula
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.
Thanks for the reviews, patches 2-14 pushed to drm-intel-next.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center