drm/i915/guc: Don't store runtime GuC log level in modparam
Subsystems (2)
PATCH v2 1/7 drm/i915/guc: Don't store runtime GuC log level in modparam
From: Piotr Piórkowski <[email protected]>
Currently we are using modparam as placeholder for GuC log level. Stop doing this and keep runtime GuC level in intel_guc_log struct.
v2:
- rename functions intel_guc_log_level_[get|set] to intel_guc_log_[get|set]_level (Michał Wajdeczko)
- remove GEM_BUG_ON from intel_guc_log_get_level() (Michał Wajdeczko)
--- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- drivers/gpu/drm/i915/intel_guc.c | 8 +++----- drivers/gpu/drm/i915/intel_guc_log.c | 28 ++++++++++------------------ drivers/gpu/drm/i915/intel_guc_log.h | 10 ++++++++-- drivers/gpu/drm/i915/intel_uc.c | 2 +- 5 files changed, 24 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -2
@@ -2536,7 +2536,7 @@ static int i915_guc_log_level_get(void *data, u64 *val)if (!USES_GUC (dev_priv))return -ENODEV ; - *val =intel_guc_log_level_get (&dev_priv->guc.log); + *val =intel_guc_log_get_level (&dev_priv->guc.log);return 0 ; }
@@ -2548,7 +2548,7 @@ static int i915_guc_log_level_set(void *data, u64 val)if (!USES_GUC (dev_priv))return -ENODEV ; -return intel_guc_log_level_set (&dev_priv->guc.log, val); +return intel_guc_log_set_level (&dev_priv->guc.log, val); } DEFINE_SIMPLE_ATTRIBUTE(i915_guc_log_level_fops,
drivers/gpu/drm/i915/intel_guc.c +3 -5
@@ -203,13 +203,11 @@ void intel_guc_fini(struct intel_guc *guc)guc_shared_data_destroy (guc); } -static u32 get_log_control_flags (void ) +static u32 guc_ctl_debug_flags (struct intel_guc *guc) { -u32 level = i915_modparams.guc_log_level; +u32 level =intel_guc_log_get_level (&guc->log);u32 flags =0 ; -GEM_BUG_ON (level <0 ); -if (!GUC_LOG_LEVEL_IS_ENABLED (level)) flags |=GUC_LOG_DEFAULT_DISABLED ;
@@ -250,7 +248,7 @@ void intel_guc_init_params(struct intel_guc *guc) params[GUC_CTL_LOG_PARAMS ] = guc->log.flags; - params[GUC_CTL_DEBUG ] =get_log_control_flags (); + params[GUC_CTL_DEBUG ] =guc_ctl_debug_flags (guc);/* If GuC submission is enabled, set up additional parameters here */ if (USES_GUC_SUBMISSION (dev_priv)) {
drivers/gpu/drm/i915/intel_guc_log.c +10 -18
@@ -475,11 +475,12 @@ int intel_guc_log_create(struct intel_guc_log *log) offset =intel_guc_ggtt_offset (guc, vma) >>PAGE_SHIFT ; log->flags = (offset <<GUC_LOG_BUF_ADDR_SHIFT ) | flags; + log->level = i915_modparams.guc_log_level; +return 0 ; err: -/* logging will be off */ - i915_modparams.guc_log_level =0 ; +DRM_ERROR ("Failed to allocate GuC log buffer. %d\n" , ret);return ret; }
@@ -488,15 +489,7 @@ void intel_guc_log_destroy(struct intel_guc_log *log)i915_vma_unpin_and_release (&log->vma); } -int intel_guc_log_level_get (struct intel_guc_log *log) -{ -GEM_BUG_ON (!log->vma); -GEM_BUG_ON (i915_modparams.guc_log_level <0 ); - -return i915_modparams.guc_log_level; -} - -int intel_guc_log_level_set (struct intel_guc_log *log,u64 val) +int intel_guc_log_set_level (struct intel_guc_log *log,u32 level) {struct intel_guc *guc =log_to_guc (log);struct drm_i915_private *dev_priv =guc_to_i915 (guc);
@@ -504,33 +497,32 @@ int intel_guc_log_level_set(struct intel_guc_log *log, u64 val)BUILD_BUG_ON (GUC_LOG_VERBOSITY_MIN !=0 );GEM_BUG_ON (!log->vma); -GEM_BUG_ON (i915_modparams.guc_log_level <0 );/* * GuC is recognizing log levels starting from 0 to max, we're using 0 * as indication that logging should be disabled. */ -if (val <GUC_LOG_LEVEL_DISABLED || val >GUC_LOG_LEVEL_MAX ) +if (level <GUC_LOG_LEVEL_DISABLED || level >GUC_LOG_LEVEL_MAX )return -EINVAL ;mutex_lock (&dev_priv->drm.struct_mutex); -if (i915_modparams.guc_log_level == val) { +if (log->level == level) { ret =0 ; goto out_unlock; }intel_runtime_pm_get (dev_priv); - ret =guc_action_control_log (guc,GUC_LOG_LEVEL_IS_VERBOSE (val), -GUC_LOG_LEVEL_IS_ENABLED (val), -GUC_LOG_LEVEL_TO_VERBOSITY (val)); + ret =guc_action_control_log (guc,GUC_LOG_LEVEL_IS_VERBOSE (level), +GUC_LOG_LEVEL_IS_ENABLED (level), +GUC_LOG_LEVEL_TO_VERBOSITY (level));intel_runtime_pm_put (dev_priv);if (ret) {DRM_DEBUG_DRIVER ("guc_log_control action failed %d\n" , ret); goto out_unlock; } - i915_modparams.guc_log_level = val; + log->level = level; out_unlock:mutex_unlock (&dev_priv->drm.struct_mutex);
drivers/gpu/drm/i915/intel_guc_log.h +8 -2
@@ -30,6 +30,7 @@#include <linux/workqueue.h> #include "intel_guc_fwif.h" +#include "i915_gem.h" struct intel_guc ;
@@ -58,6 +59,7 @@ struct intel_guc;#define GUC_LOG_LEVEL_MAX GUC_VERBOSITY_TO_LOG_LEVEL(GUC_LOG_VERBOSITY_MAX)struct intel_guc_log { +u32 level;u32 flags;struct i915_vma *vma;struct {
@@ -80,8 +82,7 @@ void intel_guc_log_init_early(struct intel_guc_log *log);int intel_guc_log_create (struct intel_guc_log *log);void intel_guc_log_destroy (struct intel_guc_log *log); -int intel_guc_log_level_get (struct intel_guc_log *log); -int intel_guc_log_level_set (struct intel_guc_log *log,u64 control_val); +int intel_guc_log_set_level (struct intel_guc_log *log,u32 level);bool intel_guc_log_relay_enabled (const struct intel_guc_log *log);int intel_guc_log_relay_open (struct intel_guc_log *log);void intel_guc_log_relay_flush (struct intel_guc_log *log);
@@ -89,4 +90,9 @@ void intel_guc_log_relay_close(struct intel_guc_log *log);void intel_guc_log_handle_flush_event (struct intel_guc_log *log); +static inline u32 intel_guc_log_get_level (struct intel_guc_log *log) +{ +return log->level; +} +#endif
drivers/gpu/drm/i915/intel_uc.c +1 -1
@@ -207,7 +207,7 @@ void intel_uc_init_mmio(struct drm_i915_private *i915)static void guc_capture_load_err_log (struct intel_guc *guc) { -if (!guc->log.vma || !i915_modparams.guc_log_level) +if (!guc->log.vma || !intel_guc_log_get_level (&guc->log))return ;if (!guc->load_err_log)
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/7 drm/i915/guc: Refactoring preparation of the GUC_CTL_DEBUG parameter
At the moment, the preparation of GUC_CTL_DEBUG is disordered. Lets move all GUC_CTL_DEBUG related operations to one place.
v2:
- move 'ads' declaration to USES_GUC_SUBMISSION case (Michał Wajdeczko)
--- drivers/gpu/drm/i915/intel_guc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +7 -5
@@ -217,6 +217,13 @@ static u32 guc_ctl_debug_flags(struct intel_guc *guc) flags |=GUC_LOG_LEVEL_TO_VERBOSITY (level) <<GUC_LOG_VERBOSITY_SHIFT ; +if (USES_GUC_SUBMISSION (guc_to_i915 (guc))) { +u32 ads =intel_guc_ggtt_offset (guc, guc->ads_vma) + >>PAGE_SHIFT ; + + flags |= ads <<GUC_ADS_ADDR_SHIFT |GUC_ADS_ENABLED ; + } +return flags; }
@@ -252,14 +259,9 @@ void intel_guc_init_params(struct intel_guc *guc)/* If GuC submission is enabled, set up additional parameters here */ if (USES_GUC_SUBMISSION (dev_priv)) { -u32 ads =intel_guc_ggtt_offset (guc, - guc->ads_vma) >>PAGE_SHIFT ;u32 pgs =intel_guc_ggtt_offset (guc, guc->stage_desc_pool);u32 ctx_in_16 =GUC_MAX_STAGE_DESCRIPTORS /16 ; - params[GUC_CTL_DEBUG ] |= ads <<GUC_ADS_ADDR_SHIFT ; - params[GUC_CTL_DEBUG ] |=GUC_ADS_ENABLED ; - pgs >>=PAGE_SHIFT ; params[GUC_CTL_CTXINFO ] = (pgs <<GUC_CTL_BASE_ADDR_SHIFT ) | (ctx_in_16 <<GUC_CTL_CTXNUM_IN16_SHIFT );
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/7 drm/i915/guc: Refactoring preparation of the GUC_CTL_FEATURE parameter
In reply to Piotr PiorkowskiAt the moment, the preparation of GUC_CTL_FEATURE is disordered. Lets move all GUC_CTL_FEATURE related operations to one place.
--- drivers/gpu/drm/i915/intel_guc.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +14 -8
@@ -227,6 +227,19 @@ static u32 guc_ctl_debug_flags(struct intel_guc *guc)return flags; } +static u32 guc_ctl_feature_flags (struct intel_guc *guc) +{ +u32 flags =0 ; + + flags |=GUC_CTL_VCS2_ENABLED ; + +if (USES_GUC_SUBMISSION (guc_to_i915 (guc))) + flags |=GUC_CTL_KERNEL_SUBMISSIONS ; +else + flags |=GUC_CTL_DISABLE_SCHEDULER ; + +return flags; +}/* * Initialise the GuC parameter block before starting the firmware * transfer. These parameters are read by the firmware on startup
@@ -250,9 +263,7 @@ void intel_guc_init_params(struct intel_guc *guc) params[GUC_CTL_WA ] |=GUC_CTL_WA_UK_BY_DRIVER ; - params[GUC_CTL_FEATURE ] |=GUC_CTL_DISABLE_SCHEDULER | -GUC_CTL_VCS2_ENABLED ; - + params[GUC_CTL_FEATURE ] =guc_ctl_feature_flags (guc); params[GUC_CTL_LOG_PARAMS ] = guc->log.flags; params[GUC_CTL_DEBUG ] =guc_ctl_debug_flags (guc);
@@ -265,11 +276,6 @@ void intel_guc_init_params(struct intel_guc *guc) pgs >>=PAGE_SHIFT ; params[GUC_CTL_CTXINFO ] = (pgs <<GUC_CTL_BASE_ADDR_SHIFT ) | (ctx_in_16 <<GUC_CTL_CTXNUM_IN16_SHIFT ); - - params[GUC_CTL_FEATURE ] |=GUC_CTL_KERNEL_SUBMISSIONS ; - -/* Unmask this bit to enable the GuC's internal scheduler */ - params[GUC_CTL_FEATURE ] &= ~GUC_CTL_DISABLE_SCHEDULER ; }/*
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/7 drm/i915/guc: Refactoring preparation of the GUC_CTL_LOG_PARAMS parameter
In reply to Piotr PiorkowskiAt the moment, the preparation of GUC_CTL_LOG_PARAMS is disordered. Additionally, in struct intel_guc_log we have an unnecessary field 'flags' which we use only to assign value to GuC parameter. Lets move all GUC_CTL_LOG_PARAMS related operations to one place, and lets remove field 'flags' from struct intel_guc_log.
--- drivers/gpu/drm/i915/intel_guc.c | 19 +++++++++++++++++-- drivers/gpu/drm/i915/intel_guc_log.c | 11 ----------- drivers/gpu/drm/i915/intel_guc_log.h | 1 - 3 files changed, 17 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +17 -2
@@ -240,6 +240,22 @@ static u32 guc_ctl_feature_flags(struct intel_guc *guc)return flags; } + +static u32 guc_ctl_log_params_flags (struct intel_guc *guc) +{ +u32 offset =intel_guc_ggtt_offset (guc, guc->log.vma) >>PAGE_SHIFT ; +u32 flags; + +/* each allocated unit is a page */ + flags =GUC_LOG_VALID |GUC_LOG_NOTIFY_ON_HALF_FULL | + (GUC_LOG_CRASH_PAGES <<GUC_LOG_CRASH_SHIFT ) | + (GUC_LOG_DPC_PAGES <<GUC_LOG_DPC_SHIFT ) | + (GUC_LOG_ISR_PAGES <<GUC_LOG_ISR_SHIFT ) | + (offset <<GUC_LOG_BUF_ADDR_SHIFT ); + +return flags; +} +/* * Initialise the GuC parameter block before starting the firmware * transfer. These parameters are read by the firmware on startup
@@ -264,8 +280,7 @@ void intel_guc_init_params(struct intel_guc *guc) params[GUC_CTL_WA ] |=GUC_CTL_WA_UK_BY_DRIVER ; params[GUC_CTL_FEATURE ] =guc_ctl_feature_flags (guc); - params[GUC_CTL_LOG_PARAMS ] = guc->log.flags; - + params[GUC_CTL_LOG_PARAMS ] =guc_ctl_log_params_flags (guc); params[GUC_CTL_DEBUG ] =guc_ctl_debug_flags (guc);/* If GuC submission is enabled, set up additional parameters here */
drivers/gpu/drm/i915/intel_guc_log.c +0 -11
@@ -452,8 +452,6 @@ int intel_guc_log_create(struct intel_guc_log *log) {struct intel_guc *guc =log_to_guc (log);struct i915_vma *vma; -unsigned long offset; -u32 flags;int ret;GEM_BUG_ON (log->vma);
@@ -466,15 +464,6 @@ int intel_guc_log_create(struct intel_guc_log *log) log->vma = vma; -/* each allocated unit is a page */ - flags =GUC_LOG_VALID |GUC_LOG_NOTIFY_ON_HALF_FULL | - (GUC_LOG_DPC_PAGES <<GUC_LOG_DPC_SHIFT ) | - (GUC_LOG_ISR_PAGES <<GUC_LOG_ISR_SHIFT ) | - (GUC_LOG_CRASH_PAGES <<GUC_LOG_CRASH_SHIFT ); - - offset =intel_guc_ggtt_offset (guc, vma) >>PAGE_SHIFT ; - log->flags = (offset <<GUC_LOG_BUF_ADDR_SHIFT ) | flags; - log->level = i915_modparams.guc_log_level;return 0 ;
drivers/gpu/drm/i915/intel_guc_log.h +0 -1
@@ -60,7 +60,6 @@ struct intel_guc;struct intel_guc_log {u32 level; -u32 flags;struct i915_vma *vma;struct {void *buf_addr;
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/7 drm/i915/guc: Refactoring preparation of the GUC_CTL_CTXINFO parameter
In reply to Piotr PiorkowskiAt the moment, the preparation of GUC_CTL_CTXINFO is disordered. Lets move all GUC_CTL_CTXINFO related operations to one place.
v2:
- move 'ctxnum' and 'base' declarations to USES_GUC_SUBMISSION case (Michał Wajdeczko)
--- drivers/gpu/drm/i915/intel_guc.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +18 -10
@@ -241,6 +241,23 @@ static u32 guc_ctl_feature_flags(struct intel_guc *guc)return flags; } +static u32 guc_ctl_ctxinfo_flags (struct intel_guc *guc) +{ +u32 flags =0 ; + +if (USES_GUC_SUBMISSION (guc_to_i915 (guc))) { +u32 ctxnum, base; + + base =intel_guc_ggtt_offset (guc, guc->stage_desc_pool); + ctxnum =GUC_MAX_STAGE_DESCRIPTORS /16 ; + + base >>=PAGE_SHIFT ; + flags |= (base <<GUC_CTL_BASE_ADDR_SHIFT ) | + (ctxnum <<GUC_CTL_CTXNUM_IN16_SHIFT ); + } +return flags; +} +static u32 guc_ctl_log_params_flags (struct intel_guc *guc) {u32 offset =intel_guc_ggtt_offset (guc, guc->log.vma) >>PAGE_SHIFT ;
@@ -282,16 +299,7 @@ void intel_guc_init_params(struct intel_guc *guc) params[GUC_CTL_FEATURE ] =guc_ctl_feature_flags (guc); params[GUC_CTL_LOG_PARAMS ] =guc_ctl_log_params_flags (guc); params[GUC_CTL_DEBUG ] =guc_ctl_debug_flags (guc); - -/* If GuC submission is enabled, set up additional parameters here */ -if (USES_GUC_SUBMISSION (dev_priv)) { -u32 pgs =intel_guc_ggtt_offset (guc, guc->stage_desc_pool); -u32 ctx_in_16 =GUC_MAX_STAGE_DESCRIPTORS /16 ; - - pgs >>=PAGE_SHIFT ; - params[GUC_CTL_CTXINFO ] = (pgs <<GUC_CTL_BASE_ADDR_SHIFT ) | - (ctx_in_16 <<GUC_CTL_CTXNUM_IN16_SHIFT ); - } + params[GUC_CTL_CTXINFO ] =guc_ctl_ctxinfo_flags (guc);/* * All SOFT_SCRATCH registers are in FORCEWAKE_BLITTER domain and
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/7 drm/i915/guc: Move defines with size of GuC logs to intel_guc_log.h
In reply to Piotr PiorkowskiAt this moment, we have defined GuC logs sizes in intel_guc_fwif.h, but as these values are related directly to the GuC logs, and not to API of GuC parameters, we should move these defines to intel_guc_log.h.
v2:
- change buffers size to more friendly (Michał Wajdeczko)
- remove GUC_LOG_SIZE define (Michał Wajdeczko)
--- drivers/gpu/drm/i915/intel_guc.c | 28 +++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_guc_fwif.h | 20 +++----------------- drivers/gpu/drm/i915/intel_guc_log.c | 33 ++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_guc_log.h | 9 +++------ 4 files changed, 57 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +23 -5
@@ -263,13 +263,31 @@ static u32 guc_ctl_log_params_flags(struct intel_guc *guc)u32 offset =intel_guc_ggtt_offset (guc, guc->log.vma) >>PAGE_SHIFT ;u32 flags; -/* each allocated unit is a page */ - flags =GUC_LOG_VALID |GUC_LOG_NOTIFY_ON_HALF_FULL | - (GUC_LOG_CRASH_PAGES <<GUC_LOG_CRASH_SHIFT ) | - (GUC_LOG_DPC_PAGES <<GUC_LOG_DPC_SHIFT ) | - (GUC_LOG_ISR_PAGES <<GUC_LOG_ISR_SHIFT ) | +#define UNIT (4 << 10) + +BUILD_BUG_ON (!CRASH_BUFFER_SIZE ); +BUILD_BUG_ON (!IS_ALIGNED (CRASH_BUFFER_SIZE ,UNIT )); +BUILD_BUG_ON (!DPC_BUFFER_SIZE ); +BUILD_BUG_ON (!IS_ALIGNED (DPC_BUFFER_SIZE ,UNIT )); +BUILD_BUG_ON (!ISR_BUFFER_SIZE ); +BUILD_BUG_ON (!IS_ALIGNED (ISR_BUFFER_SIZE ,UNIT )); + +BUILD_BUG_ON ((CRASH_BUFFER_SIZE /UNIT -1 ) > + (GUC_LOG_CRASH_MASK >>GUC_LOG_CRASH_SHIFT )); +BUILD_BUG_ON ((DPC_BUFFER_SIZE /UNIT -1 ) > + (GUC_LOG_DPC_MASK >>GUC_LOG_DPC_SHIFT )); +BUILD_BUG_ON ((ISR_BUFFER_SIZE /UNIT -1 ) > + (GUC_LOG_ISR_MASK >>GUC_LOG_ISR_SHIFT )); + + flags =GUC_LOG_VALID | +GUC_LOG_NOTIFY_ON_HALF_FULL | + ((CRASH_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_CRASH_SHIFT ) | + ((DPC_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_DPC_SHIFT ) | + ((ISR_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_ISR_SHIFT ) | (offset <<GUC_LOG_BUF_ADDR_SHIFT ); +#undef UNIT +return flags; }
drivers/gpu/drm/i915/intel_guc_fwif.h +3 -17
@@ -84,12 +84,12 @@#define GUC_LOG_VALID (1 << 0)#define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1)#define GUC_LOG_ALLOC_IN_MEGABYTE (1 << 3) -#define GUC_LOG_CRASH_PAGES 1#define GUC_LOG_CRASH_SHIFT 4 -#define GUC_LOG_DPC_PAGES 7 +#define GUC_LOG_CRASH_MASK (0x1 << GUC_LOG_CRASH_SHIFT)#define GUC_LOG_DPC_SHIFT 6 -#define GUC_LOG_ISR_PAGES 7 +#define GUC_LOG_DPC_MASK (0x7 << GUC_LOG_DPC_SHIFT)#define GUC_LOG_ISR_SHIFT 9 +#define GUC_LOG_ISR_MASK (0x7 << GUC_LOG_ISR_SHIFT)#define GUC_LOG_BUF_ADDR_SHIFT 12#define GUC_CTL_PAGE_FAULT_CONTROL 5
@@ -532,20 +532,6 @@ enum guc_log_buffer_type { };/** -* DOC: GuC Log buffer Layout -* -* Page0 +-------------------------------+ -* | ISR state header (32 bytes) | -* | DPC state header | -* | Crash dump state header | -* Page1 +-------------------------------+ -* | ISR logs | -* Page9 +-------------------------------+ -* | DPC logs | -* Page17 +-------------------------------+ -* | Crash Dump logs | -* +-------------------------------+ -* * Below state structure is used for coordination of retrieval of GuC firmware * logs. Separate state is maintained for each log buffer type. * read_ptr points to the location where i915 read last in log buffer and
drivers/gpu/drm/i915/intel_guc_log.c +28 -5
@@ -215,11 +215,11 @@ static unsigned int guc_get_log_buffer_size(enum guc_log_buffer_type type) {switch (type) {case GUC_ISR_LOG_BUFFER : -return (GUC_LOG_ISR_PAGES +1 ) *PAGE_SIZE ; +return ISR_BUFFER_SIZE ;case GUC_DPC_LOG_BUFFER : -return (GUC_LOG_DPC_PAGES +1 ) *PAGE_SIZE ; +return DPC_BUFFER_SIZE ;case GUC_CRASH_DUMP_LOG_BUFFER : -return (GUC_LOG_CRASH_PAGES +1 ) *PAGE_SIZE ; +return CRASH_BUFFER_SIZE ;default :MISSING_CASE (type); }
@@ -397,7 +397,7 @@ static int guc_log_relay_create(struct intel_guc_log *log)lockdep_assert_held (&log->relay.lock);/* Keep the size of sub buffers same as shared log buffer */ - subbuf_size =GUC_LOG_SIZE ; + subbuf_size = log->vma->size;/* * Store up to 8 snapshots, which is large enough to buffer sufficient
@@ -452,11 +452,34 @@ int intel_guc_log_create(struct intel_guc_log *log) {struct intel_guc *guc =log_to_guc (log);struct i915_vma *vma; +u32 guc_log_size;int ret;GEM_BUG_ON (log->vma); - vma =intel_guc_allocate_vma (guc,GUC_LOG_SIZE ); +/* +* GuC Log buffer Layout +* +* +===============================+ 00B +* | Crash dump state header | +* +-------------------------------+ 32B +* | DPC state header | +* +-------------------------------+ 64B +* | ISR state header | +* +-------------------------------+ 96B +* | | +* +===============================+ PAGE_SIZE (4KB) +* | Crash Dump logs | +* +===============================+ + CRASH_SIZE +* | DPC logs | +* +===============================+ + DPC_SIZE +* | ISR logs | +* +===============================+ + ISR_SIZE +*/ + guc_log_size =PAGE_SIZE +CRASH_BUFFER_SIZE +DPC_BUFFER_SIZE + +ISR_BUFFER_SIZE ; + + vma =intel_guc_allocate_vma (guc, guc_log_size);if (IS_ERR (vma)) { ret =PTR_ERR (vma); goto err;
drivers/gpu/drm/i915/intel_guc_log.h +3 -6
@@ -34,12 +34,9 @@struct intel_guc ; -/* -* The first page is to save log buffer state. Allocate one -* extra page for others in case for overlap -*/ -#define GUC_LOG_SIZE ((1 + GUC_LOG_DPC_PAGES + 1 + GUC_LOG_ISR_PAGES + \ - 1 + GUC_LOG_CRASH_PAGES + 1) << PAGE_SHIFT) +#define CRASH_BUFFER_SIZE (8 * 1024) +#define DPC_BUFFER_SIZE (32 * 1024) +#define ISR_BUFFER_SIZE (32 * 1024)/* * While we're using plain log level in i915, GuC controls are much more...
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 6/7 drm/i915/guc: Move defines with size of GuC logs to intel_guc_log.h
At this moment, we have defined GuC logs sizes in intel_guc_fwif.h, but as these values are related directly to the GuC logs, and not to API of GuC parameters, we should move these defines to intel_guc_log.h.
v2:
- change buffers size to more friendly (Michał Wajdeczko)
- remove GUC_LOG_SIZE define (Michał Wajdeczko) v3:
- use SZ_* macros to define buffers sizes (Michał Wajdeczko)
--- drivers/gpu/drm/i915/intel_guc.c | 28 +++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_guc_fwif.h | 20 +++----------------- drivers/gpu/drm/i915/intel_guc_log.c | 33 ++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_guc_log.h | 9 +++------ 4 files changed, 57 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +23 -5
@@ -263,13 +263,31 @@ static u32 guc_ctl_log_params_flags(struct intel_guc *guc)u32 offset =intel_guc_ggtt_offset (guc, guc->log.vma) >>PAGE_SHIFT ;u32 flags; -/* each allocated unit is a page */ - flags =GUC_LOG_VALID |GUC_LOG_NOTIFY_ON_HALF_FULL | - (GUC_LOG_CRASH_PAGES <<GUC_LOG_CRASH_SHIFT ) | - (GUC_LOG_DPC_PAGES <<GUC_LOG_DPC_SHIFT ) | - (GUC_LOG_ISR_PAGES <<GUC_LOG_ISR_SHIFT ) | +#define UNIT SZ_4K + +BUILD_BUG_ON (!CRASH_BUFFER_SIZE ); +BUILD_BUG_ON (!IS_ALIGNED (CRASH_BUFFER_SIZE ,UNIT )); +BUILD_BUG_ON (!DPC_BUFFER_SIZE ); +BUILD_BUG_ON (!IS_ALIGNED (DPC_BUFFER_SIZE ,UNIT )); +BUILD_BUG_ON (!ISR_BUFFER_SIZE ); +BUILD_BUG_ON (!IS_ALIGNED (ISR_BUFFER_SIZE ,UNIT )); + +BUILD_BUG_ON ((CRASH_BUFFER_SIZE /UNIT -1 ) > + (GUC_LOG_CRASH_MASK >>GUC_LOG_CRASH_SHIFT )); +BUILD_BUG_ON ((DPC_BUFFER_SIZE /UNIT -1 ) > + (GUC_LOG_DPC_MASK >>GUC_LOG_DPC_SHIFT )); +BUILD_BUG_ON ((ISR_BUFFER_SIZE /UNIT -1 ) > + (GUC_LOG_ISR_MASK >>GUC_LOG_ISR_SHIFT )); + + flags =GUC_LOG_VALID | +GUC_LOG_NOTIFY_ON_HALF_FULL | + ((CRASH_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_CRASH_SHIFT ) | + ((DPC_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_DPC_SHIFT ) | + ((ISR_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_ISR_SHIFT ) | (offset <<GUC_LOG_BUF_ADDR_SHIFT ); +#undef UNIT +return flags; }
drivers/gpu/drm/i915/intel_guc_fwif.h +3 -17
@@ -84,12 +84,12 @@#define GUC_LOG_VALID (1 << 0)#define GUC_LOG_NOTIFY_ON_HALF_FULL (1 << 1)#define GUC_LOG_ALLOC_IN_MEGABYTE (1 << 3) -#define GUC_LOG_CRASH_PAGES 1#define GUC_LOG_CRASH_SHIFT 4 -#define GUC_LOG_DPC_PAGES 7 +#define GUC_LOG_CRASH_MASK (0x1 << GUC_LOG_CRASH_SHIFT)#define GUC_LOG_DPC_SHIFT 6 -#define GUC_LOG_ISR_PAGES 7 +#define GUC_LOG_DPC_MASK (0x7 << GUC_LOG_DPC_SHIFT)#define GUC_LOG_ISR_SHIFT 9 +#define GUC_LOG_ISR_MASK (0x7 << GUC_LOG_ISR_SHIFT)#define GUC_LOG_BUF_ADDR_SHIFT 12#define GUC_CTL_PAGE_FAULT_CONTROL 5
@@ -532,20 +532,6 @@ enum guc_log_buffer_type { };/** -* DOC: GuC Log buffer Layout -* -* Page0 +-------------------------------+ -* | ISR state header (32 bytes) | -* | DPC state header | -* | Crash dump state header | -* Page1 +-------------------------------+ -* | ISR logs | -* Page9 +-------------------------------+ -* | DPC logs | -* Page17 +-------------------------------+ -* | Crash Dump logs | -* +-------------------------------+ -* * Below state structure is used for coordination of retrieval of GuC firmware * logs. Separate state is maintained for each log buffer type. * read_ptr points to the location where i915 read last in log buffer and
drivers/gpu/drm/i915/intel_guc_log.c +28 -5
@@ -215,11 +215,11 @@ static unsigned int guc_get_log_buffer_size(enum guc_log_buffer_type type) {switch (type) {case GUC_ISR_LOG_BUFFER : -return (GUC_LOG_ISR_PAGES +1 ) *PAGE_SIZE ; +return ISR_BUFFER_SIZE ;case GUC_DPC_LOG_BUFFER : -return (GUC_LOG_DPC_PAGES +1 ) *PAGE_SIZE ; +return DPC_BUFFER_SIZE ;case GUC_CRASH_DUMP_LOG_BUFFER : -return (GUC_LOG_CRASH_PAGES +1 ) *PAGE_SIZE ; +return CRASH_BUFFER_SIZE ;default :MISSING_CASE (type); }
@@ -397,7 +397,7 @@ static int guc_log_relay_create(struct intel_guc_log *log)lockdep_assert_held (&log->relay.lock);/* Keep the size of sub buffers same as shared log buffer */ - subbuf_size =GUC_LOG_SIZE ; + subbuf_size = log->vma->size;/* * Store up to 8 snapshots, which is large enough to buffer sufficient
@@ -452,11 +452,34 @@ int intel_guc_log_create(struct intel_guc_log *log) {struct intel_guc *guc =log_to_guc (log);struct i915_vma *vma; +u32 guc_log_size;int ret;GEM_BUG_ON (log->vma); - vma =intel_guc_allocate_vma (guc,GUC_LOG_SIZE ); +/* +* GuC Log buffer Layout +* +* +===============================+ 00B +* | Crash dump state header | +* +-------------------------------+ 32B +* | DPC state header | +* +-------------------------------+ 64B +* | ISR state header | +* +-------------------------------+ 96B +* | | +* +===============================+ PAGE_SIZE (4KB) +* | Crash Dump logs | +* +===============================+ + CRASH_SIZE +* | DPC logs | +* +===============================+ + DPC_SIZE +* | ISR logs | +* +===============================+ + ISR_SIZE +*/ + guc_log_size =PAGE_SIZE +CRASH_BUFFER_SIZE +DPC_BUFFER_SIZE + +ISR_BUFFER_SIZE ; + + vma =intel_guc_allocate_vma (guc, guc_log_size);if (IS_ERR (vma)) { ret =PTR_ERR (vma); goto err;
drivers/gpu/drm/i915/intel_guc_log.h +3 -6
@@ -34,12 +34,9 @@struct intel_guc ; -/* -* The first page is to save log buffer state. Allocate one -* extra page for others in case for overlap -*/ -#define GUC_LOG_SIZE ((1 + GUC_LOG_DPC_PAGES + 1 + GUC_LOG_ISR_PAGES + \ - 1 + GUC_LOG_CRASH_PAGES + 1) << PAGE_SHIFT) +#define CRASH_BUFFER_SIZE SZ_8K +#define DPC_BUFFER_SIZE SZ_32K +#define ISR_BUFFER_SIZE SZ_32K/* * While we're using plain log level in i915, GuC controls are much more...
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/7 drm/i915/guc: Add support for define guc_log_size in megabytes.
In reply to Piotr PiorkowskiAt this moment we can define GuC logs sizes only using pages. But GuC also allows use for this values expressed in megabytes. Lets add support for define guc_log_size in megabytes when we debug of GuC.
v2:
- change buffers size to more friendly (Michał Wajdeczko)
- merge statements in guc_ctl_log_params_flags() (Michał Wajdeczko)
--- drivers/gpu/drm/i915/intel_guc.c | 8 ++++++++ drivers/gpu/drm/i915/intel_guc_log.h | 6 ++++++ 2 files changed, 14 insertions(+)
drivers/gpu/drm/i915/intel_guc.c +8 -0
@@ -263,7 +263,13 @@ static u32 guc_ctl_log_params_flags(struct intel_guc *guc)u32 offset =intel_guc_ggtt_offset (guc, guc->log.vma) >>PAGE_SHIFT ;u32 flags; +#if (((CRASH_BUFFER_SIZE ) % (1 <<20 )) ==0 ) +#define UNIT (1 << 20) +#define FLAG GUC_LOG_ALLOC_IN_MEGABYTE +#else #define UNIT (4 << 10) +#define FLAG 0 +#endif BUILD_BUG_ON (!CRASH_BUFFER_SIZE );BUILD_BUG_ON (!IS_ALIGNED (CRASH_BUFFER_SIZE ,UNIT ));
@@ -281,12 +287,14 @@ static u32 guc_ctl_log_params_flags(struct intel_guc *guc) flags =GUC_LOG_VALID |GUC_LOG_NOTIFY_ON_HALF_FULL | +FLAG | ((CRASH_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_CRASH_SHIFT ) | ((DPC_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_DPC_SHIFT ) | ((ISR_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_ISR_SHIFT ) | (offset <<GUC_LOG_BUF_ADDR_SHIFT );#undef UNIT +#undef FLAGreturn flags; }
drivers/gpu/drm/i915/intel_guc_log.h +6 -0
@@ -34,9 +34,15 @@struct intel_guc ; +#ifdef DRM_I915_DEBUG_GUC +#define CRASH_BUFFER_SIZE (2 * 1024 * 1024) +#define DPC_BUFFER_SIZE (8 * 1024 * 1024) +#define ISR_BUFFER_SIZE (8 * 1024 * 1024) +#else #define CRASH_BUFFER_SIZE (8 * 1024)#define DPC_BUFFER_SIZE (32 * 1024)#define ISR_BUFFER_SIZE (32 * 1024) +#endif /* * While we're using plain log level in i915, GuC controls are much more...
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 7/7] drm/i915/guc: Add support for define guc_log_size in megabytes.
Quoted 24 lines · Piotr Piorkowski
At this moment we can define GuC logs sizes only using pages. But GuC also allows use for this values expressed in megabytes. Lets add support for define
guc_log_sizein megabytes when we debug of GuC.v2:
- change buffers size to more friendly (Michał Wajdeczko)
- merge statements inguc_ctl_log_params_flags()(Michał Wajdeczko)Signed-off-by Piotr Piórkowski <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Michał Winiarski <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/intel_guc.c | 8 ++++++++ drivers/gpu/drm/i915/intel_guc_log.h | 6 ++++++ 2 files changed, 14 insertions(+)drivers/gpu/drm/i915/intel_guc.c +0
-0
drivers/gpu/drm/i915/intel_guc.c static u32 guc_ctl_log_params_flags(struct · line 267
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc.c +2
-0@@ -263,7 +263,13 @@ static u32 guc_ctl_log_params_flags(struct intel_guc *guc) u32 offset = intel_guc_ggtt_offset(guc, guc->log.vma) >> PAGE_SHIFT;u32 flags; +#if (((CRASH_BUFFER_SIZE ) % (1 <<20 )) ==0 ) +#define UNIT (1 << 20)
btw, there are some nice predefined macros that can be used here instead of magic shifts ;)
#if (CRASH_BUFFER_SIZE % SZ_1M) == 0 #define UNIT SZ_1M ... #define UNIT SZ_4K
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc.c +4
-0+#define FLAG GUC_LOG_ALLOC_IN_MEGABYTE +#else #define UNIT (4 << 10) +#define FLAG 0 +#endif BUILD_BUG_ON (!CRASH_BUFFER_SIZE );BUILD_BUG_ON (!IS_ALIGNED (CRASH_BUFFER_SIZE ,UNIT ));
drivers/gpu/drm/i915/intel_guc.c static u32 guc_ctl_log_params_flags(struct · line 296
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.c +2
-0@@ -281,12 +287,14 @@ static u32 guc_ctl_log_params_flags(struct intel_guc *guc) flags =GUC_LOG_VALID |GUC_LOG_NOTIFY_ON_HALF_FULL | +FLAG | ((CRASH_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_CRASH_SHIFT ) | ((DPC_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_DPC_SHIFT ) | ((ISR_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_ISR_SHIFT ) | (offset <<GUC_LOG_BUF_ADDR_SHIFT );#undef UNIT +#undef FLAG
I'm afraid that someone may view FLAG/UNIT as too generic, maybe better to wait for other review comments..
drivers/gpu/drm/i915/intel_guc_log.h line 35
Quoted 9 lines
drivers/gpu/drm/i915/intel_guc.c +0
-0return flags; }drivers/gpu/drm/i915/intel_guc_log.h +1
-0@@ -34,9 +34,15 @@struct intel_guc ; +#ifdef DRM_I915_DEBUG_GUC
you probably wanted to use CONFIG_DRM_I915_DEBUG_GUC here
drivers/gpu/drm/i915/intel_guc_log.h line 40
Quoted 3 lines
drivers/gpu/drm/i915/intel_guc_log.h +3
-0+#define CRASH_BUFFER_SIZE (2 * 1024 * 1024) +#define DPC_BUFFER_SIZE (8 * 1024 * 1024) +#define ISR_BUFFER_SIZE (8 * 1024 * 1024)
other macros are also available:
SZ_2MSZ_8M
drivers/gpu/drm/i915/intel_guc_log.h line 44
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_log.h +1
-0+#else #define CRASH_BUFFER_SIZE (8 * 1024)#define DPC_BUFFER_SIZE (32 * 1024)#define ISR_BUFFER_SIZE (32 * 1024)
SZ_8KSZ_32K
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_log.h +1
-0+#endif /* * While we're using plain log level in i915, GuC controls are much more...
with #ifdef CONFIG fixed, and
preferably with SZ_xx macros, this is
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 7/7 drm/i915/guc: Add support for define guc_log_size in megabytes.
In reply to Piotr PiorkowskiAt this moment we can define GuC logs sizes only using pages. But GuC also allows use for this values expressed in megabytes. Lets add support for define guc_log_size in megabytes when we debug of GuC.
v2:
- change buffers size to more friendly (Michał Wajdeczko)
- merge statements in guc_ctl_log_params_flags() (Michał Wajdeczko) v3:
- fix ifdef (rename DRM_I915_DEBUG_GUC to CONFIG_DRM_I915_DEBUG_GUC) (Michał Wajdeczko)
- use SZ_* macros to define buffers sizes (Michał Wajdeczko)
--- drivers/gpu/drm/i915/intel_guc.c | 8 ++++++++ drivers/gpu/drm/i915/intel_guc_log.h | 6 ++++++ 2 files changed, 14 insertions(+)
drivers/gpu/drm/i915/intel_guc.c +8 -0
@@ -263,7 +263,13 @@ static u32 guc_ctl_log_params_flags(struct intel_guc *guc)u32 offset =intel_guc_ggtt_offset (guc, guc->log.vma) >>PAGE_SHIFT ;u32 flags; +#if (((CRASH_BUFFER_SIZE ) %SZ_1M ) ==0 ) +#define UNIT SZ_1M +#define FLAG GUC_LOG_ALLOC_IN_MEGABYTE +#else #define UNIT SZ_4K +#define FLAG 0 +#endif BUILD_BUG_ON (!CRASH_BUFFER_SIZE );BUILD_BUG_ON (!IS_ALIGNED (CRASH_BUFFER_SIZE ,UNIT ));
@@ -281,12 +287,14 @@ static u32 guc_ctl_log_params_flags(struct intel_guc *guc) flags =GUC_LOG_VALID |GUC_LOG_NOTIFY_ON_HALF_FULL | +FLAG | ((CRASH_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_CRASH_SHIFT ) | ((DPC_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_DPC_SHIFT ) | ((ISR_BUFFER_SIZE /UNIT -1 ) <<GUC_LOG_ISR_SHIFT ) | (offset <<GUC_LOG_BUF_ADDR_SHIFT );#undef UNIT +#undef FLAGreturn flags; }
drivers/gpu/drm/i915/intel_guc_log.h +6 -0
@@ -34,9 +34,15 @@struct intel_guc ; +#ifdef CONFIG_DRM_I915_DEBUG_GUC +#define CRASH_BUFFER_SIZE SZ_2M +#define DPC_BUFFER_SIZE SZ_8M +#define ISR_BUFFER_SIZE SZ_8M +#else #define CRASH_BUFFER_SIZE SZ_8K#define DPC_BUFFER_SIZE SZ_32K#define ISR_BUFFER_SIZE SZ_32K +#endif /* * While we're using plain log level in i915, GuC controls are much more...
Signature · 6 lines
2.14.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam
In reply to Piotr Piorkowski== Series Details ==
== Series Details ==
Series: series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam
URL : https://patchwork.freedesktop.org/series/44201/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4275 -> Patchwork_9186 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9186 need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9186, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/44201/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9186:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: PASS -> SKIP== Known issues ==
Here are the changes found in Patchwork_9186 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s3:
fi-skl-gvtdvm: NOTRUN -> INCOMPLETE (fdo#104108, fdo#105600)
igt@kms_pipe_crc_basic@read-crc-pipe-c-frame-sequence:
fi-glk-j4005: PASS -> FAIL (fdo#103481)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-skl-6700k2: PASS -> FAIL (fdo#103191, fdo#104724)
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: PASS -> FAIL (fdo#104008)
==== Possible fixes ====
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-glk-j4005: FAIL (fdo#100368) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2520m: INCOMPLETE (fdo#103713) -> PASS
fi-cnl-psr: DMESG-WARN (fdo#104951) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103481 https://bugs.freedesktop.org/show_bug.cgi?id=103481
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#105600 https://bugs.freedesktop.org/show_bug.cgi?id=105600
== Participating hosts (40 -> 39) ==
Additional (3): fi-hsw-peppy fi-skl-guc fi-skl-gvtdvm
Missing (4): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4275 -> Patchwork_9186
CI_DRM_4275: 8fdb62e0511e81fa935059c274a2457361fdb679 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4505: 8a8f0271a71e2e0d2a2caa4d41f4ad1d9c89670e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9186: 57c399b9892ca574dd3ae3b604dd1ed20701fd13 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
57c399b9892c drm/i915/guc: Add support for define guc_log_size in megabytes. b9e2654525a9 drm/i915/guc: Move defines with size of GuC logs to intel_guc_log.h 95880c84d05b drm/i915/guc: Refactoring preparation of the GUC_CTL_CTXINFO parameter 2b961e2c7b83 drm/i915/guc: Refactoring preparation of the GUC_CTL_LOG_PARAMS parameter 07bddb5a9a17 drm/i915/guc: Refactoring preparation of the GUC_CTL_FEATURE parameter d9623c2e6457 drm/i915/guc: Refactoring preparation of the GUC_CTL_DEBUG parameter 7605582de700 drm/i915/guc: Don't store runtime GuC log level in modparam
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9186/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam
In reply to Piotr Piorkowski== Series Details ==
== Series Details ==
Series: series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam
URL : https://patchwork.freedesktop.org/series/44201/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4275_full -> Patchwork_9186_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9186_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9186_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/44201/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9186_full:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_schedule@deep-render:
shard-kbl: PASS -> SKIP
igt@pm_rc6_residency@rc6-accuracy:
shard-kbl: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9186_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
shard-glk: PASS -> FAIL (fdo#105703)
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: PASS -> FAIL (fdo#106509, fdo#105454)
igt@kms_flip@2x-flip-vs-expired-vblank:
shard-glk: PASS -> FAIL (fdo#105363) +1
igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
shard-hsw: PASS -> FAIL (fdo#100368)
igt@kms_flip@2x-plain-flip-ts-check:
shard-glk: PASS -> FAIL (fdo#100368)
igt@kms_flip@modeset-vs-vblank-race-interruptible:
shard-hsw: PASS -> FAIL (fdo#103060)
igt@kms_flip_tiling@flip-x-tiled:
shard-glk: PASS -> FAIL (fdo#103822, fdo#104724) +1
igt@kms_vblank@pipe-a-wait-forked-busy-hang:
shard-glk: PASS -> DMESG-WARN (fdo#105763) +1
==== Possible fixes ====
igt@gem_eio@hibernate:
shard-snb: INCOMPLETE (fdo#105411) -> PASS
igt@gem_eio@suspend:
shard-snb: DMESG-FAIL (fdo#106808) -> PASS
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-kbl: INCOMPLETE (fdo#106023, fdo#103665) -> PASS
igt@kms_flip@2x-dpms-vs-vblank-race:
shard-glk: FAIL (fdo#103060) -> PASS
igt@kms_flip@basic-flip-vs-wf_vblank:
shard-hsw: FAIL (fdo#103928) -> PASS
igt@kms_flip@plain-flip-ts-check:
shard-glk: FAIL (fdo#100368) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#105703 https://bugs.freedesktop.org/show_bug.cgi?id=105703
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#106808 https://bugs.freedesktop.org/show_bug.cgi?id=106808
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4275 -> Patchwork_9186
CI_DRM_4275: 8fdb62e0511e81fa935059c274a2457361fdb679 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4505: 8a8f0271a71e2e0d2a2caa4d41f4ad1d9c89670e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9186: 57c399b9892ca574dd3ae3b604dd1ed20701fd13 @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9186/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam (rev3)
In reply to Piotr Piorkowski== Series Details ==
== Series Details ==
Series: series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam (rev3)
URL : https://patchwork.freedesktop.org/series/44201/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4280 -> Patchwork_9205 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/44201/revisions/3/mbox/
== Known issues ==
Here are the changes found in Patchwork_9205 that come from known issues:
=== IGT changes ===
==== Possible fixes ====
igt@kms_chamelium@dp-edid-read:
fi-kbl-7500u: FAIL (fdo#103841) -> PASS
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: FAIL (fdo#104008) -> PASS fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
== Participating hosts (41 -> 36) ==
Missing (5): fi-ctg-p8600 fi-byt-squawks fi-ilk-m540 fi-glk-j4005 fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4280 -> Patchwork_9205
CI_DRM_4280: 967aa2f22752af3adc629b50e7d2ed2b7e061e44 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4507: 938135f033d7fd79c04a7a042d40f9d074489ffd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9205: 2d8957f508dca1fd3b25f006a40388ea2a020080 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
2d8957f508dc drm/i915/guc: Add support for define guc_log_size in megabytes. f7e3f92e39c4 drm/i915/guc: Move defines with size of GuC logs to intel_guc_log.h 6d545c035db0 drm/i915/guc: Refactoring preparation of the GUC_CTL_CTXINFO parameter d1164d33b9bd drm/i915/guc: Refactoring preparation of the GUC_CTL_LOG_PARAMS parameter bc10c687fb5a drm/i915/guc: Refactoring preparation of the GUC_CTL_FEATURE parameter 58c079486110 drm/i915/guc: Refactoring preparation of the GUC_CTL_DEBUG parameter 19eaa6cb7ef1 drm/i915/guc: Don't store runtime GuC log level in modparam
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9205/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam (rev3)
In reply to Piotr Piorkowski== Series Details ==
== Series Details ==
Series: series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam (rev3)
URL : https://patchwork.freedesktop.org/series/44201/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4280_full -> Patchwork_9205_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9205_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9205_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/44201/revisions/3/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9205_full:
=== IGT changes ===
==== Possible regressions ====
igt@drv_selftest@live_hangcheck:
shard-kbl: PASS -> DMESG-FAIL
==== Warnings ====
igt@drv_selftest@live_guc:
shard-kbl: PASS -> SKIP +1== Known issues ==
Here are the changes found in Patchwork_9205_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_ctx_isolation@bcs0-s3:
shard-kbl: PASS -> INCOMPLETE (fdo#103665) +1
igt@gem_eio@suspend:
shard-snb: PASS -> FAIL (fdo#105957)
igt@gem_ppgtt@blt-vs-render-ctxn:
shard-kbl: PASS -> INCOMPLETE (fdo#103665, fdo#106023)
igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
shard-glk: PASS -> FAIL (fdo#100368) +2
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-glk: PASS -> FAIL (fdo#102887, fdo#105363)
igt@kms_flip_tiling@flip-y-tiled:
shard-glk: PASS -> FAIL (fdo#104724, fdo#103822)
==== Possible fixes ====
igt@drv_selftest@live_gtt:
shard-glk: INCOMPLETE (k.org#198133, fdo#103359) -> PASS
igt@drv_selftest@live_hangcheck:
shard-apl: DMESG-FAIL (fdo#106560) -> PASS
igt@kms_flip@2x-flip-vs-expired-vblank:
shard-glk: FAIL (fdo#105363) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105957 https://bugs.freedesktop.org/show_bug.cgi?id=105957
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4280 -> Patchwork_9205
CI_DRM_4280: 967aa2f22752af3adc629b50e7d2ed2b7e061e44 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4507: 938135f033d7fd79c04a7a042d40f9d074489ffd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9205: 2d8957f508dca1fd3b25f006a40388ea2a020080 @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9205/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.IGT: failure for series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam (rev3)
Quoted 34 lines · Patchwork
== Series Details ==
Series: series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam (rev3)
URL : https://patchwork.freedesktop.org/series/44201/
State : failure== Summary ==
= CI Bug Log - changes from
CI_DRM_4280_full->Patchwork_9205_full=== Summary - FAILURE ==
Serious unknown changes coming with
Patchwork_9205_fullabsolutely
need to be
verified manually.If you think the reported changes have nothing to do with the
changes
introduced inPatchwork_9205_full, please notify your bug team to
allow them
to document this new failure mode, which will reduce false
positives in CI.External URL: https://patchwork.freedesktop.org/api/1.0/series/4420
1/revisions/3/mbox/== Possible new issues ==
Here are the unknown changes that may have been introduced in
Patchwork_9205_full:=== IGT changes ===
Quoted 11 lines
==== Possible regressions ====
igt@drv_selftest@live_hangcheck:
shard-kbl: PASS -> DMESG-FAIL
==== Warnings ====
igt@drv_selftest@live_guc:
shard-kbl: PASS -> SKIP +1These negative results do not relate to my changes.
Quoted 69 lines
Here are the changes found in
Patchwork_9205_fullthat come from
known issues:=== IGT changes ===
==== Issues hit ==== igt@gem_ctx_isolation@bcs0-s3: shard-kbl: PASS -> INCOMPLETE (fdo#103665) +1 igt@gem_eio@suspend: shard-snb: PASS -> FAIL (fdo#105957) igt@gem_ppgtt@blt-vs-render-ctxn: shard-kbl: PASS -> INCOMPLETE (fdo#103665, fdo#106023) igt@kms_flip@2x-plain-flip-fb-recreate-interruptible: shard-glk: PASS -> FAIL (fdo#100368) +2 igt@kms_flip@flip-vs-expired-vblank-interruptible: shard-glk: PASS -> FAIL (fdo#102887, fdo#105363) igt@kms_flip_tiling@flip-y-tiled: shard-glk: PASS -> FAIL (fdo#104724, fdo#103822) ==== Possible fixes ==== igt@drv_selftest@live_gtt: shard-glk: INCOMPLETE (k.org#198133, fdo#103359) ->PASS
igt@drv_selftest@live_hangcheck: shard-apl: DMESG-FAIL (fdo#106560) -> PASS igt@kms_flip@2x-flip-vs-expired-vblank: shard-glk: FAIL (fdo#105363) -> PASSfdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105957 https://bugs.freedesktop.org/show_bug.cgi?id=105957
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux:
CI_DRM_4280->Patchwork_9205
CI_DRM_4280:967aa2f22752af3adc629b50e7d2ed2b7e061e44@git://anongit.freedesktop.org/gfx-ci/linux
IGT_4507:938135f033d7fd79c04a7a042d40f9d074489ffd@git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9205:2d8957f508dca1fd3b25f006a40388ea2a020080@git://anongit.freedesktop.org/gfx-ci/linux
Quoted 4 lines
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchw
ork_9205/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.IGT: failure for series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam (rev3)
Quoting Piorkowski, Piotr (2018-06-12 14:12:34)
Quoted 41 lines · Patchwork
Quoted 40 lines
== Series Details ==
Series: series starting with [v2,1/7] drm/i915/guc: Don't store runtime GuC log level in modparam (rev3)
URL : https://patchwork.freedesktop.org/series/44201/
State : failure== Summary ==
= CI Bug Log - changes from
CI_DRM_4280_full->Patchwork_9205_full=== Summary - FAILURE ==
Serious unknown changes coming with
Patchwork_9205_fullabsolutely
need to be
verified manually.If you think the reported changes have nothing to do with the
changes
introduced inPatchwork_9205_full, please notify your bug team to
allow them
to document this new failure mode, which will reduce false
positives in CI.External URL: https://patchwork.freedesktop.org/api/1.0/series/4420
1/revisions/3/mbox/== Possible new issues ==
Here are the unknown changes that may have been introduced in
Patchwork_9205_full:=== IGT changes ===
==== Possible regressions ==== igt@drv_selftest@live_hangcheck: shard-kbl: PASS -> DMESG-FAIL
Quoted 7 lines
Quoted 5 lines
==== Warnings ==== igt@drv_selftest@live_guc: shard-kbl: PASS -> SKIP +1These negative results do not relate to my changes.
Applied, but note for the future, your authorname and s-o-b are not an exact match. Please fix so that the scripts don't complain (and let's hope upstream is also forgiving).
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx