drm/i915: Media freq factor and per-gt enhancements/fixes
Subsystems (2)
cover drm/i915: Media freq factor and per-gt enhancements/fixes
Some recent Intel dGfx platforms allow media IP to work at a different frequency from the base GT. This patch series exposes sysfs controls for this functionality in the new per-gt sysfs. Some enhancements and fixes to previous per-gt functionality are also included to complete the new functionality:
* Patches 1 and 2 implement basic sysfs controls for media freq
* Patch 3 extends previous pcode functions for multiple gt's and patch 4 adds a couple of pcode helpers
* Patch 5 uses the new pcode functions to retrieve media RP0/RPn frequencies
* Patch 6 fixes memory leaks in the previous per-gt sysfs implementation and some code refactoring
* Patch 7 creates a gt/gtN/.defaults directory to expose default RPS parameter values in the per-gt sysfs
* Patch 8 adds the default value for media_freq_factor to gt/gtN/.defaults
IGT tests for this new functionality have also been posted at:
https://patchwork.freedesktop.org/series/102664/
Test-with: deb07be64c3930945a0e7bd17989fda4ed2e5ece.1649870633.git.ashutosh.dixit@intel.com
Ashutosh Dixit (8):
drm/i915: Introduce has_media_ratio_mode
drm/i915/gt: Add media freq factor to per-gt sysfs drm/i915/pcode: Extend pcode functions for multiple gt's drm/i915/pcode: Add a couple of pcode helpers drm/i915/gt: Add media RP0/RPn to per-gt sysfs drm/i915/gt: Fix memory leaks in per-gt sysfs drm/i915/gt: Expose per-gt RPS defaults in sysfs drm/i915/gt: Expose default value for media_freq_factor in per-gt
sysfs
drivers/gpu/drm/i915/gt/intel_gt.c | 1 + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 41 ++- drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 12 +- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 246 ++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_gt_types.h | 14 + drivers/gpu/drm/i915/gt/intel_rps.c | 3 + .../drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 6 + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 39 ++- drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 + .../gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 3 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_pci.c | 2 + drivers/gpu/drm/i915/i915_reg.h | 18 ++ drivers/gpu/drm/i915/i915_sysfs.c | 2 + drivers/gpu/drm/i915/intel_device_info.h | 1 + drivers/gpu/drm/i915/intel_pcode.c | 136 ++++++---- drivers/gpu/drm/i915/intel_pcode.h | 39 ++- 18 files changed, 483 insertions(+), 84 deletions(-)
Signature · 1 line
2.34.1
PATCH 2/8 drm/i915/gt: Add media freq factor to per-gt sysfs
Expose new sysfs to program and retrieve media freq factor. Factor values of 0 (dynamic), 0.5 and 1.0 are supported via a u8.8 fixed point representation (corresponding to integer values of 0, 128 and 256 respectively).
Media freq factor is converted to media_ratio_mode for GuC. It is programmed into GuC using H2G SLPC interface. It is retrieved from GuC through a register read. A cached media_ratio_mode is maintained to preserve set values across GuC resets.
This patch adds the following sysfs files to gt/gtN sysfs:
* media_freq_factor
* media_freq_factor.scale
--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 130 ++++++++++++++++++ .../drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 6 + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 20 +++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 + .../gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 3 + 6 files changed, 161 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +1 -0
@@ -732,6 +732,7 @@#define GEN6_AGGRESSIVE_TURBO (0 << 15)#define GEN9_SW_REQ_UNSLICE_RATIO_SHIFT 23#define GEN9_IGNORE_SLICE_RATIO (0 << 0) +#define GEN12_MEDIA_FREQ_RATIO REG_BIT(13)#define GEN6_RC_VIDEO_FREQ _MMIO(0xa00c)#define GEN6_RC_CTL_RC6pp_ENABLE (1 << 16)
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +130 -0
140 lines not on this page · raw message
drivers/gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h +6 -0
@@ -122,6 +122,12 @@ enum slpc_param_id { SLPC_MAX_PARAM = 32, }; +enum slpc_media_ratio_mode { +SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL =0 , +SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_ONE =1 , +SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_TWO =2 , +}; +enum slpc_event_id {SLPC_EVENT_RESET =0 ,SLPC_EVENT_SHUTDOWN =1 ,
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +20 -0
@@ -260,6 +260,7 @@ int intel_guc_slpc_init(struct intel_guc_slpc *slpc) slpc->boost_freq =0 ;atomic_set (&slpc->num_waiters,0 ); slpc->num_boosts =0 ; + slpc->media_ratio_mode =SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL ;mutex_init (&slpc->lock);INIT_WORK (&slpc->boost_work, slpc_boost_work);
@@ -506,6 +507,22 @@ int intel_guc_slpc_get_min_freq(struct intel_guc_slpc *slpc, u32 *val)return ret; } +int intel_guc_slpc_set_media_ratio_mode (struct intel_guc_slpc *slpc,u32 val) +{ +struct drm_i915_private *i915 =slpc_to_i915 (slpc); +intel_wakeref_t wakeref; +int ret =0 ; + +if (!HAS_MEDIA_RATIO_MODE (i915)) +return -ENODEV ; + +with_intel_runtime_pm (&i915->runtime_pm, wakeref) + ret = slpc_set_param(slpc, +SLPC_PARAM_MEDIA_FF_RATIO_MODE , + val); +return ret; +} +void intel_guc_pm_intrmsk_enable (struct intel_gt *gt) {u32 pm_intrmsk_mbz =0 ;
@@ -654,6 +671,9 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)return ret; } +/* Set cached media freq ratio mode */ +intel_guc_slpc_set_media_ratio_mode (slpc, slpc->media_ratio_mode); +return 0 ; }
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h +1 -0
@@ -38,6 +38,7 @@ int intel_guc_slpc_set_boost_freq(struct intel_guc_slpc *slpc, u32 val);int intel_guc_slpc_get_max_freq (struct intel_guc_slpc *slpc,u32 *val);int intel_guc_slpc_get_min_freq (struct intel_guc_slpc *slpc,u32 *val);int intel_guc_slpc_print_info (struct intel_guc_slpc *slpc,struct drm_printer *p); +int intel_guc_slpc_set_media_ratio_mode (struct intel_guc_slpc *slpc,u32 val);void intel_guc_pm_intrmsk_enable (struct intel_gt *gt);void intel_guc_slpc_boost (struct intel_guc_slpc *slpc);void intel_guc_slpc_dec_waiters (struct intel_guc_slpc *slpc);
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h +3 -0
@@ -29,6 +29,9 @@ struct intel_guc_slpc {u32 min_freq_softlimit;u32 max_freq_softlimit; +/* cached media ratio mode */ +u32 media_ratio_mode; +/* Protects set/reset of boost freq * and value of num_waiters */
Signature · 1 line
2.34.1
PATCH 7/8 drm/i915/gt: Expose per-gt RPS defaults in sysfs
In reply to Ashutosh DixitCreate a gt/gtN/.defaults directory (similar to engine/<engine-name>/.defaults) to expose default parameter values for each gt in sysfs. Populate the .defaults directory with RPS parameter default values in order to allow userspace to revert to default values when needed.
This patch adds the following sysfs files to gt/gtN/.defaults:
* default_min_freq_mhz
* default_max_freq_mhz
* default_boost_freq_mhz
--- drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 10 ++-- drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 6 +++ drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 51 +++++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_gt_types.h | 10 ++++ drivers/gpu/drm/i915/gt/intel_rps.c | 3 ++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 17 +++++-- 6 files changed, 87 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_sysfs.c +5 -5
@@ -22,11 +22,6 @@ bool is_object_gt(struct kobject *kobj)return !strncmp (kobj->name,"gt" ,2 ); } -static struct intel_gt *kobj_to_gt (struct kobject *kobj) -{ - return container_of(kobj, struct intel_gt, sysfs_gtn); -} -struct intel_gt *intel_gt_sysfs_get_drvdata (struct device *dev,const char *name) {
@@ -101,6 +96,10 @@ void intel_gt_sysfs_register(struct intel_gt *gt) gt->i915->sysfs_gt, "gt%d", gt->info.id)) goto exit_fail; + gt->sysfs_defaults =kobject_create_and_add (".defaults" , >->sysfs_gtn); +if (!gt->sysfs_defaults) + goto exit_fail; +intel_gt_sysfs_pm_init (gt, >->sysfs_gtn);return ;
@@ -113,5 +112,6 @@ void intel_gt_sysfs_register(struct intel_gt *gt)void intel_gt_sysfs_unregister (struct intel_gt *gt) { +kobject_put (gt->sysfs_defaults);kobject_put (>->sysfs_gtn); }
drivers/gpu/drm/i915/gt/intel_gt_sysfs.h +6 -0
@@ -10,6 +10,7 @@#include <linux/kobject.h> #include "i915_gem.h" /* GEM_BUG_ON() */ +#include "intel_gt_types.h" struct intel_gt ;
@@ -22,6 +23,11 @@ intel_gt_create_kobj(struct intel_gt *gt,struct kobject *dir, const char *name); +static inline struct intel_gt *kobj_to_gt (struct kobject *kobj) +{ + return container_of(kobj, struct intel_gt, sysfs_gtn); +} +void intel_gt_sysfs_register (struct intel_gt *gt);void intel_gt_sysfs_unregister (struct intel_gt *gt); struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev,
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +51 -0
61 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_gt_types.h +10 -0
@@ -61,6 +61,12 @@ enum intel_steering_type {NUM_STEERING_TYPES }; +struct intel_rps_defaults { +u32 min_freq; +u32 max_freq; +u32 boost_freq; +}; +enum intel_submission_method {INTEL_SUBMISSION_RING ,INTEL_SUBMISSION_ELSP ,
@@ -225,6 +231,10 @@ struct intel_gt {/* gt/gtN sysfs */ struct kobject sysfs_gtn; + +/* sysfs defaults per gt */ +struct intel_rps_defaults rps_defaults; +struct kobject *sysfs_defaults; };enum intel_gt_scratch_field {
drivers/gpu/drm/i915/gt/intel_rps.c +3 -0
@@ -1976,7 +1976,9 @@ void intel_rps_init(struct intel_rps *rps)/* Derive initial user preferences/limits from the hardware limits */ rps->max_freq_softlimit = rps->max_freq; +rps_to_gt (rps)->rps_defaults.max_freq = rps->max_freq_softlimit; rps->min_freq_softlimit = rps->min_freq; +rps_to_gt (rps)->rps_defaults.min_freq = rps->min_freq_softlimit;/* After setting max-softlimit, find the overclock max freq */ if (GRAPHICS_VER (i915) ==6 ||IS_IVYBRIDGE (i915) ||IS_HASWELL (i915)) {
@@ -1994,6 +1996,7 @@ void intel_rps_init(struct intel_rps *rps)/* Finally allow us to boost to max by default */ rps->boost_freq = rps->max_freq; +rps_to_gt (rps)->rps_defaults.boost_freq = rps->boost_freq; rps->idle_freq = rps->min_freq;/* Start in the middle, from here we will autotune based on workload */
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +12 -5
@@ -547,20 +547,24 @@ static int slpc_set_softlimits(struct intel_guc_slpc *slpc)* unless they have deviated from defaults, in which case, * we retain the values and set min/max accordingly. */ -if (!slpc->max_freq_softlimit) +if (!slpc->max_freq_softlimit) { slpc->max_freq_softlimit = slpc->rp0_freq; -else if (slpc->max_freq_softlimit != slpc->rp0_freq) +slpc_to_gt (slpc)->rps_defaults.max_freq = slpc->max_freq_softlimit; + }else if (slpc->max_freq_softlimit != slpc->rp0_freq) { ret =intel_guc_slpc_set_max_freq (slpc, slpc->max_freq_softlimit); + }if (unlikely (ret))return ret; -if (!slpc->min_freq_softlimit) +if (!slpc->min_freq_softlimit) { slpc->min_freq_softlimit = slpc->min_freq; -else if (slpc->min_freq_softlimit != slpc->min_freq) +slpc_to_gt (slpc)->rps_defaults.min_freq = slpc->min_freq_softlimit; + }else if (slpc->min_freq_softlimit != slpc->min_freq) {return intel_guc_slpc_set_min_freq (slpc, slpc->min_freq_softlimit); + }return 0 ; }
@@ -606,8 +610,11 @@ static void slpc_get_rp_values(struct intel_guc_slpc *slpc) slpc->rp1_freq =intel_gpu_freq (rps, caps.rp1_freq); slpc->min_freq =intel_gpu_freq (rps, caps.min_freq); -if (!slpc->boost_freq) +/* Boost freq is RP0, unless already set */ +if (!slpc->boost_freq) { slpc->boost_freq = slpc->rp0_freq; +slpc_to_gt (slpc)->rps_defaults.boost_freq = slpc->boost_freq; + } }/*
Signature · 1 line
2.34.1
PATCH 3/8 drm/i915/pcode: Extend pcode functions for multiple gt's
In reply to Ashutosh DixitEach gt contains an independent instance of pcode. Extend pcode functions to interface with pcode on different gt's. Previous (GT0) pcode read/write interfaces are preserved.
--- drivers/gpu/drm/i915/intel_pcode.c | 108 ++++++++++++++++------------- drivers/gpu/drm/i915/intel_pcode.h | 27 ++++++-- 2 files changed, 82 insertions(+), 53 deletions(-)
drivers/gpu/drm/i915/intel_pcode.c +61 -47
@@ -6,6 +6,7 @@#include "i915_drv.h" #include "i915_reg.h" #include "intel_pcode.h" +#include "gt/intel_gt.h" static int gen6_check_mailbox_status (u32 mbox) {
@@ -52,14 +53,14 @@ static int gen7_check_mailbox_status(u32 mbox) } } -static int __snb_pcode_rw (struct drm_i915_private *i915,u32 mbox, -u32 *val,u32 *val1, -int fast_timeout_us,int slow_timeout_ms, -bool is_read) +static int __gt_pcode_rw (struct intel_gt *gt,u32 mbox, +u32 *val,u32 *val1, +int fast_timeout_us,int slow_timeout_ms, +bool is_read) { -struct intel_uncore *uncore = &i915->uncore; +struct intel_uncore *uncore = gt->uncore; -lockdep_assert_held (&i915->sb_lock); +lockdep_assert_held (>->i915->sb_lock);/* * GEN6_PCODE_* are outside of the forcewake domain, we can use
@@ -88,60 +89,60 @@ static int __snb_pcode_rw(struct drm_i915_private *i915, u32 mbox,if (is_read && val1) *val1 =intel_uncore_read_fw (uncore,GEN6_PCODE_DATA1 ); -if (GRAPHICS_VER (i915) >6 ) +if (GRAPHICS_VER (gt->i915) >6 )return gen7_check_mailbox_status (mbox);else return gen6_check_mailbox_status (mbox); } -int snb_pcode_read (struct drm_i915_private *i915,u32 mbox,u32 *val,u32 *val1) +int intel_gt_pcode_read (struct intel_gt *gt,u32 mbox,u32 *val,u32 *val1) {int err; -mutex_lock (&i915->sb_lock); - err =__snb_pcode_rw (i915, mbox, val, val1,500 ,20 , true); -mutex_unlock (&i915->sb_lock); +mutex_lock (>->i915->sb_lock); + err =__gt_pcode_rw (gt, mbox, val, val1,500 ,20 , true); +mutex_unlock (>->i915->sb_lock);if (err) { -drm_dbg (&i915->drm, -"warning: pcode (read from mbox %x) mailbox access failed for %ps: %d\n" , - mbox,__builtin_return_address (0 ), err); +drm_dbg (>->i915->drm, +"gt %d: warning: pcode (read from mbox %x) mailbox access failed for %ps: %d\n" , + gt->info.id, mbox,__builtin_return_address (0 ), err); }return err; } -int snb_pcode_write_timeout (struct drm_i915_private *i915,u32 mbox,u32 val, -int fast_timeout_us,int slow_timeout_ms) +int intel_gt_pcode_write_timeout (struct intel_gt *gt,u32 mbox,u32 val, +int fast_timeout_us,int slow_timeout_ms) {int err; -mutex_lock (&i915->sb_lock); - err =__snb_pcode_rw (i915, mbox, &val,NULL , - fast_timeout_us, slow_timeout_ms, false); -mutex_unlock (&i915->sb_lock); +mutex_lock (>->i915->sb_lock); + err =__gt_pcode_rw (gt, mbox, &val,NULL , + fast_timeout_us, slow_timeout_ms, false); +mutex_unlock (>->i915->sb_lock);if (err) { -drm_dbg (&i915->drm, -"warning: pcode (write of 0x%08x to mbox %x) mailbox access failed for %ps: %d\n" , - val, mbox,__builtin_return_address (0 ), err); +drm_dbg (>->i915->drm, +"gt %d: warning: pcode (write of 0x%08x to mbox %x) mailbox access failed for %ps: %d\n" , + gt->info.id, val, mbox,__builtin_return_address (0 ), err); }return err; } -static bool skl_pcode_try_request (struct drm_i915_private *i915,u32 mbox, -u32 request,u32 reply_mask,u32 reply, -u32 *status) +static bool __gt_pcode_try_request (struct intel_gt *gt,u32 mbox, +u32 request,u32 reply_mask,u32 reply, +u32 *status) { - *status =__snb_pcode_rw (i915, mbox, &request,NULL ,500 ,0 , true); + *status =__gt_pcode_rw (gt, mbox, &request,NULL ,500 ,0 , true);return (*status ==0 ) && ((request & reply_mask) == reply); }/** -* skl_pcode_request - send PCODE request until acknowledgment -* @i915: device private +* intel_gt_pcode_request - send PCODE request until acknowledgment +* @gt: gt * @mbox: PCODE mailbox ID the request is targeted for * @request: request ID * @reply_mask: mask used to check for request acknowledgment
@@ -158,16 +159,16 @@ static bool skl_pcode_try_request(struct drm_i915_private *i915, u32 mbox,* Returns 0 on success, %-ETIMEDOUT in case of a timeout, <0 in case of some * other error as reported by PCODE. */ -int skl_pcode_request (struct drm_i915_private *i915,u32 mbox,u32 request, -u32 reply_mask,u32 reply,int timeout_base_ms) +int intel_gt_pcode_request (struct intel_gt *gt,u32 mbox,u32 request, +u32 reply_mask,u32 reply,int timeout_base_ms) {u32 status;int ret; -mutex_lock (&i915->sb_lock); +mutex_lock (>->i915->sb_lock);#define COND \ - skl_pcode_try_request(i915, mbox, request, reply_mask, reply, &status) + __gt_pcode_try_request(gt, mbox, request, reply_mask, reply, &status)/* * Prime the PCODE by doing a request first. Normally it guarantees
@@ -193,35 +194,48 @@ int skl_pcode_request(struct drm_i915_private *i915, u32 mbox, u32 request,* requests, and for any quirks of the PCODE firmware that delays * the request completion. */ -drm_dbg_kms (&i915->drm, +drm_dbg_kms (>->i915->drm,"PCODE timeout, retrying with preemption disabled\n" ); -drm_WARN_ON_ONCE (&i915->drm, timeout_base_ms >3 ); +drm_WARN_ON_ONCE (>->i915->drm, timeout_base_ms >3 );preempt_disable (); ret =wait_for_atomic (COND ,50 );preempt_enable (); out: -mutex_unlock (&i915->sb_lock); +mutex_unlock (>->i915->sb_lock);return status ? status : ret;#undef COND } +static int __gt_pcode_init (struct intel_gt *gt) +{ +int ret =intel_gt_pcode_request (gt,DG1_PCODE_STATUS , +DG1_UNCORE_GET_INIT_STATUS , +DG1_UNCORE_INIT_STATUS_COMPLETE , +DG1_UNCORE_INIT_STATUS_COMPLETE ,180000 ); + +drm_dbg (>->i915->drm,"gt %d: PCODE init status %d\n" , gt->info.id, ret); + +if (ret) +drm_err (>->i915->drm,"gt %d: Pcode did not report uncore initialization completion!\n" , + gt->info.id); + +return ret; +} +int intel_pcode_init (struct drm_i915_private *i915) { -int ret =0 ; +struct intel_gt *gt; +int i, ret =0 ;if (!IS_DGFX (i915))return ret; - ret =skl_pcode_request (i915,DG1_PCODE_STATUS , -DG1_UNCORE_GET_INIT_STATUS , -DG1_UNCORE_INIT_STATUS_COMPLETE , -DG1_UNCORE_INIT_STATUS_COMPLETE ,180000 ); - -drm_dbg (&i915->drm,"PCODE init status %d\n" , ret); - -if (ret) -drm_err (&i915->drm,"Pcode did not report uncore initialization completion!\n" ); +for_each_gt (gt, i915, i) { + ret =__gt_pcode_init (gt); +if (ret) +return ret; + } -return ret; +return 0 ; }
drivers/gpu/drm/i915/intel_pcode.h +21 -6
@@ -8,16 +8,31 @@#include <linux/types.h> +struct intel_gt ;struct drm_i915_private ; -int snb_pcode_read (struct drm_i915_private *i915,u32 mbox,u32 *val,u32 *val1); -int snb_pcode_write_timeout (struct drm_i915_private *i915,u32 mbox,u32 val, -int fast_timeout_us,int slow_timeout_ms); -#define snb_pcode_write (i915, mbox, val) \ +int intel_gt_pcode_read (struct intel_gt *gt,u32 mbox,u32 *val,u32 *val1); + +int intel_gt_pcode_write_timeout (struct intel_gt *gt,u32 mbox,u32 val, +int fast_timeout_us,int slow_timeout_ms); + +#define intel_gt_pcode_write (gt, mbox, val) \ + intel_gt_pcode_write_timeout(gt, mbox, val, 500, 0) + +int intel_gt_pcode_request (struct intel_gt *gt,u32 mbox,u32 request, +u32 reply_mask,u32 reply,int timeout_base_ms); + +#define snb_pcode_read (i915, mbox, val, val1) \ + intel_gt_pcode_read(&(i915)->gt0, mbox, val, val1) + +#define snb_pcode_write_timeout (i915, mbox, val, fast_timeout_us, slow_timeout_ms) \ + intel_gt_pcode_write_timeout(&(i915)->gt0, mbox, val, fast_timeout_us, slow_timeout_ms) + +#define snb_pcode_write (i915, mbox, val) \ snb_pcode_write_timeout(i915, mbox, val, 500, 0) -int skl_pcode_request (struct drm_i915_private *i915,u32 mbox,u32 request, -u32 reply_mask,u32 reply,int timeout_base_ms); +#define skl_pcode_request (i915, mbox, request, reply_mask, reply, timeout_base_ms) \ + intel_gt_pcode_request(&(i915)->gt0, mbox, request, reply_mask, reply, timeout_base_ms)int intel_pcode_init (struct drm_i915_private *i915);
Signature · 1 line
2.34.1
PATCH 6/8 drm/i915/gt: Fix memory leaks in per-gt sysfs
In reply to Ashutosh DixitAll kmalloc'd kobjects need a kobject_put() to free memory. For example in previous code, kobj_gt_release() never gets called. The requirement of kobject_put() now results in a slightly different code organization.
--- drivers/gpu/drm/i915/gt/intel_gt.c | 1 + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 35 ++++++++++-------------- drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 6 +--- drivers/gpu/drm/i915/gt/intel_gt_types.h | 3 ++ drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ 5 files changed, 22 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt.c +1 -0
@@ -783,6 +783,7 @@ void intel_gt_driver_unregister(struct intel_gt *gt) {intel_wakeref_t wakeref; +intel_gt_sysfs_unregister (gt);intel_rps_driver_unregister (>->rps);intel_pxp_fini (>->pxp);
drivers/gpu/drm/i915/gt/intel_gt_sysfs.c +15 -20
@@ -24,7 +24,7 @@ bool is_object_gt(struct kobject *kobj)static struct intel_gt *kobj_to_gt (struct kobject *kobj) { - return container_of(kobj, struct kobj_gt, base)->gt; + return container_of(kobj, struct intel_gt, sysfs_gtn); } struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev,
@@ -72,21 +72,19 @@ static struct attribute *id_attrs[] = { };ATTRIBUTE_GROUPS (id); -static void kobj_gt_release (struct kobject *kobj) +/* A kobject needs a release() method even if it does nothing */ +static void kobj_gtn_release (struct kobject *kobj) { -kfree (kobj); } -static struct kobj_type kobj_gt_type = { - .release = kobj_gt_release, +static struct kobj_type kobj_gtn_type = { + .release = kobj_gtn_release, .sysfs_ops = &kobj_sysfs_ops, .default_groups = id_groups, };void intel_gt_sysfs_register (struct intel_gt *gt) { -struct kobj_gt *kg; -/* * We need to make things right with the * ABI compatibility. The files were originally
@@ -98,25 +96,22 @@ void intel_gt_sysfs_register(struct intel_gt *gt)if (gt_is_root (gt))intel_gt_sysfs_pm_init (gt,gt_get_parent_obj (gt)); - kg =kzalloc (sizeof (*kg),GFP_KERNEL ); -if (!kg) +/* init and xfer ownership to sysfs tree */ +if (kobject_init_and_add (>->sysfs_gtn, &kobj_gtn_type, + gt->i915->sysfs_gt,"gt%d" , gt->info.id)) goto exit_fail; -kobject_init (&kg->base, &kobj_gt_type); - kg->gt = gt; - -/* xfer ownership to sysfs tree */ -if (kobject_add (&kg->base, gt->i915->sysfs_gt,"gt%d" , gt->info.id)) - goto exit_kobj_put; - -intel_gt_sysfs_pm_init (gt, &kg->base); +intel_gt_sysfs_pm_init (gt, >->sysfs_gtn);return ; -exit_kobj_put: -kobject_put (&kg->base); - exit_fail: +kobject_put (>->sysfs_gtn);drm_warn (>->i915->drm,"failed to initialize gt%d sysfs root\n" , gt->info.id); } + +void intel_gt_sysfs_unregister (struct intel_gt *gt) +{ +kobject_put (>->sysfs_gtn); +}
drivers/gpu/drm/i915/gt/intel_gt_sysfs.h +1 -5
@@ -13,11 +13,6 @@struct intel_gt ; -struct kobj_gt { -struct kobject base; -struct intel_gt *gt; -}; -bool is_object_gt (struct kobject *kobj);struct drm_i915_private *kobj_to_i915 (struct kobject *kobj);
@@ -28,6 +23,7 @@ intel_gt_create_kobj(struct intel_gt *gt, const char *name);void intel_gt_sysfs_register (struct intel_gt *gt); +void intel_gt_sysfs_unregister (struct intel_gt *gt);struct intel_gt *intel_gt_sysfs_get_drvdata (struct device *dev,const char *name);
drivers/gpu/drm/i915/gt/intel_gt_types.h +3 -0
@@ -222,6 +222,9 @@ struct intel_gt { } mocs;struct intel_pxp pxp; + +/* gt/gtN sysfs */ +struct kobject sysfs_gtn; };enum intel_gt_scratch_field {
drivers/gpu/drm/i915/i915_sysfs.c +2 -0
@@ -259,4 +259,6 @@ void i915_teardown_sysfs(struct drm_i915_private *dev_priv)device_remove_bin_file (kdev, &dpf_attrs_1);device_remove_bin_file (kdev, &dpf_attrs); + +kobject_put (dev_priv->sysfs_gt); }
Signature · 1 line
2.34.1
PATCH 4/8 drm/i915/pcode: Add a couple of pcode helpers
In reply to Ashutosh DixitAdd a couple of helpers to help formatting pcode commands and improve code readability.
Cc: Mike Ruhl <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Original-author: Dale B Stimson <[email protected]>
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pcode.c | 32 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_pcode.h | 12 +++++++++++ 3 files changed, 47 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -6684,6 +6684,9 @@#define GEN6_PCODE_MAILBOX _MMIO(0x138124)#define GEN6_PCODE_READY (1 << 31) +#define GEN6_PCODE_MB_PARAM2 REG_GENMASK(23, 16) +#define GEN6_PCODE_MB_PARAM1 REG_GENMASK(15, 8) +#define GEN6_PCODE_MB_COMMAND REG_GENMASK(7, 0)#define GEN6_PCODE_ERROR_MASK 0xFF#define GEN6_PCODE_SUCCESS 0x0#define GEN6_PCODE_ILLEGAL_CMD 0x1
drivers/gpu/drm/i915/intel_pcode.c +32 -0
@@ -239,3 +239,35 @@ int intel_pcode_init(struct drm_i915_private *i915)return 0 ; } + +int __intel_gt_pcode_read (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 *val) +{ +intel_wakeref_t wakeref; +u32 mbox; +int err; + + mbox =REG_FIELD_PREP (GEN6_PCODE_MB_COMMAND , mbcmd) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM1 , p1) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM2 , p2); + +with_intel_runtime_pm (gt->uncore->rpm, wakeref) + err = intel_gt_pcode_read(gt, mbox, val, NULL); + +return err; +} + +int __intel_gt_pcode_write (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 val) +{ +intel_wakeref_t wakeref; +u32 mbox; +int err; + + mbox =REG_FIELD_PREP (GEN6_PCODE_MB_COMMAND , mbcmd) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM1 , p1) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM2 , p2); + +with_intel_runtime_pm (gt->uncore->rpm, wakeref) + err = intel_gt_pcode_write(gt, mbox, val); + +return err; +}
drivers/gpu/drm/i915/intel_pcode.h +12 -0
@@ -36,4 +36,16 @@ int intel_gt_pcode_request(struct intel_gt *gt, u32 mbox, u32 request,int intel_pcode_init (struct drm_i915_private *i915); +/* +* Helpers for dGfx PCODE mailbox command formatting +*/ +int __intel_gt_pcode_read (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 *val); +int __intel_gt_pcode_write (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 val); + +#define __snb_pcode_read (i915, mbcmd, p1, p2, val) \ + __intel_gt_pcode_read(&(i915)->gt0, mbcmd, p1, p2, val) + +#define __snb_pcode_write (i915, mbcmd, p1, p2, val) \ + __intel_gt_pcode_write(&(i915)->gt0, mbcmd, p1, p2, val) +#endif /* _INTEL_PCODE_H */
Signature · 1 line
2.34.1
PATCH 5/8 drm/i915/gt: Add media RP0/RPn to per-gt sysfs
In reply to Ashutosh DixitRetrieve RP0 and RPn freq for media IP from PCODE and display in per-gt sysfs. This patch adds the following files to gt/gtN sysfs:
* media_RP0_freq_mhz
* media_RPn_freq_mhz
Cc: Rodrigo Vivi <[email protected]>
Cc: Joonas Lahtinen <[email protected]>
Original-author: Dale B Stimson <[email protected]>
--- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 47 +++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 15 +++++++ 2 files changed, 62 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +47 -0
@@ -12,6 +12,7 @@#include "i915_sysfs.h" #include "intel_gt.h" #include "intel_gt_regs.h" +#include "intel_pcode.h" #include "intel_gt_sysfs.h" #include "intel_gt_sysfs_pm.h" #include "intel_rc6.h"
@@ -669,13 +670,59 @@ static ssize_t media_freq_factor_store(struct device *dev,return err ?: count; } +static ssize_t media_RP0_freq_mhz_show (struct device *dev, +struct device_attribute *attr, +char *buff) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (dev, attr->attr.name); +u32 val; +int err; + + err =__intel_gt_pcode_read (gt,XEHPSDV_PCODE_FREQUENCY_CONFIG , +PCODE_MBOX_FC_SC_READ_FUSED_P0 , +PCODE_MBOX_DOMAIN_MEDIAFF , &val); + +if (err) +return err; + +/* data_out - Fused P0 for domain ID in units of 50 MHz */ + val *=GT_FREQUENCY_MULTIPLIER ; + +return sysfs_emit (buff,"%u\n" , val); +} + +static ssize_t media_RPn_freq_mhz_show (struct device *dev, +struct device_attribute *attr, +char *buff) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (dev, attr->attr.name); +u32 val; +int err; + + err =__intel_gt_pcode_read (gt,XEHPSDV_PCODE_FREQUENCY_CONFIG , +PCODE_MBOX_FC_SC_READ_FUSED_PN , +PCODE_MBOX_DOMAIN_MEDIAFF , &val); + +if (err) +return err; + +/* data_out - Fused P0 for domain ID in units of 50 MHz */ + val *=GT_FREQUENCY_MULTIPLIER ; + +return sysfs_emit (buff,"%u\n" , val); +} +static DEVICE_ATTR_RW (media_freq_factor);static struct device_attribute dev_attr_media_freq_factor_scale =__ATTR (media_freq_factor.scale,0444 , freq_factor_scale_show,NULL ); +static DEVICE_ATTR_RO (media_RP0_freq_mhz); +static DEVICE_ATTR_RO (media_RPn_freq_mhz);static const struct attribute *media_perf_power_attrs[] = { &dev_attr_media_freq_factor.attr, &dev_attr_media_freq_factor_scale.attr, + &dev_attr_media_RP0_freq_mhz.attr, + &dev_attr_media_RPn_freq_mhz.attr,NULL };
drivers/gpu/drm/i915/i915_reg.h +15 -0
@@ -6753,6 +6753,21 @@#define DG1_UNCORE_GET_INIT_STATUS 0x0#define DG1_UNCORE_INIT_STATUS_COMPLETE 0x1#define GEN12_PCODE_READ_SAGV_BLOCK_TIME_US 0x23 +#define XEHPSDV_PCODE_FREQUENCY_CONFIG 0x6e/* xehpsdv, pvc */ +/* XEHPSDV_PCODE_FREQUENCY_CONFIG sub-commands (param1) */ +#define PCODE_MBOX_FC_SC_READ_FUSED_P0 0x0 +#define PCODE_MBOX_FC_SC_READ_FUSED_PN 0x1 +/* PCODE_MBOX_DOMAIN_* - mailbox domain IDs */ +/* XEHPSDV_PCODE_FREQUENCY_CONFIG param2 */ +#define PCODE_MBOX_DOMAIN_NONE 0x0 +#define PCODE_MBOX_DOMAIN_GT 0x1 +#define PCODE_MBOX_DOMAIN_HBM 0x2 +#define PCODE_MBOX_DOMAIN_MEDIAFF 0x3 +#define PCODE_MBOX_DOMAIN_MEDIA_SAMPLER 0x4 +#define PCODE_MBOX_DOMAIN_SYSTOLIC_ARRAY 0x5 +#define PCODE_MBOX_DOMAIN_CHIPLET 0x6 +#define PCODE_MBOX_DOMAIN_BASE_CHIPLET_LINK 0x7 +#define PCODE_MBOX_DOMAIN_BASE 0x8#define GEN6_PCODE_DATA _MMIO(0x138128)#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16
Signature · 1 line
2.34.1
PATCH 8/8 drm/i915/gt: Expose default value for media_freq_factor in per-gt sysfs
In reply to Ashutosh DixitAdd the following sysfs file to gt/gtN/.defaults:
* media_freq_factor
--- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_gt_types.h | 1 + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 ++ 3 files changed, 21 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +18 -0
@@ -759,6 +759,18 @@ default_boost_freq_mhz_show(struct kobject *kobj, struct kobj_attribute *attr, cstatic struct kobj_attribute default_boost_freq_mhz =__ATTR (rps_boost_freq_mhz,0444 , default_boost_freq_mhz_show,NULL ); +static ssize_t +default_media_freq_factor_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) +{ +struct intel_gt *gt =kobj_to_gt (kobj->parent); + +return sysfs_emit (buf,"%d\n" , +media_ratio_mode_to_factor (gt->rps_defaults.media_ratio_mode)); +} + +static struct kobj_attribute default_media_freq_factor = +__ATTR (media_freq_factor,0444 , default_media_freq_factor_show,NULL ); +static const struct attribute *const rps_defaults_attrs[] = { &default_min_freq_mhz.attr, &default_max_freq_mhz.attr,
@@ -819,6 +831,12 @@ void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj)drm_warn (>->i915->drm,"failed to create add gt%u media_perf_power_attrs sysfs (%pe)\n" , gt->info.id,ERR_PTR (ret)); + + ret =sysfs_create_file (gt->sysfs_defaults, &default_media_freq_factor.attr); +if (ret) +drm_warn (>->i915->drm, +"failed to add gt%u default_media_freq_factor sysfs (%pe)\n" , + gt->info.id,ERR_PTR (ret)); } ret =add_rps_defaults (gt);
drivers/gpu/drm/i915/gt/intel_gt_types.h +1 -0
@@ -65,6 +65,7 @@ struct intel_rps_defaults {u32 min_freq;u32 max_freq;u32 boost_freq; +u32 media_ratio_mode; };enum intel_submission_method {
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +2 -0
@@ -260,7 +260,9 @@ int intel_guc_slpc_init(struct intel_guc_slpc *slpc) slpc->boost_freq =0 ;atomic_set (&slpc->num_waiters,0 ); slpc->num_boosts =0 ; + slpc->media_ratio_mode =SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL ; +slpc_to_gt (slpc)->rps_defaults.media_ratio_mode = slpc->media_ratio_mode;mutex_init (&slpc->lock);INIT_WORK (&slpc->boost_work, slpc_boost_work);
Signature · 1 line
2.34.1
PATCH 1/8 drm/i915: Introduce has_media_ratio_mode
In reply to Ashutosh DixitMedia ratio mode (the ability for media IP to work at a different frequency from the GT) is available for a subset of dGfx platforms supporting GuC/SLPC. Introduce 'has_media_ratio_mode' flag in intel_device_info to identify these platforms and set it for XEHPSDV and DG2/ATS-M.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 2 ++ drivers/gpu/drm/i915/intel_device_info.h | 1 + 3 files changed, 5 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1222,6 +1222,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define CCS_MASK (gt) \ ENGINE_INSTANCES_MASK(gt, CCS0, I915_MAX_CCS) +#define HAS_MEDIA_RATIO_MODE (dev_priv) (INTEL_INFO(dev_priv)->has_media_ratio_mode) +/* * The Gen7 cmdparser copies the scanned buffer to the ggtt for execution * All later gens can run the final buffer from the ppgtt
drivers/gpu/drm/i915/i915_pci.c +2 -0
@@ -1032,6 +1032,7 @@ static const struct intel_device_info xehpsdv_info = { .display = { }, .has_64k_pages = 1, .needs_compact_pt = 1, + .has_media_ratio_mode = 1, .platform_engine_mask =BIT (RCS0 ) |BIT (BCS0 ) | BIT(VECS0) | BIT(VECS1) | BIT(VECS2) | BIT(VECS3) |
@@ -1051,6 +1052,7 @@ static const struct intel_device_info xehpsdv_info = { .has_64k_pages = 1, \ .has_guc_deprivilege = 1, \ .needs_compact_pt = 1, \ + .has_media_ratio_mode = 1, \ .platform_engine_mask = \BIT (RCS0 ) |BIT (BCS0 ) | \ BIT(VECS0) | BIT(VECS1) | \
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -146,6 +146,7 @@ enum intel_ppgtt_type {func (has_llc); \func (has_logical_ring_contexts); \func (has_logical_ring_elsq); \ +func (has_media_ratio_mode); \func (has_mslices); \func (has_pooled_eu); \func (has_pxp); \
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 6/8] drm/i915/gt: Fix memory leaks in per-gt sysfs
In reply to Ashutosh DixitQuoted 3 lines · Ashutosh Dixit
All kmalloc'd kobjects need a
kobject_put()to free memory. For example in previous code,kobj_gt_release()never gets called.
Even if kobj_gt_release() were to get called, the code allocates 'struct kobj_gt' and frees 'struct kobject'. Similar memory leaks are also present in sysfs_engines.c from where this code pattern is borrowed.
Since these memory leaks occur only at module unload (or device removal) they are not serious but it may still be worth it to fix them and also not further propagate an erroneous code pattern. Thanks.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Media freq factor and per-gt enhancements/fixes
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: drm/i915: Media freq factor and per-gt enhancements/fixes
URL : https://patchwork.freedesktop.org/series/102665/
State : warning
== Summary ==
Error: dim checkpatch failed92ac366cc868 drm/i915: Introduce has_media_ratio_mode 4b1b7f68f558 drm/i915/gt: Add media freq factor to per-gt sysfs 5d10e2533d54 drm/i915/pcode: Extend pcode functions for multiple gt's dd2f0dcfad44 drm/i915/pcode: Add a couple of pcode helpers ea0f5cdbabd5 drm/i915/gt: Add media RP0/RPn to per-gt sysfs -:79: CHECK:CAMELCASE: Avoid CamelCase: <media_RPn_freq_mhz> #79: FILE: drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c:719:
+static DEVICE_ATTR_RO(media_RPn_freq_mhz);
-:85: CHECK:CAMELCASE: Avoid CamelCase: <dev_attr_media_RPn_freq_mhz> #85: FILE: drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c:725:
+ &dev_attr_media_RPn_freq_mhz.attr,
total: 0 errors, 0 warnings, 2 checks, 87 lines checked7b57716e2c8b drm/i915/gt: Fix memory leaks in per-gt sysfs 128e5eedd045 drm/i915/gt: Expose per-gt RPS defaults in sysfs 687d915927bf drm/i915/gt: Expose default value for media_freq_factor in per-gt sysfs
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: Media freq factor and per-gt enhancements/fixes
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: drm/i915: Media freq factor and per-gt enhancements/fixes
URL : https://patchwork.freedesktop.org/series/102665/
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: failure for drm/i915: Media freq factor and per-gt enhancements/fixes
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: drm/i915: Media freq factor and per-gt enhancements/fixes
URL : https://patchwork.freedesktop.org/series/102665/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11497 -> Patchwork_102665v1
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_102665v1 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_102665v1, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/index.html
Participating hosts (39 -> 46)
------------------------------
Additional (9): bat-dg1-6 bat-dg1-5 bat-dg2-8 bat-dg2-9 bat-adlp-6 bat-adlp-4 bat-rpls-1 bat-rpls-2 bat-jsl-1
Missing (2): fi-bsw-cyan fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_102665v1:
### IGT changes ###
#### Possible regressions ####
* igt@gem_lmem_swapping@parallel-random-engines:
- bat-dg1-5: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- bat-dg1-6: NOTRUN -> [FAIL][2]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_lmem_swapping@random-engines:
- {bat-dg2-8}: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg2-8/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- {bat-dg2-9}: NOTRUN -> [SKIP][4] +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg2-9/igt@[email protected]
* igt@i915_selftest@live@gem:
- {bat-dg2-9}: NOTRUN -> [FAIL][5] +35 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg2-9/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_102665v1 that come from known issues:
### CI changes ###
#### Possible fixes ####
* boot:
- fi-ilk-650: [FAIL][6] -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/fi-ilk-650/boot.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-ilk-650/boot.html
### IGT changes ###
#### Issues hit ####
* igt@fbdev@write:
- bat-dg1-5: NOTRUN -> [SKIP][8] ([i915#2582]) +4 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-ilk-650: NOTRUN -> [SKIP][9] ([fdo#109271]) +21 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-ilk-650/igt@[email protected]
* igt@gem_mmap@basic:
- bat-dg1-6: NOTRUN -> [SKIP][10] ([i915#4083])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][11] ([i915#4083])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@gem_tiled_blits@basic:
- bat-dg1-6: NOTRUN -> [SKIP][12] ([i915#4077]) +2 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@gem_tiled_fence_blits@basic:
- bat-dg1-5: NOTRUN -> [SKIP][13] ([i915#4077]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@gem_tiled_pread_basic:
- bat-dg1-5: NOTRUN -> [SKIP][14] ([i915#4079]) +1 similar issue
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@gem_tiled_pread_basic.html
- bat-dg1-6: NOTRUN -> [SKIP][15] ([i915#4079]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- bat-dg1-5: NOTRUN -> [SKIP][16] ([i915#1155])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- bat-dg1-6: NOTRUN -> [SKIP][17] ([i915#1155])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@kms_addfb_basic@addfb25-x-tiled-legacy:
- bat-dg1-6: NOTRUN -> [SKIP][18] ([i915#4212]) +7 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg1-5: NOTRUN -> [SKIP][19] ([i915#4215])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- bat-dg1-6: NOTRUN -> [SKIP][20] ([i915#4215])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@kms_addfb_basic@tile-pitch-mismatch:
- bat-dg1-5: NOTRUN -> [SKIP][21] ([i915#4212]) +7 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_busy@basic:
- bat-dg1-5: NOTRUN -> [SKIP][22] ([i915#4303])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_chamelium@dp-hpd-fast:
- fi-ilk-650: NOTRUN -> [SKIP][23] ([fdo#109271] / [fdo#111827]) +8 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-ilk-650/igt@[email protected]
* igt@kms_chamelium@hdmi-edid-read:
- bat-dg1-6: NOTRUN -> [SKIP][24] ([fdo#111827]) +8 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- bat-dg1-5: NOTRUN -> [SKIP][25] ([fdo#111827]) +8 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- bat-dg1-6: NOTRUN -> [SKIP][26] ([i915#4103] / [i915#4213]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-dg1-5: NOTRUN -> [SKIP][27] ([i915#4103] / [i915#4213]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_flip@basic-flip-vs-dpms:
- bat-dg1-5: NOTRUN -> [SKIP][28] ([i915#4078]) +23 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- bat-dg1-6: NOTRUN -> [SKIP][29] ([fdo#109285])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][30] ([fdo#109285])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
- bat-dg1-5: NOTRUN -> [SKIP][31] ([i915#4078] / [i915#5341])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- fi-ilk-650: NOTRUN -> [SKIP][32] ([fdo#109271] / [i915#5341])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-ilk-650/igt@[email protected]
* igt@kms_psr@primary_page_flip:
- bat-dg1-5: NOTRUN -> [SKIP][33] ([i915#1072] / [i915#4078]) +3 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@kms_psr@primary_page_flip.html
* igt@kms_psr@sprite_plane_onoff:
- bat-dg1-6: NOTRUN -> [SKIP][34] ([i915#1072] / [i915#4078]) +3 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-dg1-6: NOTRUN -> [SKIP][35] ([i915#3555])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][36] ([i915#3555])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@prime_vgem@basic-fence-mmap:
- bat-dg1-5: NOTRUN -> [SKIP][37] ([i915#3708] / [i915#4077]) +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@prime_vgem@basic-gtt:
- bat-dg1-6: NOTRUN -> [SKIP][38] ([i915#3708] / [i915#4077]) +1 similar issue
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- bat-dg1-6: NOTRUN -> [SKIP][39] ([i915#3708] / [i915#4873])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][40] ([i915#3708] / [i915#4873])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@prime_vgem@basic-write:
- bat-dg1-5: NOTRUN -> [SKIP][41] ([i915#3708]) +3 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- bat-dg1-6: NOTRUN -> [SKIP][42] ([i915#3708]) +3 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@runner@aborted:
- bat-dg1-5: NOTRUN -> [FAIL][43] ([i915#4312])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [FAIL][44] ([i915#4312])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-bdw-5557u/igt@[email protected]
- bat-adlp-4: NOTRUN -> [FAIL][45] ([i915#5457])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-adlp-4/igt@[email protected]
- bat-dg1-6: NOTRUN -> [FAIL][46] ([i915#4312])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-skl-guc: [DMESG-FAIL][47] -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/fi-skl-guc/igt@i915_selftest@live@gt_heartbeat.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-skl-guc/igt@i915_selftest@live@gt_heartbeat.html
{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#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[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#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#3003]: https://gitlab.freedesktop.org/drm/intel/issues/3003
[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#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3576]: https://gitlab.freedesktop.org/drm/intel/issues/3576
[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#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#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
[i915#5171]: https://gitlab.freedesktop.org/drm/intel/issues/5171
[i915#5174]: https://gitlab.freedesktop.org/drm/intel/issues/5174
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5193]: https://gitlab.freedesktop.org/drm/intel/issues/5193
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
[i915#5275]: https://gitlab.freedesktop.org/drm/intel/issues/5275
[i915#5329]: https://gitlab.freedesktop.org/drm/intel/issues/5329
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5341]: https://gitlab.freedesktop.org/drm/intel/issues/5341
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5457]: https://gitlab.freedesktop.org/drm/intel/issues/5457
[i915#5606]: https://gitlab.freedesktop.org/drm/intel/issues/5606
[i915#5608]: https://gitlab.freedesktop.org/drm/intel/issues/5608
[i915#5634]: https://gitlab.freedesktop.org/drm/intel/issues/5634
Build changes
-------------
* IGT: IGT_6420 -> IGTPW_6925
* Linux: CI_DRM_11497 -> Patchwork_102665v1
CI-20190529: 20190529
CI_DRM_11497: d883cffbf2383a96420fd6dc099056295de24a12 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_6925: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6925/index.html
IGT_6420: a3885810ccc0ce9e6552a20c910a0a322eca466c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_102665v1: d883cffbf2383a96420fd6dc099056295de24a12 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
85d086992e51 drm/i915/gt: Expose default value for media_freq_factor in per-gt sysfs 4aad4d8aade9 drm/i915/gt: Expose per-gt RPS defaults in sysfs 0a723c48025b drm/i915/gt: Fix memory leaks in per-gt sysfs 9d40e200987c drm/i915/gt: Add media RP0/RPn to per-gt sysfs c5e77f5565e8 drm/i915/pcode: Add a couple of pcode helpers c1ad1e711ccc drm/i915/pcode: Extend pcode functions for multiple gt's 8128df583bf6 drm/i915/gt: Add media freq factor to per-gt sysfs 370772e8709c drm/i915: Introduce has_media_ratio_mode
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/index.html
Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Media freq factor and per-gt enhancements/fixes
Quoted 9 lines · Patchwork
Possible regressions
* igt@gem_lmem_swapping@parallel-random-engines:
* bat-dg1-5: NOTRUN -> FAIL
* bat-dg1-6: NOTRUN -> FAIL
These failures are unrelated. They are showing up everywhere and causing all recent pre-merge CI results to show false positives. Please take a look. Thanks.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Media freq factor and per-gt enhancements/fixes
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: drm/i915: Media freq factor and per-gt enhancements/fixes
URL : https://patchwork.freedesktop.org/series/102665/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11497 -> Patchwork_102665v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/index.html
Participating hosts (39 -> 46)
------------------------------
Additional (9): bat-dg1-6 bat-dg1-5 bat-dg2-8 bat-dg2-9 bat-adlp-6 bat-adlp-4 bat-rpls-1 bat-rpls-2 bat-jsl-1
Missing (2): fi-bsw-cyan fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_102665v1:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_pm_rpm@module-reload:
- {bat-dg2-9}: NOTRUN -> [SKIP][1] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg2-9/igt@[email protected]
* igt@i915_selftest@live@gem:
- {bat-dg2-9}: NOTRUN -> [FAIL][2] +35 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg2-9/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_102665v1 that come from known issues:
### CI changes ###
#### Possible fixes ####
* boot:
- fi-ilk-650: [FAIL][3] -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/fi-ilk-650/boot.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-ilk-650/boot.html
### IGT changes ###
#### Issues hit ####
* igt@fbdev@write:
- bat-dg1-5: NOTRUN -> [SKIP][5] ([i915#2582]) +4 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-ilk-650: NOTRUN -> [SKIP][6] ([fdo#109271]) +21 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-ilk-650/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- bat-dg1-5: NOTRUN -> [FAIL][7] ([i915#5701])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- bat-dg1-6: NOTRUN -> [FAIL][8] ([i915#5701])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@gem_mmap@basic:
- bat-dg1-6: NOTRUN -> [SKIP][9] ([i915#4083])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][10] ([i915#4083])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@gem_tiled_blits@basic:
- bat-dg1-6: NOTRUN -> [SKIP][11] ([i915#4077]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@gem_tiled_fence_blits@basic:
- bat-dg1-5: NOTRUN -> [SKIP][12] ([i915#4077]) +2 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@gem_tiled_pread_basic:
- bat-dg1-5: NOTRUN -> [SKIP][13] ([i915#4079]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@gem_tiled_pread_basic.html
- bat-dg1-6: NOTRUN -> [SKIP][14] ([i915#4079]) +1 similar issue
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- bat-dg1-5: NOTRUN -> [SKIP][15] ([i915#1155])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- bat-dg1-6: NOTRUN -> [SKIP][16] ([i915#1155])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@kms_addfb_basic@addfb25-x-tiled-legacy:
- bat-dg1-6: NOTRUN -> [SKIP][17] ([i915#4212]) +7 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg1-5: NOTRUN -> [SKIP][18] ([i915#4215])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- bat-dg1-6: NOTRUN -> [SKIP][19] ([i915#4215])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@kms_addfb_basic@tile-pitch-mismatch:
- bat-dg1-5: NOTRUN -> [SKIP][20] ([i915#4212]) +7 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_busy@basic:
- bat-dg1-5: NOTRUN -> [SKIP][21] ([i915#4303])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_chamelium@dp-hpd-fast:
- fi-ilk-650: NOTRUN -> [SKIP][22] ([fdo#109271] / [fdo#111827]) +8 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-ilk-650/igt@[email protected]
* igt@kms_chamelium@hdmi-edid-read:
- bat-dg1-6: NOTRUN -> [SKIP][23] ([fdo#111827]) +8 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- bat-dg1-5: NOTRUN -> [SKIP][24] ([fdo#111827]) +8 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- bat-dg1-6: NOTRUN -> [SKIP][25] ([i915#4103] / [i915#4213]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-dg1-5: NOTRUN -> [SKIP][26] ([i915#4103] / [i915#4213]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_flip@basic-flip-vs-dpms:
- bat-dg1-5: NOTRUN -> [SKIP][27] ([i915#4078]) +23 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- bat-dg1-6: NOTRUN -> [SKIP][28] ([fdo#109285])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][29] ([fdo#109285])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
- bat-dg1-5: NOTRUN -> [SKIP][30] ([i915#4078] / [i915#5341])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- fi-ilk-650: NOTRUN -> [SKIP][31] ([fdo#109271] / [i915#5341])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-ilk-650/igt@[email protected]
* igt@kms_psr@primary_page_flip:
- bat-dg1-5: NOTRUN -> [SKIP][32] ([i915#1072] / [i915#4078]) +3 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@kms_psr@primary_page_flip.html
* igt@kms_psr@sprite_plane_onoff:
- bat-dg1-6: NOTRUN -> [SKIP][33] ([i915#1072] / [i915#4078]) +3 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-dg1-6: NOTRUN -> [SKIP][34] ([i915#3555])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][35] ([i915#3555])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@prime_vgem@basic-fence-mmap:
- bat-dg1-5: NOTRUN -> [SKIP][36] ([i915#3708] / [i915#4077]) +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@prime_vgem@basic-gtt:
- bat-dg1-6: NOTRUN -> [SKIP][37] ([i915#3708] / [i915#4077]) +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- bat-dg1-6: NOTRUN -> [SKIP][38] ([i915#3708] / [i915#4873])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
- bat-dg1-5: NOTRUN -> [SKIP][39] ([i915#3708] / [i915#4873])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
* igt@prime_vgem@basic-write:
- bat-dg1-5: NOTRUN -> [SKIP][40] ([i915#3708]) +3 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- bat-dg1-6: NOTRUN -> [SKIP][41] ([i915#3708]) +3 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@runner@aborted:
- bat-dg1-5: NOTRUN -> [FAIL][42] ([i915#4312])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [FAIL][43] ([i915#4312])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-bdw-5557u/igt@[email protected]
- bat-adlp-4: NOTRUN -> [FAIL][44] ([i915#5457])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-adlp-4/igt@[email protected]
- bat-dg1-6: NOTRUN -> [FAIL][45] ([i915#4312])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-skl-guc: [DMESG-FAIL][46] -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/fi-skl-guc/igt@i915_selftest@live@gt_heartbeat.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-skl-guc/igt@i915_selftest@live@gt_heartbeat.html
{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#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[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#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#3003]: https://gitlab.freedesktop.org/drm/intel/issues/3003
[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#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3576]: https://gitlab.freedesktop.org/drm/intel/issues/3576
[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#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#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
[i915#5171]: https://gitlab.freedesktop.org/drm/intel/issues/5171
[i915#5174]: https://gitlab.freedesktop.org/drm/intel/issues/5174
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5193]: https://gitlab.freedesktop.org/drm/intel/issues/5193
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
[i915#5275]: https://gitlab.freedesktop.org/drm/intel/issues/5275
[i915#5329]: https://gitlab.freedesktop.org/drm/intel/issues/5329
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5341]: https://gitlab.freedesktop.org/drm/intel/issues/5341
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5457]: https://gitlab.freedesktop.org/drm/intel/issues/5457
[i915#5606]: https://gitlab.freedesktop.org/drm/intel/issues/5606
[i915#5608]: https://gitlab.freedesktop.org/drm/intel/issues/5608
[i915#5634]: https://gitlab.freedesktop.org/drm/intel/issues/5634
[i915#5701]: https://gitlab.freedesktop.org/drm/intel/issues/5701
Build changes
-------------
* IGT: IGT_6420 -> IGTPW_6925
* Linux: CI_DRM_11497 -> Patchwork_102665v1
CI-20190529: 20190529
CI_DRM_11497: d883cffbf2383a96420fd6dc099056295de24a12 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_6925: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6925/index.html
IGT_6420: a3885810ccc0ce9e6552a20c910a0a322eca466c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_102665v1: d883cffbf2383a96420fd6dc099056295de24a12 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
85d086992e51 drm/i915/gt: Expose default value for media_freq_factor in per-gt sysfs 4aad4d8aade9 drm/i915/gt: Expose per-gt RPS defaults in sysfs 0a723c48025b drm/i915/gt: Fix memory leaks in per-gt sysfs 9d40e200987c drm/i915/gt: Add media RP0/RPn to per-gt sysfs c5e77f5565e8 drm/i915/pcode: Add a couple of pcode helpers c1ad1e711ccc drm/i915/pcode: Extend pcode functions for multiple gt's 8128df583bf6 drm/i915/gt: Add media freq factor to per-gt sysfs 370772e8709c drm/i915: Introduce has_media_ratio_mode
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/index.html
Re: [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Media freq factor and per-gt enhancements/fixes
In reply to Dixit, AshutoshIssue is related to https://gitlab.freedesktop.org/drm/intel/-/issues/5701
Re-reported.
Lakshmi.
-----Original Message-----
From: Dixit, Ashutosh <[email protected]>
Sent: Wednesday, April 13, 2022 10:57 PM
To: [email protected]; Vudum, Lakshminarayana <[email protected]>
Subject: Re: ✗ Fi.CI.BAT: failure for drm/i915: Media freq factor and per-gt enhancements/fixes
Quoted 9 lines · Patchwork
Possible regressions
* igt@gem_lmem_swapping@parallel-random-engines:
* bat-dg1-5: NOTRUN -> FAIL
* bat-dg1-6: NOTRUN -> FAIL
These failures are unrelated. They are showing up everywhere and causing all recent pre-merge CI results to show false positives. Please take a look. Thanks.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: Media freq factor and per-gt enhancements/fixes
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: drm/i915: Media freq factor and per-gt enhancements/fixes
URL : https://patchwork.freedesktop.org/series/102665/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11497_full -> Patchwork_102665v1_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_102665v1_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_102665v1_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_102665v1_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_busy@close-race:
- shard-snb: [PASS][1] -> [TIMEOUT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/shard-snb5/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-snb2/igt@[email protected]
* {igt@i915_pm_disag_freq@media-freq@gt0} (NEW):
- shard-tglb: NOTRUN -> [SKIP][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb5/igt@i915_pm_disag_freq@[email protected]
- shard-iclb: NOTRUN -> [SKIP][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb5/igt@i915_pm_disag_freq@[email protected]
* igt@kms_chamelium@dp-mode-timings:
- shard-kbl: NOTRUN -> [INCOMPLETE][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl7/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_11497_full and Patchwork_102665v1_full:
### New IGT tests (1) ###
* igt@i915_pm_disag_freq@media-freq@gt0:
- Statuses : 7 skip(s)
- Exec time: [0.0, 0.00] s
Known issues
------------
Here are the changes found in Patchwork_102665v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@drm_mm@all@insert_range:
- shard-skl: [PASS][6] -> [INCOMPLETE][7] ([i915#4547] / [i915#5311])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/shard-skl6/igt@drm_mm@all@insert_range.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-skl3/igt@drm_mm@all@insert_range.html
* igt@feature_discovery@display-4x:
- shard-tglb: NOTRUN -> [SKIP][8] ([i915#1839])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb1/igt@[email protected]
* igt@gem_ccs@ctrl-surf-copy-new-ctx:
- shard-iclb: NOTRUN -> [SKIP][9] ([i915#5327])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb8/igt@[email protected]
* igt@gem_ccs@suspend-resume:
- shard-tglb: NOTRUN -> [SKIP][10] ([i915#5325]) +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb8/igt@[email protected]
* igt@gem_ctx_persistence@engines-queued:
- shard-snb: NOTRUN -> [SKIP][11] ([fdo#109271] / [i915#1099])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-snb6/igt@[email protected]
* igt@gem_exec_balancer@parallel-keep-submit-fence:
- shard-kbl: NOTRUN -> [DMESG-WARN][12] ([i915#5076] / [i915#5614])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl4/igt@[email protected]
* igt@gem_exec_fair@basic-deadline:
- shard-kbl: [PASS][13] -> [FAIL][14] ([i915#2846])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/shard-kbl4/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl1/igt@[email protected]
- shard-apl: NOTRUN -> [FAIL][15] ([i915#2846])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-apl8/igt@[email protected]
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: NOTRUN -> [FAIL][16] ([i915#2842]) +5 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb8/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-glk: NOTRUN -> [FAIL][17] ([i915#2842])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-glk9/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none@vcs0:
- shard-apl: [PASS][18] -> [FAIL][19] ([i915#2842])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/shard-apl3/igt@gem_exec_fair@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-apl2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-iclb: NOTRUN -> [FAIL][20] ([i915#2842]) +3 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb3/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-kbl: NOTRUN -> [FAIL][21] ([i915#2842])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_flush@basic-wb-pro-default:
- shard-snb: [PASS][22] -> [SKIP][23] ([fdo#109271])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/shard-snb7/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-snb6/igt@[email protected]
* igt@gem_exec_params@no-blt:
- shard-tglb: NOTRUN -> [SKIP][24] ([fdo#109283])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb5/igt@[email protected]
* igt@gem_lmem_swapping@basic:
- shard-iclb: NOTRUN -> [SKIP][25] ([i915#4613]) +2 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb8/igt@[email protected]
- shard-skl: NOTRUN -> [SKIP][26] ([fdo#109271] / [i915#4613]) +2 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-skl2/igt@[email protected]
* igt@gem_lmem_swapping@random:
- shard-apl: NOTRUN -> [SKIP][27] ([fdo#109271] / [i915#4613]) +2 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-apl4/igt@[email protected]
- shard-kbl: NOTRUN -> [SKIP][28] ([fdo#109271] / [i915#4613]) +3 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl4/igt@[email protected]
- shard-glk: NOTRUN -> [SKIP][29] ([fdo#109271] / [i915#4613])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-glk8/igt@[email protected]
* igt@gem_lmem_swapping@random-engines:
- shard-tglb: NOTRUN -> [SKIP][30] ([i915#4613]) +2 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb5/igt@[email protected]
* igt@gem_pread@exhaustion:
- shard-tglb: NOTRUN -> [WARN][31] ([i915#2658])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb3/igt@[email protected]
- shard-kbl: NOTRUN -> [WARN][32] ([i915#2658])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl4/igt@[email protected]
* igt@gem_pxp@protected-raw-src-copy-not-readible:
- shard-tglb: NOTRUN -> [SKIP][33] ([i915#4270]) +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb5/igt@[email protected]
* igt@gem_pxp@reject-modify-context-protection-off-1:
- shard-iclb: NOTRUN -> [SKIP][34] ([i915#4270]) +1 similar issue
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb8/igt@[email protected]
* igt@gem_render_copy@y-tiled-to-vebox-y-tiled:
- shard-iclb: NOTRUN -> [SKIP][35] ([i915#768]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb3/igt@[email protected]
* igt@gem_userptr_blits@dmabuf-sync:
- shard-kbl: NOTRUN -> [SKIP][36] ([fdo#109271] / [i915#3323])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl3/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][37] ([i915#3323])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb3/igt@[email protected]
- shard-apl: NOTRUN -> [SKIP][38] ([fdo#109271] / [i915#3323])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-apl1/igt@[email protected]
- shard-skl: NOTRUN -> [SKIP][39] ([fdo#109271] / [i915#3323])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-skl2/igt@[email protected]
- shard-glk: NOTRUN -> [SKIP][40] ([fdo#109271] / [i915#3323])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-glk9/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][41] ([i915#3323])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb2/igt@[email protected]
* igt@gem_userptr_blits@input-checking:
- shard-tglb: NOTRUN -> [DMESG-WARN][42] ([i915#4991])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb3/igt@[email protected]
- shard-kbl: NOTRUN -> [DMESG-WARN][43] ([i915#4991])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl7/igt@[email protected]
* igt@gem_userptr_blits@readonly-pwrite-unsync:
- shard-tglb: NOTRUN -> [SKIP][44] ([i915#3297]) +1 similar issue
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb3/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][45] ([i915#3297])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb6/igt@[email protected]
* igt@gen3_render_mixed_blits:
- shard-tglb: NOTRUN -> [SKIP][46] ([fdo#109289]) +1 similar issue
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb3/igt@gen3_render_mixed_blits.html
- shard-iclb: NOTRUN -> [SKIP][47] ([fdo#109289]) +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb1/igt@gen3_render_mixed_blits.html
* igt@gen9_exec_parse@batch-zero-length:
- shard-iclb: NOTRUN -> [SKIP][48] ([i915#2856]) +2 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb2/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][49] ([i915#2527] / [i915#2856]) +2 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb1/igt@[email protected]
* igt@i915_pm_backlight@bad-brightness:
- shard-glk: NOTRUN -> [SKIP][50] ([fdo#109271]) +82 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-glk4/igt@[email protected]
* igt@i915_pm_lpsp@screens-disabled:
- shard-tglb: NOTRUN -> [SKIP][51] ([i915#1902])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb1/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][52] ([i915#1902])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb2/igt@[email protected]
* igt@i915_pm_rpm@modeset-non-lpsp-stress:
- shard-iclb: NOTRUN -> [SKIP][53] ([fdo#110892])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb6/igt@[email protected]
* igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait:
- shard-tglb: NOTRUN -> [SKIP][54] ([fdo#111644] / [i915#1397] / [i915#2411])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb6/igt@[email protected]
* igt@i915_pm_rpm@modeset-pc8-residency-stress:
- shard-tglb: NOTRUN -> [SKIP][55] ([fdo#109506] / [i915#2411])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb2/igt@[email protected]
* igt@i915_selftest@live@gt_lrc:
- shard-tglb: NOTRUN -> [DMESG-FAIL][56] ([i915#2373])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb5/igt@i915_selftest@live@gt_lrc.html
* igt@i915_selftest@live@gt_pm:
- shard-tglb: NOTRUN -> [DMESG-FAIL][57] ([i915#1759])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb5/igt@i915_selftest@live@gt_pm.html
- shard-skl: NOTRUN -> [DMESG-FAIL][58] ([i915#1886])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-skl9/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@hangcheck:
- shard-snb: NOTRUN -> [INCOMPLETE][59] ([i915#3921])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-snb5/igt@i915_selftest@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-skl: NOTRUN -> [INCOMPLETE][60] ([i915#4939])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-skl4/igt@[email protected]
* igt@i915_suspend@fence-restore-untiled:
- shard-kbl: [PASS][61] -> [INCOMPLETE][62] ([i915#3614])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/shard-kbl7/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl4/igt@[email protected]
* igt@kms_async_flips@crc:
- shard-skl: NOTRUN -> [FAIL][63] ([i915#4272])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-skl8/igt@[email protected]
* igt@kms_atomic_transition@plane-all-modeset-transition:
- shard-iclb: NOTRUN -> [SKIP][64] ([i915#1769])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb5/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][65] ([i915#1769])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb8/igt@[email protected]
* igt@kms_big_fb@4-tiled-32bpp-rotate-270:
- shard-iclb: NOTRUN -> [SKIP][66] ([i915#5286]) +1 similar issue
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb1/igt@[email protected]
* igt@kms_big_fb@4-tiled-max-hw-stride-32bpp-rotate-0:
- shard-tglb: NOTRUN -> [SKIP][67] ([i915#5286]) +3 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb3/igt@[email protected]
* igt@kms_big_fb@linear-32bpp-rotate-180:
- shard-glk: [PASS][68] -> [DMESG-WARN][69] ([i915#118])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/shard-glk7/igt@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-glk9/igt@[email protected]
* igt@kms_big_fb@x-tiled-32bpp-rotate-270:
- shard-iclb: NOTRUN -> [SKIP][70] ([fdo#110725] / [fdo#111614]) +1 similar issue
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb3/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][71] ([fdo#111614])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb2/igt@[email protected]
* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip:
- shard-skl: NOTRUN -> [SKIP][72] ([fdo#109271] / [i915#3777]) +3 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-skl1/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-hflip-async-flip:
- shard-apl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#3777]) +3 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-apl6/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-hflip-async-flip.html
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip:
- shard-glk: NOTRUN -> [SKIP][74] ([fdo#109271] / [i915#3777]) +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-glk7/igt@[email protected]
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip:
- shard-kbl: NOTRUN -> [SKIP][75] ([fdo#109271] / [i915#3777]) +2 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl6/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html
* igt@kms_big_fb@yf-tiled-8bpp-rotate-180:
- shard-tglb: NOTRUN -> [SKIP][76] ([fdo#111615]) +8 similar issues
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb1/igt@[email protected]
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-async-flip:
- shard-skl: NOTRUN -> [FAIL][77] ([i915#3743]) +1 similar issue
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-skl4/igt@[email protected]
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0:
- shard-apl: NOTRUN -> [SKIP][78] ([fdo#109271]) +192 similar issues
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-apl7/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][79] ([fdo#110723]) +3 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb3/igt@[email protected]
* igt@kms_big_joiner@basic:
- shard-tglb: NOTRUN -> [SKIP][80] ([i915#2705])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb8/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][81] ([i915#2705])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb4/igt@[email protected]
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc:
- shard-kbl: NOTRUN -> [SKIP][82] ([fdo#109271] / [i915#3886]) +12 similar issues
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl6/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc.html
- shard-apl: NOTRUN -> [SKIP][83] ([fdo#109271] / [i915#3886]) +9 similar issues
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-apl6/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-yf_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][84] ([fdo#111615] / [i915#3689]) +2 similar issues
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb5/igt@kms_ccs@pipe-a-crc-primary-rotation-180-yf_tiled_ccs.html
* igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs:
- shard-iclb: NOTRUN -> [SKIP][85] ([fdo#109278] / [i915#3886]) +6 similar issues
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb1/igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs:
- shard-skl: NOTRUN -> [SKIP][86] ([fdo#109271] / [i915#3886]) +9 similar issues
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-skl2/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][87] ([fdo#109271] / [i915#3886]) +5 similar issues
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-glk7/igt@kms_ccs@pipe-b-missing-ccs-buffer-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][88] ([i915#3689] / [i915#3886]) +3 similar issues
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb6/igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-d-crc-primary-basic-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][89] ([i915#3689]) +3 similar issues
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb1/igt@kms_ccs@pipe-d-crc-primary-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_chamelium@dp-hpd-storm:
- shard-iclb: NOTRUN -> [SKIP][90] ([fdo#109284] / [fdo#111827]) +8 similar issues
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb8/igt@[email protected]
* igt@kms_chamelium@hdmi-aspect-ratio:
- shard-glk: NOTRUN -> [SKIP][91] ([fdo#109271] / [fdo#111827]) +5 similar issues
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-glk6/igt@[email protected]
- shard-skl: NOTRUN -> [SKIP][92] ([fdo#109271] / [fdo#111827]) +18 similar issues
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-skl8/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- shard-snb: NOTRUN -> [SKIP][93] ([fdo#109271] / [fdo#111827]) +4 similar issues
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-snb4/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-for-each-pipe:
- shard-kbl: NOTRUN -> [SKIP][94] ([fdo#109271] / [fdo#111827]) +12 similar issues
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl1/igt@[email protected]
* igt@kms_color@pipe-d-ctm-0-25:
- shard-iclb: NOTRUN -> [SKIP][95] ([fdo#109278] / [i915#1149])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb1/igt@[email protected]
* igt@kms_color_chamelium@pipe-a-ctm-limited-range:
- shard-apl: NOTRUN -> [SKIP][96] ([fdo#109271] / [fdo#111827]) +12 similar issues
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-apl6/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-ctm-0-75:
- shard-tglb: NOTRUN -> [SKIP][97] ([fdo#109284] / [fdo#111827]) +14 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb6/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-ctm-0-5:
- shard-iclb: NOTRUN -> [SKIP][98] ([fdo#109278] / [fdo#109284] / [fdo#111827])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb7/igt@[email protected]
* igt@kms_content_protection@dp-mst-type-1:
- shard-tglb: NOTRUN -> [SKIP][99] ([i915#3116] / [i915#3299])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb2/igt@[email protected]
* igt@kms_content_protection@lic:
- shard-iclb: NOTRUN -> [SKIP][100] ([fdo#109300] / [fdo#111066])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb5/igt@[email protected]
- shard-kbl: NOTRUN -> [TIMEOUT][101] ([i915#1319])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl6/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-512x170-offscreen:
- shard-iclb: NOTRUN -> [SKIP][102] ([fdo#109278] / [fdo#109279])
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb1/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-32x32-sliding:
- shard-tglb: NOTRUN -> [SKIP][103] ([i915#3319]) +5 similar issues
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb8/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-max-size-rapid-movement:
- shard-tglb: NOTRUN -> [SKIP][104] ([i915#3359]) +5 similar issues
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb7/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-512x170-offscreen:
- shard-tglb: NOTRUN -> [SKIP][105] ([fdo#109279] / [i915#3359]) +6 similar issues
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb1/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-512x170-sliding:
- shard-apl: NOTRUN -> [SKIP][106] ([fdo#109271] / [i915#5691])
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-apl4/igt@[email protected]
- shard-glk: NOTRUN -> [SKIP][107] ([fdo#109271] / [i915#5691])
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-glk7/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][108] ([fdo#109279] / [i915#3359] / [i915#5691])
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb3/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-iclb: NOTRUN -> [SKIP][109] ([fdo#109274] / [fdo#109278]) +3 similar issues
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb6/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- shard-tglb: NOTRUN -> [SKIP][110] ([i915#4103]) +1 similar issue
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb7/igt@[email protected]
* igt@kms_cursor_legacy@cursora-vs-flipb-atomic:
- shard-tglb: NOTRUN -> [SKIP][111] ([fdo#109274] / [fdo#111825]) +12 similar issues
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb5/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-glk: [PASS][112] -> [FAIL][113] ([i915#2346] / [i915#533])
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/shard-glk1/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-glk6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@pipe-d-single-move:
- shard-iclb: NOTRUN -> [SKIP][114] ([fdo#109278]) +26 similar issues
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb5/igt@[email protected]
* igt@kms_display_modes@extended-mode-basic:
- shard-tglb: NOTRUN -> [SKIP][115] ([fdo#109274])
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb6/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb8888-pwrite-4tiled:
- shard-iclb: NOTRUN -> [SKIP][116] ([i915#5287]) +1 similar issue
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb5/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][117] ([i915#5287]) +1 similar issue
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb2/igt@[email protected]
* igt@kms_flip@2x-absolute-wf_vblank:
- shard-iclb: NOTRUN -> [SKIP][118] ([fdo#109274])
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-iclb2/igt@kms_flip@2x-absolute-wf_vblank.html
- shard-tglb: NOTRUN -> [SKIP][119] ([fdo#109274] / [fdo#111825] / [i915#3966])
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-tglb6/igt@kms_flip@2x-absolute-wf_vblank.html
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [PASS][120] -> [DMESG-WARN][121] ([i915#180]) +6 similar issues
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/shard-kbl6/igt@kms_flip@[email protected]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-kbl7/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@a-edp1:
- shard-skl: NOTRUN -> [INCOMPLETE][122] ([i915#1982] / [i915#4839])
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-skl10/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-apl: [PASS][123] -> [DMESG-WARN][124] ([i915#180]) +1 similar issue
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11497/shard-apl4/igt@kms_flip@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/shard-apl7/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling:
- shard-iclb: [PASS][125] -> [SKIP][126]
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/index.html
Jani Nikula
maintainerRe: [Intel-gfx] [PATCH 3/8] drm/i915/pcode: Extend pcode functions for multiple gt's
In reply to Ashutosh DixitQuoted 3 lines · Ashutosh Dixit
Each gt contains an independent instance of pcode. Extend pcode functions to interface with pcode on different gt's. Previous (GT0) pcode read/write interfaces are preserved.
The big problem here is that this hard couples display code to gt code, while we're trying hard to go the opposite direction. It doesn't matter that the existing interfaces are preserved as wrappers when it relies on an intel_gt being available (via i915->gt0).
Note how 'git grep intel_gt -- drivers/gpu/drm/i915/display/' matches only 1 line.
BR,
Jani.
Quoted 251 lines
Cc Rodrigo Vivi <[email protected]>Cc Mike Ruhl <[email protected]>Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/intel_pcode.c | 108 ++++++++++++++++------------- drivers/gpu/drm/i915/intel_pcode.h | 27 ++++++-- 2 files changed, 82 insertions(+), 53 deletions(-)drivers/gpu/drm/i915/intel_pcode.c +61
-47@@ -6,6 +6,7 @@#include "i915_drv.h" #include "i915_reg.h" #include "intel_pcode.h" +#include "gt/intel_gt.h" static int gen6_check_mailbox_status (u32 mbox) {@@ -52,14 +53,14 @@ static int gen7_check_mailbox_status(u32 mbox) } } -static int __snb_pcode_rw (struct drm_i915_private *i915,u32 mbox, -u32 *val,u32 *val1, -int fast_timeout_us,int slow_timeout_ms, -bool is_read) +static int __gt_pcode_rw (struct intel_gt *gt,u32 mbox, +u32 *val,u32 *val1, +int fast_timeout_us,int slow_timeout_ms, +bool is_read) { -struct intel_uncore *uncore = &i915->uncore; +struct intel_uncore *uncore = gt->uncore; -lockdep_assert_held (&i915->sb_lock); +lockdep_assert_held (>->i915->sb_lock);/* * GEN6_PCODE_* are outside of the forcewake domain, we can use @@ -88,60 +89,60 @@ static int __snb_pcode_rw(struct drm_i915_private *i915, u32 mbox,if (is_read && val1) *val1 =intel_uncore_read_fw (uncore,GEN6_PCODE_DATA1 ); -if (GRAPHICS_VER (i915) >6 ) +if (GRAPHICS_VER (gt->i915) >6 )return gen7_check_mailbox_status (mbox);else return gen6_check_mailbox_status (mbox); } -int snb_pcode_read (struct drm_i915_private *i915,u32 mbox,u32 *val,u32 *val1) +int intel_gt_pcode_read (struct intel_gt *gt,u32 mbox,u32 *val,u32 *val1) {int err; -mutex_lock (&i915->sb_lock); - err =__snb_pcode_rw (i915, mbox, val, val1,500 ,20 , true); -mutex_unlock (&i915->sb_lock); +mutex_lock (>->i915->sb_lock); + err =__gt_pcode_rw (gt, mbox, val, val1,500 ,20 , true); +mutex_unlock (>->i915->sb_lock);if (err) { -drm_dbg (&i915->drm, -"warning: pcode (read from mbox %x) mailbox access failed for %ps: %d\n" , - mbox,__builtin_return_address (0 ), err); +drm_dbg (>->i915->drm, +"gt %d: warning: pcode (read from mbox %x) mailbox access failed for %ps: %d\n" , + gt->info.id, mbox,__builtin_return_address (0 ), err); }return err; } -int snb_pcode_write_timeout (struct drm_i915_private *i915,u32 mbox,u32 val, -int fast_timeout_us,int slow_timeout_ms) +int intel_gt_pcode_write_timeout (struct intel_gt *gt,u32 mbox,u32 val, +int fast_timeout_us,int slow_timeout_ms) {int err; -mutex_lock (&i915->sb_lock); - err =__snb_pcode_rw (i915, mbox, &val,NULL , - fast_timeout_us, slow_timeout_ms, false); -mutex_unlock (&i915->sb_lock); +mutex_lock (>->i915->sb_lock); + err =__gt_pcode_rw (gt, mbox, &val,NULL , + fast_timeout_us, slow_timeout_ms, false); +mutex_unlock (>->i915->sb_lock);if (err) { -drm_dbg (&i915->drm, -"warning: pcode (write of 0x%08x to mbox %x) mailbox access failed for %ps: %d\n" , - val, mbox,__builtin_return_address (0 ), err); +drm_dbg (>->i915->drm, +"gt %d: warning: pcode (write of 0x%08x to mbox %x) mailbox access failed for %ps: %d\n" , + gt->info.id, val, mbox,__builtin_return_address (0 ), err); }return err; } -static bool skl_pcode_try_request (struct drm_i915_private *i915,u32 mbox, -u32 request,u32 reply_mask,u32 reply, -u32 *status) +static bool __gt_pcode_try_request (struct intel_gt *gt,u32 mbox, +u32 request,u32 reply_mask,u32 reply, +u32 *status) { - *status =__snb_pcode_rw (i915, mbox, &request,NULL ,500 ,0 , true); + *status =__gt_pcode_rw (gt, mbox, &request,NULL ,500 ,0 , true);return (*status ==0 ) && ((request & reply_mask) == reply); }/** -* skl_pcode_request - send PCODE request until acknowledgment -* @i915: device private +* intel_gt_pcode_request - send PCODE request until acknowledgment +* @gt: gt * @mbox: PCODE mailbox ID the request is targeted for * @request: request ID * @reply_mask: mask used to check for request acknowledgment @@ -158,16 +159,16 @@ static bool skl_pcode_try_request(struct drm_i915_private *i915, u32 mbox,* Returns 0 on success, %-ETIMEDOUT in case of a timeout, <0 in case of some * other error as reported by PCODE. */ -int skl_pcode_request (struct drm_i915_private *i915,u32 mbox,u32 request, -u32 reply_mask,u32 reply,int timeout_base_ms) +int intel_gt_pcode_request (struct intel_gt *gt,u32 mbox,u32 request, +u32 reply_mask,u32 reply,int timeout_base_ms) {u32 status;int ret; -mutex_lock (&i915->sb_lock); +mutex_lock (>->i915->sb_lock);#define COND \ - skl_pcode_try_request(i915, mbox, request, reply_mask, reply, &status) + __gt_pcode_try_request(gt, mbox, request, reply_mask, reply, &status)/* * Prime the PCODE by doing a request first. Normally it guarantees @@ -193,35 +194,48 @@ int skl_pcode_request(struct drm_i915_private *i915, u32 mbox, u32 request,* requests, and for any quirks of the PCODE firmware that delays * the request completion. */ -drm_dbg_kms (&i915->drm, +drm_dbg_kms (>->i915->drm,"PCODE timeout, retrying with preemption disabled\n" ); -drm_WARN_ON_ONCE (&i915->drm, timeout_base_ms >3 ); +drm_WARN_ON_ONCE (>->i915->drm, timeout_base_ms >3 );preempt_disable (); ret =wait_for_atomic (COND ,50 );preempt_enable (); out: -mutex_unlock (&i915->sb_lock); +mutex_unlock (>->i915->sb_lock);return status ? status : ret;#undef COND } +static int __gt_pcode_init (struct intel_gt *gt) +{ +int ret =intel_gt_pcode_request (gt,DG1_PCODE_STATUS , +DG1_UNCORE_GET_INIT_STATUS , +DG1_UNCORE_INIT_STATUS_COMPLETE , +DG1_UNCORE_INIT_STATUS_COMPLETE ,180000 ); + +drm_dbg (>->i915->drm,"gt %d: PCODE init status %d\n" , gt->info.id, ret); + +if (ret) +drm_err (>->i915->drm,"gt %d: Pcode did not report uncore initialization completion!\n" , + gt->info.id); + +return ret; +} +int intel_pcode_init (struct drm_i915_private *i915) { -int ret =0 ; +struct intel_gt *gt; +int i, ret =0 ;if (!IS_DGFX (i915))return ret; - ret =skl_pcode_request (i915,DG1_PCODE_STATUS , -DG1_UNCORE_GET_INIT_STATUS , -DG1_UNCORE_INIT_STATUS_COMPLETE , -DG1_UNCORE_INIT_STATUS_COMPLETE ,180000 ); - -drm_dbg (&i915->drm,"PCODE init status %d\n" , ret); - -if (ret) -drm_err (&i915->drm,"Pcode did not report uncore initialization completion!\n" ); +for_each_gt (gt, i915, i) { + ret =__gt_pcode_init (gt); +if (ret) +return ret; + } -return ret; +return 0 ; }drivers/gpu/drm/i915/intel_pcode.h +21
-6@@ -8,16 +8,31 @@#include <linux/types.h> +struct intel_gt ;struct drm_i915_private ; -int snb_pcode_read (struct drm_i915_private *i915,u32 mbox,u32 *val,u32 *val1); -int snb_pcode_write_timeout (struct drm_i915_private *i915,u32 mbox,u32 val, -int fast_timeout_us,int slow_timeout_ms); -#define snb_pcode_write (i915, mbox, val) \ +int intel_gt_pcode_read (struct intel_gt *gt,u32 mbox,u32 *val,u32 *val1); + +int intel_gt_pcode_write_timeout (struct intel_gt *gt,u32 mbox,u32 val, +int fast_timeout_us,int slow_timeout_ms); + +#define intel_gt_pcode_write (gt, mbox, val) \ + intel_gt_pcode_write_timeout(gt, mbox, val, 500, 0) + +int intel_gt_pcode_request (struct intel_gt *gt,u32 mbox,u32 request, +u32 reply_mask,u32 reply,int timeout_base_ms); + +#define snb_pcode_read (i915, mbox, val, val1) \ + intel_gt_pcode_read(&(i915)->gt0, mbox, val, val1) + +#define snb_pcode_write_timeout (i915, mbox, val, fast_timeout_us, slow_timeout_ms) \ + intel_gt_pcode_write_timeout(&(i915)->gt0, mbox, val, fast_timeout_us, slow_timeout_ms) + +#define snb_pcode_write (i915, mbox, val) \ snb_pcode_write_timeout(i915, mbox, val, 500, 0) -int skl_pcode_request (struct drm_i915_private *i915,u32 mbox,u32 request, -u32 reply_mask,u32 reply,int timeout_base_ms); +#define skl_pcode_request (i915, mbox, request, reply_mask, reply, timeout_base_ms) \ + intel_gt_pcode_request(&(i915)->gt0, mbox, request, reply_mask, reply, timeout_base_ms)int intel_pcode_init (struct drm_i915_private *i915);
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 3/8] drm/i915/pcode: Extend pcode functions for multiple gt's
Quoted 6 lines · Jani Nikula
Quoted 3 lines · Ashutosh Dixit
Each gt contains an independent instance of pcode. Extend pcode functions to interface with pcode on different gt's. Previous (GT0) pcode read/write interfaces are preserved.
Quoted 7 lines
The big problem here is that this hard couples display code to gt code, while we're trying hard to go the opposite direction. It doesn't matter that the existing interfaces are preserved as wrappers when it relies on an
intel_gtbeing available (viai915->gt0).Note how 'git grep
intel_gt--drivers/gpu/drm/i915/display/' matches only 1 line.
Hi Jani, would you have suggestions about how to do this (handle pcode on multiple gt's)? The thinking was this patch would be a straightforward way to avoid code duplication. Also:
int intel_gt_probe_all() {
...
/*
* We always have at least one primary GT on any device
* and it has been already initialized early during probe
* in i915_driver_probe()
*/Thanks.
Rodrigo Vivi
maintainerRe: [Intel-gfx] [PATCH 3/8] drm/i915/pcode: Extend pcode functions for multiple gt's
Quoted 11 lines · Ashutosh
Quoted 10 lines · Jani Nikula
Quoted 3 lines · Ashutosh Dixit
Each gt contains an independent instance of pcode. Extend pcode functions to interface with pcode on different gt's. Previous (GT0) pcode read/write interfaces are preserved.
The big problem here is that this hard couples display code to gt code, while we're trying hard to go the opposite direction. It doesn't matter that the existing interfaces are preserved as wrappers when it relies on an
intel_gtbeing available (viai915->gt0).
I don't believe there is a big problem in here...
please note the intel_pcode.h is keeping the abstraction for display
#define snb_pcode_write_timeout(i915, mbox, val, fast_timeout_us, slow_timeout_ms) \
intel_gt_pcode_write_timeout(&(i915)->gt0, mbox, val, fast_timeout_us, slow_timeout_ms)#define snb_pcode_write(i915, mbox, val) \
snb_pcode_write_timeout(i915, mbox, val, 500, 0)display only uses these macros that Ashutosh didn't touch.
Quoted 3 lines
Quoted 3 lines
Note how 'git grep
intel_gt--drivers/gpu/drm/i915/display/' matches only 1 line.
As well with the patches applied:
$ git log --oneline -1 1f58f1195478 (HEAD -> drm-tip) drm/i915/gt: Expose per-gt RPS defaults in sysfs
$ git grep intel_gt -- drivers/gpu/drm/i915/display/ drivers/gpu/drm/i915/display/intel_display.c: intel_gt_set_wedged(to_gt(dev_priv));
Quoted 4 lines
Hi Jani, would you have suggestions about how to do this (handle pcode on multiple gt's)? The thinking was this patch would be a straightforward way to avoid code duplication. Also:
Maybe it is just a matter of renaming the macros used by display in intel_pcode.h to reflect that it should be used by display only?
Thanks,
Rodrigo.
Quoted 10 lines
int intel_gt_probe_all() { ... /* * We always have at least one primary GT on any device * and it has been already initialized early during probe * in i915_driver_probe() */Thanks.
Re: [Intel-gfx] [PATCH 1/8] drm/i915: Introduce has_media_ratio_mode
In reply to Ashutosh DixitQuoted 7 lines · Ashutosh Dixit
Media ratio mode (the ability for media IP to work at a different frequency from the GT) is available for a subset of dGfx platforms supporting GuC/SLPC. Introduce '
has_media_ratio_mode' flag inintel_device_infoto identify these platforms and set it for XEHPSDV and DG2/ATS-M.Cc Rodrigo Vivi <[email protected]>Signed-off-by Ashutosh Dixit <[email protected]>
Quoted 54 lines
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 2 ++ drivers/gpu/drm/i915/intel_device_info.h | 1 + 3 files changed, 5 insertions(+)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -1222,6 +1222,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define CCS_MASK (gt) \ ENGINE_INSTANCES_MASK(gt, CCS0, I915_MAX_CCS) +#define HAS_MEDIA_RATIO_MODE (dev_priv) (INTEL_INFO(dev_priv)->has_media_ratio_mode) +/* * The Gen7 cmdparser copies the scanned buffer to the ggtt for execution * All later gens can run the final buffer from the ppgtt drivers/gpu/drm/i915/i915_pci.c +2
-0@@ -1032,6 +1032,7 @@ static const struct intel_device_info xehpsdv_info = { .display = { }, .has_64k_pages = 1, .needs_compact_pt = 1, + .has_media_ratio_mode = 1, .platform_engine_mask =BIT (RCS0 ) |BIT (BCS0 ) | BIT(VECS0) | BIT(VECS1) | BIT(VECS2) | BIT(VECS3) |@@ -1051,6 +1052,7 @@ static const struct intel_device_info xehpsdv_info = { .has_64k_pages = 1, \ .has_guc_deprivilege = 1, \ .needs_compact_pt = 1, \ + .has_media_ratio_mode = 1, \ .platform_engine_mask = \BIT (RCS0 ) |BIT (BCS0 ) | \ BIT(VECS0) | BIT(VECS1) | \drivers/gpu/drm/i915/intel_device_info.h +1
-0@@ -146,6 +146,7 @@ enum intel_ppgtt_type {func (has_llc); \func (has_logical_ring_contexts); \func (has_logical_ring_elsq); \ +func (has_media_ratio_mode); \func (has_mslices); \func (has_pooled_eu); \func (has_pxp); \Signature · 1 line
2.34.1
Rodrigo Vivi
maintainerRe: [Intel-gfx] [PATCH 4/8] drm/i915/pcode: Add a couple of pcode helpers
In reply to Ashutosh DixitQuoted 6 lines · Ashutosh Dixit
Add a couple of helpers to help formatting pcode commands and improve code readability.
Cc: Mike Ruhl <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Original-author: Dale B Stimson <[email protected]>
The right thing to do here is to git commit --amend --author="Dale B Stimson <[email protected]>" probably also good to reset the date with --date...
Quoted 2 lines
Signed-off-by Dale B Stimson <[email protected]>Signed-off-by Ashutosh Dixit <[email protected]>
and keep your signed-off-by here as well...
and also feel free add my rv-b after the author is fixed
Thanks,
Rodrigo.
Quoted 84 lines
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pcode.c | 32 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_pcode.h | 12 +++++++++++ 3 files changed, 47 insertions(+)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -6684,6 +6684,9 @@#define GEN6_PCODE_MAILBOX _MMIO(0x138124)#define GEN6_PCODE_READY (1 << 31) +#define GEN6_PCODE_MB_PARAM2 REG_GENMASK(23, 16) +#define GEN6_PCODE_MB_PARAM1 REG_GENMASK(15, 8) +#define GEN6_PCODE_MB_COMMAND REG_GENMASK(7, 0)#define GEN6_PCODE_ERROR_MASK 0xFF#define GEN6_PCODE_SUCCESS 0x0#define GEN6_PCODE_ILLEGAL_CMD 0x1drivers/gpu/drm/i915/intel_pcode.c +32
-0@@ -239,3 +239,35 @@ int intel_pcode_init(struct drm_i915_private *i915)return 0 ; } + +int __intel_gt_pcode_read (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 *val) +{ +intel_wakeref_t wakeref; +u32 mbox; +int err; + + mbox =REG_FIELD_PREP (GEN6_PCODE_MB_COMMAND , mbcmd) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM1 , p1) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM2 , p2); + +with_intel_runtime_pm (gt->uncore->rpm, wakeref) + err = intel_gt_pcode_read(gt, mbox, val, NULL); + +return err; +} + +int __intel_gt_pcode_write (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 val) +{ +intel_wakeref_t wakeref; +u32 mbox; +int err; + + mbox =REG_FIELD_PREP (GEN6_PCODE_MB_COMMAND , mbcmd) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM1 , p1) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM2 , p2); + +with_intel_runtime_pm (gt->uncore->rpm, wakeref) + err = intel_gt_pcode_write(gt, mbox, val); + +return err; +}drivers/gpu/drm/i915/intel_pcode.h +12
-0@@ -36,4 +36,16 @@ int intel_gt_pcode_request(struct intel_gt *gt, u32 mbox, u32 request,int intel_pcode_init (struct drm_i915_private *i915); +/* +* Helpers for dGfx PCODE mailbox command formatting +*/ +int __intel_gt_pcode_read (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 *val); +int __intel_gt_pcode_write (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 val); + +#define __snb_pcode_read (i915, mbcmd, p1, p2, val) \ + __intel_gt_pcode_read(&(i915)->gt0, mbcmd, p1, p2, val) + +#define __snb_pcode_write (i915, mbcmd, p1, p2, val) \ + __intel_gt_pcode_write(&(i915)->gt0, mbcmd, p1, p2, val) +#endif /* _INTEL_PCODE_H */ Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 4/8] drm/i915/pcode: Add a couple of pcode helpers
Quoted 12 lines · Rodrigo Vivi
Quoted 6 lines · Ashutosh Dixit
Add a couple of helpers to help formatting pcode commands and improve code readability.
Cc: Mike Ruhl <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Original-author: Dale B Stimson <[email protected]>The right thing to do here is to git commit --amend --author="Dale B Stimson <[email protected]>" probably also good to reset the date with --date...
Quoted 6 lines
Quoted 2 lines
Signed-off-by Dale B Stimson <[email protected]>Signed-off-by Ashutosh Dixit <[email protected]>and keep your signed-off-by here as well...
and also feel free add my rv-b after the author is fixed
Thanks, will fix the author in v2, two patches have this issue.
v2 cover drm/i915: Media freq factor and per-gt enhancements/fixes
In reply to Ashutosh DixitSome recent Intel dGfx platforms allow media IP to work at a different frequency from the base GT. This patch series exposes sysfs controls for this functionality in the new per-gt sysfs. Some enhancements and fixes to previous per-gt functionality are also included to complete the new functionality:
* Patches 1 and 2 implement basic sysfs controls for media freq
* Patches 3 and 4 extend previous pcode functions for multiple gt's and patch 5 adds a couple of pcode helpers
* Patch 6 uses the new pcode functions to retrieve media RP0/RPn frequencies
* Patch 7 fixes memory leaks in the previous per-gt sysfs implementation and some code refactoring
* Patch 8 creates a gt/gtN/.defaults directory to expose default RPS parameter values in the per-gt sysfs
* Patch 9 adds the default value for media_freq_factor to gt/gtN/.defaults
IGT tests for this new functionality have also been posted at:
https://patchwork.freedesktop.org/series/102664/
Test-with: 85c51c99da76e3fe286ed28e80fa964e148f6020.1650430680.git.ashutosh.dixit@intel.com
v2: Fixed commit author on patches 5 and 6 (Rodrigo)
Added new patch 4
Ashutosh Dixit (7):
drm/i915: Introduce has_media_ratio_mode
drm/i915/gt: Add media freq factor to per-gt sysfs drm/i915/pcode: Extend pcode functions for multiple gt's drm/i915/gt: Convert callers to user per-gt pcode functions drm/i915/gt: Fix memory leaks in per-gt sysfs drm/i915/gt: Expose per-gt RPS defaults in sysfs drm/i915/gt: Expose default value for media_freq_factor in per-gt
sysfs
Dale B Stimson (2):
drm/i915/pcode: Add a couple of pcode helpers
drm/i915/gt: Add media RP0/RPn to per-gt sysfs
drivers/gpu/drm/i915/gt/intel_gt.c | 1 + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 6 +- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 41 ++- drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 12 +- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 246 ++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_gt_types.h | 14 + drivers/gpu/drm/i915/gt/intel_llc.c | 9 +- drivers/gpu/drm/i915/gt/intel_rc6.c | 4 +- drivers/gpu/drm/i915/gt/intel_rps.c | 9 +- drivers/gpu/drm/i915/gt/selftest_llc.c | 4 +- drivers/gpu/drm/i915/gt/selftest_rps.c | 4 +- .../drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 6 + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 39 ++- drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 + .../gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 3 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_pci.c | 2 + drivers/gpu/drm/i915/i915_reg.h | 18 ++ drivers/gpu/drm/i915/i915_sysfs.c | 2 + drivers/gpu/drm/i915/intel_device_info.h | 1 + drivers/gpu/drm/i915/intel_pcode.c | 136 ++++++---- drivers/gpu/drm/i915/intel_pcode.h | 39 ++- 23 files changed, 499 insertions(+), 101 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 8/9 drm/i915/gt: Expose per-gt RPS defaults in sysfs
Create a gt/gtN/.defaults directory (similar to engine/<engine-name>/.defaults) to expose default parameter values for each gt in sysfs. Populate the .defaults directory with RPS parameter default values in order to allow userspace to revert to default values when needed.
This patch adds the following sysfs files to gt/gtN/.defaults:
* default_min_freq_mhz
* default_max_freq_mhz
* default_boost_freq_mhz
--- drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 10 ++-- drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 6 +++ drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 51 +++++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_gt_types.h | 10 ++++ drivers/gpu/drm/i915/gt/intel_rps.c | 3 ++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 17 +++++-- 6 files changed, 87 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_sysfs.c +5 -5
@@ -22,11 +22,6 @@ bool is_object_gt(struct kobject *kobj)return !strncmp (kobj->name,"gt" ,2 ); } -static struct intel_gt *kobj_to_gt (struct kobject *kobj) -{ - return container_of(kobj, struct intel_gt, sysfs_gtn); -} -struct intel_gt *intel_gt_sysfs_get_drvdata (struct device *dev,const char *name) {
@@ -101,6 +96,10 @@ void intel_gt_sysfs_register(struct intel_gt *gt) gt->i915->sysfs_gt, "gt%d", gt->info.id)) goto exit_fail; + gt->sysfs_defaults =kobject_create_and_add (".defaults" , >->sysfs_gtn); +if (!gt->sysfs_defaults) + goto exit_fail; +intel_gt_sysfs_pm_init (gt, >->sysfs_gtn);return ;
@@ -113,5 +112,6 @@ void intel_gt_sysfs_register(struct intel_gt *gt)void intel_gt_sysfs_unregister (struct intel_gt *gt) { +kobject_put (gt->sysfs_defaults);kobject_put (>->sysfs_gtn); }
drivers/gpu/drm/i915/gt/intel_gt_sysfs.h +6 -0
@@ -10,6 +10,7 @@#include <linux/kobject.h> #include "i915_gem.h" /* GEM_BUG_ON() */ +#include "intel_gt_types.h" struct intel_gt ;
@@ -22,6 +23,11 @@ intel_gt_create_kobj(struct intel_gt *gt,struct kobject *dir, const char *name); +static inline struct intel_gt *kobj_to_gt (struct kobject *kobj) +{ + return container_of(kobj, struct intel_gt, sysfs_gtn); +} +void intel_gt_sysfs_register (struct intel_gt *gt);void intel_gt_sysfs_unregister (struct intel_gt *gt); struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev,
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +51 -0
61 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_gt_types.h +10 -0
@@ -61,6 +61,12 @@ enum intel_steering_type {NUM_STEERING_TYPES }; +struct intel_rps_defaults { +u32 min_freq; +u32 max_freq; +u32 boost_freq; +}; +enum intel_submission_method {INTEL_SUBMISSION_RING ,INTEL_SUBMISSION_ELSP ,
@@ -225,6 +231,10 @@ struct intel_gt {/* gt/gtN sysfs */ struct kobject sysfs_gtn; + +/* sysfs defaults per gt */ +struct intel_rps_defaults rps_defaults; +struct kobject *sysfs_defaults; };enum intel_gt_scratch_field {
drivers/gpu/drm/i915/gt/intel_rps.c +3 -0
@@ -1976,7 +1976,9 @@ void intel_rps_init(struct intel_rps *rps)/* Derive initial user preferences/limits from the hardware limits */ rps->max_freq_softlimit = rps->max_freq; +rps_to_gt (rps)->rps_defaults.max_freq = rps->max_freq_softlimit; rps->min_freq_softlimit = rps->min_freq; +rps_to_gt (rps)->rps_defaults.min_freq = rps->min_freq_softlimit;/* After setting max-softlimit, find the overclock max freq */ if (GRAPHICS_VER (i915) ==6 ||IS_IVYBRIDGE (i915) ||IS_HASWELL (i915)) {
@@ -1994,6 +1996,7 @@ void intel_rps_init(struct intel_rps *rps)/* Finally allow us to boost to max by default */ rps->boost_freq = rps->max_freq; +rps_to_gt (rps)->rps_defaults.boost_freq = rps->boost_freq; rps->idle_freq = rps->min_freq;/* Start in the middle, from here we will autotune based on workload */
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +12 -5
@@ -547,20 +547,24 @@ static int slpc_set_softlimits(struct intel_guc_slpc *slpc)* unless they have deviated from defaults, in which case, * we retain the values and set min/max accordingly. */ -if (!slpc->max_freq_softlimit) +if (!slpc->max_freq_softlimit) { slpc->max_freq_softlimit = slpc->rp0_freq; -else if (slpc->max_freq_softlimit != slpc->rp0_freq) +slpc_to_gt (slpc)->rps_defaults.max_freq = slpc->max_freq_softlimit; + }else if (slpc->max_freq_softlimit != slpc->rp0_freq) { ret =intel_guc_slpc_set_max_freq (slpc, slpc->max_freq_softlimit); + }if (unlikely (ret))return ret; -if (!slpc->min_freq_softlimit) +if (!slpc->min_freq_softlimit) { slpc->min_freq_softlimit = slpc->min_freq; -else if (slpc->min_freq_softlimit != slpc->min_freq) +slpc_to_gt (slpc)->rps_defaults.min_freq = slpc->min_freq_softlimit; + }else if (slpc->min_freq_softlimit != slpc->min_freq) {return intel_guc_slpc_set_min_freq (slpc, slpc->min_freq_softlimit); + }return 0 ; }
@@ -606,8 +610,11 @@ static void slpc_get_rp_values(struct intel_guc_slpc *slpc) slpc->rp1_freq =intel_gpu_freq (rps, caps.rp1_freq); slpc->min_freq =intel_gpu_freq (rps, caps.min_freq); -if (!slpc->boost_freq) +/* Boost freq is RP0, unless already set */ +if (!slpc->boost_freq) { slpc->boost_freq = slpc->rp0_freq; +slpc_to_gt (slpc)->rps_defaults.boost_freq = slpc->boost_freq; + } }/*
Signature · 1 line
2.34.1
PATCH v2 1/9 drm/i915: Introduce has_media_ratio_mode
In reply to Ashutosh DixitMedia ratio mode (the ability for media IP to work at a different frequency from the GT) is available for a subset of dGfx platforms supporting GuC/SLPC. Introduce 'has_media_ratio_mode' flag in intel_device_info to identify these platforms and set it for XEHPSDV and DG2/ATS-M.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 2 ++ drivers/gpu/drm/i915/intel_device_info.h | 1 + 3 files changed, 5 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1224,6 +1224,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define CCS_MASK (gt) \ ENGINE_INSTANCES_MASK(gt, CCS0, I915_MAX_CCS) +#define HAS_MEDIA_RATIO_MODE (dev_priv) (INTEL_INFO(dev_priv)->has_media_ratio_mode) +/* * The Gen7 cmdparser copies the scanned buffer to the ggtt for execution * All later gens can run the final buffer from the ppgtt
drivers/gpu/drm/i915/i915_pci.c +2 -0
@@ -1032,6 +1032,7 @@ static const struct intel_device_info xehpsdv_info = { .display = { }, .has_64k_pages = 1, .needs_compact_pt = 1, + .has_media_ratio_mode = 1, .platform_engine_mask =BIT (RCS0 ) |BIT (BCS0 ) | BIT(VECS0) | BIT(VECS1) | BIT(VECS2) | BIT(VECS3) |
@@ -1051,6 +1052,7 @@ static const struct intel_device_info xehpsdv_info = { .has_64k_pages = 1, \ .has_guc_deprivilege = 1, \ .needs_compact_pt = 1, \ + .has_media_ratio_mode = 1, \ .platform_engine_mask = \BIT (RCS0 ) |BIT (BCS0 ) | \ BIT(VECS0) | BIT(VECS1) | \
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -151,6 +151,7 @@ enum intel_ppgtt_type {func (has_llc); \func (has_logical_ring_contexts); \func (has_logical_ring_elsq); \ +func (has_media_ratio_mode); \func (has_mslices); \func (has_pooled_eu); \func (has_pxp); \
Signature · 1 line
2.34.1
PATCH v2 4/9 drm/i915/gt: Convert callers to user per-gt pcode functions
In reply to Ashutosh DixitConvert appropriate callers to use per-gt pcode functions. Callers using pcode functions at "global scope", including *all* display functions are not converted, they continue to use the legacy pcode interface.
--- drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 6 +++--- drivers/gpu/drm/i915/gt/intel_llc.c | 9 ++++----- drivers/gpu/drm/i915/gt/intel_rc6.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_rps.c | 6 +++--- drivers/gpu/drm/i915/gt/selftest_llc.c | 4 ++-- drivers/gpu/drm/i915/gt/selftest_rps.c | 4 ++-- 6 files changed, 16 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c +3 -3
@@ -138,7 +138,7 @@ static int gen6_drpc(struct seq_file *m) }if (GRAPHICS_VER (i915) <=7 ) -snb_pcode_read (i915,GEN6_PCODE_READ_RC6VIDS , &rc6vids,NULL ); +intel_gt_pcode_read (gt,GEN6_PCODE_READ_RC6VIDS , &rc6vids,NULL );seq_printf (m,"RC1e Enabled: %s\n" ,str_yes_no (rcctl1 & GEN6_RC_CTL_RC1e_ENABLE));
@@ -545,8 +545,8 @@ static int llc_show(struct seq_file *m, void *data) wakeref =intel_runtime_pm_get (gt->uncore->rpm);for (gpu_freq = min_gpu_freq; gpu_freq <= max_gpu_freq; gpu_freq++) { ia_freq = gpu_freq; -snb_pcode_read (i915,GEN6_PCODE_READ_MIN_FREQ_TABLE , - &ia_freq,NULL ); +intel_gt_pcode_read (gt,GEN6_PCODE_READ_MIN_FREQ_TABLE , + &ia_freq,NULL ); seq_printf(m, "%d\t\t%d\t\t\t\t%d\n", intel_gpu_freq(rps, (gpu_freq *
drivers/gpu/drm/i915/gt/intel_llc.c +4 -5
@@ -124,7 +124,6 @@ static void calc_ia_freq(struct intel_llc *llc,static void gen6_update_ring_freq (struct intel_llc *llc) { -struct drm_i915_private *i915 =llc_to_gt (llc)->i915;struct ia_constants consts;unsigned int gpu_freq;
@@ -142,10 +141,10 @@ static void gen6_update_ring_freq(struct intel_llc *llc)unsigned int ia_freq, ring_freq;calc_ia_freq (llc, gpu_freq, &consts, &ia_freq, &ring_freq); -snb_pcode_write (i915,GEN6_PCODE_WRITE_MIN_FREQ_TABLE , - ia_freq <<GEN6_PCODE_FREQ_IA_RATIO_SHIFT | - ring_freq <<GEN6_PCODE_FREQ_RING_RATIO_SHIFT | - gpu_freq); +intel_gt_pcode_write (llc_to_gt (llc),GEN6_PCODE_WRITE_MIN_FREQ_TABLE , + ia_freq <<GEN6_PCODE_FREQ_IA_RATIO_SHIFT | + ring_freq <<GEN6_PCODE_FREQ_RING_RATIO_SHIFT | + gpu_freq); } }
drivers/gpu/drm/i915/gt/intel_rc6.c +2 -2
@@ -272,7 +272,7 @@ static void gen6_rc6_enable(struct intel_rc6 *rc6)GEN6_RC_CTL_HW_ENABLE ; rc6vids =0 ; - ret =snb_pcode_read (i915,GEN6_PCODE_READ_RC6VIDS , &rc6vids,NULL ); + ret =intel_gt_pcode_read (rc6_to_gt (rc6),GEN6_PCODE_READ_RC6VIDS , &rc6vids,NULL );if (GRAPHICS_VER (i915) ==6 && ret) {drm_dbg (&i915->drm,"Couldn't check for BIOS workaround\n" ); } else if (GRAPHICS_VER(i915) == 6 &&
@@ -282,7 +282,7 @@ static void gen6_rc6_enable(struct intel_rc6 *rc6) GEN6_DECODE_RC6_VID(rc6vids & 0xff), 450); rc6vids &=0xffff00 ; rc6vids |=GEN6_ENCODE_RC6_VID (450 ); - ret =snb_pcode_write (i915,GEN6_PCODE_WRITE_RC6VIDS , rc6vids); + ret =intel_gt_pcode_write (rc6_to_gt (rc6),GEN6_PCODE_WRITE_RC6VIDS , rc6vids);if (ret)drm_err (&i915->drm,"Couldn't fix incorrect rc6 voltage\n" );
drivers/gpu/drm/i915/gt/intel_rps.c +3 -3
@@ -1142,8 +1142,8 @@ static void gen6_rps_init(struct intel_rps *rps)if (IS_GEN9_BC (i915) ||GRAPHICS_VER (i915) >=11 ) mult =GEN9_FREQ_SCALER ; -if (snb_pcode_read (i915,HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , - &ddcc_status,NULL ) ==0 ) +if (intel_gt_pcode_read (rps_to_gt (rps),HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , + &ddcc_status,NULL ) ==0 ) rps->efficient_freq = clamp_t(u32, ((ddcc_status >> 8) & 0xff) * mult,
@@ -1982,7 +1982,7 @@ void intel_rps_init(struct intel_rps *rps)if (GRAPHICS_VER (i915) ==6 ||IS_IVYBRIDGE (i915) ||IS_HASWELL (i915)) {u32 params =0 ; -snb_pcode_read (i915,GEN6_READ_OC_PARAMS , ¶ms,NULL ); +intel_gt_pcode_read (rps_to_gt (rps),GEN6_READ_OC_PARAMS , ¶ms,NULL );if (params &BIT (31 )) {/* OC supported */ drm_dbg(&i915->drm, "Overclocking supported, max: %dMHz, overclock: %dMHz\n",
drivers/gpu/drm/i915/gt/selftest_llc.c +2 -2
@@ -31,8 +31,8 @@ static int gen6_verify_ring_freq(struct intel_llc *llc)calc_ia_freq (llc, gpu_freq, &consts, &ia_freq, &ring_freq); val = gpu_freq; -if (snb_pcode_read (i915,GEN6_PCODE_READ_MIN_FREQ_TABLE , - &val,NULL )) { +if (intel_gt_pcode_read (llc_to_gt (llc),GEN6_PCODE_READ_MIN_FREQ_TABLE , + &val,NULL )) {pr_err ("Failed to read freq table[%d], range [%d, %d]\n" , gpu_freq, consts.min_gpu_freq, consts.max_gpu_freq); err = -ENXIO ;
drivers/gpu/drm/i915/gt/selftest_rps.c +2 -2
@@ -521,8 +521,8 @@ static void show_pcu_config(struct intel_rps *rps)for (gpu_freq = min_gpu_freq; gpu_freq <= max_gpu_freq; gpu_freq++) {int ia_freq = gpu_freq; -snb_pcode_read (i915,GEN6_PCODE_READ_MIN_FREQ_TABLE , - &ia_freq,NULL ); +intel_gt_pcode_read (rps_to_gt (rps),GEN6_PCODE_READ_MIN_FREQ_TABLE , + &ia_freq,NULL ); pr_info("%5d %5d %5d\n", gpu_freq * 50,
Signature · 1 line
2.34.1
PATCH v2 9/9 drm/i915/gt: Expose default value for media_freq_factor in per-gt sysfs
In reply to Ashutosh DixitAdd the following sysfs file to gt/gtN/.defaults:
* media_freq_factor
--- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_gt_types.h | 1 + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 ++ 3 files changed, 21 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +18 -0
@@ -759,6 +759,18 @@ default_boost_freq_mhz_show(struct kobject *kobj, struct kobj_attribute *attr, cstatic struct kobj_attribute default_boost_freq_mhz =__ATTR (rps_boost_freq_mhz,0444 , default_boost_freq_mhz_show,NULL ); +static ssize_t +default_media_freq_factor_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) +{ +struct intel_gt *gt =kobj_to_gt (kobj->parent); + +return sysfs_emit (buf,"%d\n" , +media_ratio_mode_to_factor (gt->rps_defaults.media_ratio_mode)); +} + +static struct kobj_attribute default_media_freq_factor = +__ATTR (media_freq_factor,0444 , default_media_freq_factor_show,NULL ); +static const struct attribute *const rps_defaults_attrs[] = { &default_min_freq_mhz.attr, &default_max_freq_mhz.attr,
@@ -819,6 +831,12 @@ void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj)drm_warn (>->i915->drm,"failed to create add gt%u media_perf_power_attrs sysfs (%pe)\n" , gt->info.id,ERR_PTR (ret)); + + ret =sysfs_create_file (gt->sysfs_defaults, &default_media_freq_factor.attr); +if (ret) +drm_warn (>->i915->drm, +"failed to add gt%u default_media_freq_factor sysfs (%pe)\n" , + gt->info.id,ERR_PTR (ret)); } ret =add_rps_defaults (gt);
drivers/gpu/drm/i915/gt/intel_gt_types.h +1 -0
@@ -65,6 +65,7 @@ struct intel_rps_defaults {u32 min_freq;u32 max_freq;u32 boost_freq; +u32 media_ratio_mode; };enum intel_submission_method {
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +2 -0
@@ -260,7 +260,9 @@ int intel_guc_slpc_init(struct intel_guc_slpc *slpc) slpc->boost_freq =0 ;atomic_set (&slpc->num_waiters,0 ); slpc->num_boosts =0 ; + slpc->media_ratio_mode =SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL ; +slpc_to_gt (slpc)->rps_defaults.media_ratio_mode = slpc->media_ratio_mode;mutex_init (&slpc->lock);INIT_WORK (&slpc->boost_work, slpc_boost_work);
Signature · 1 line
2.34.1
PATCH v2 3/9 drm/i915/pcode: Extend pcode functions for multiple gt's
In reply to Ashutosh DixitEach gt contains an independent instance of pcode. Extend pcode functions to interface with pcode on different gt's. Previous (GT0) pcode read/write interfaces are preserved.
--- drivers/gpu/drm/i915/intel_pcode.c | 108 ++++++++++++++++------------- drivers/gpu/drm/i915/intel_pcode.h | 27 ++++++-- 2 files changed, 82 insertions(+), 53 deletions(-)
drivers/gpu/drm/i915/intel_pcode.c +61 -47
@@ -6,6 +6,7 @@#include "i915_drv.h" #include "i915_reg.h" #include "intel_pcode.h" +#include "gt/intel_gt.h" static int gen6_check_mailbox_status (u32 mbox) {
@@ -52,14 +53,14 @@ static int gen7_check_mailbox_status(u32 mbox) } } -static int __snb_pcode_rw (struct drm_i915_private *i915,u32 mbox, -u32 *val,u32 *val1, -int fast_timeout_us,int slow_timeout_ms, -bool is_read) +static int __gt_pcode_rw (struct intel_gt *gt,u32 mbox, +u32 *val,u32 *val1, +int fast_timeout_us,int slow_timeout_ms, +bool is_read) { -struct intel_uncore *uncore = &i915->uncore; +struct intel_uncore *uncore = gt->uncore; -lockdep_assert_held (&i915->sb_lock); +lockdep_assert_held (>->i915->sb_lock);/* * GEN6_PCODE_* are outside of the forcewake domain, we can use
@@ -88,60 +89,60 @@ static int __snb_pcode_rw(struct drm_i915_private *i915, u32 mbox,if (is_read && val1) *val1 =intel_uncore_read_fw (uncore,GEN6_PCODE_DATA1 ); -if (GRAPHICS_VER (i915) >6 ) +if (GRAPHICS_VER (gt->i915) >6 )return gen7_check_mailbox_status (mbox);else return gen6_check_mailbox_status (mbox); } -int snb_pcode_read (struct drm_i915_private *i915,u32 mbox,u32 *val,u32 *val1) +int intel_gt_pcode_read (struct intel_gt *gt,u32 mbox,u32 *val,u32 *val1) {int err; -mutex_lock (&i915->sb_lock); - err =__snb_pcode_rw (i915, mbox, val, val1,500 ,20 , true); -mutex_unlock (&i915->sb_lock); +mutex_lock (>->i915->sb_lock); + err =__gt_pcode_rw (gt, mbox, val, val1,500 ,20 , true); +mutex_unlock (>->i915->sb_lock);if (err) { -drm_dbg (&i915->drm, -"warning: pcode (read from mbox %x) mailbox access failed for %ps: %d\n" , - mbox,__builtin_return_address (0 ), err); +drm_dbg (>->i915->drm, +"gt %d: warning: pcode (read from mbox %x) mailbox access failed for %ps: %d\n" , + gt->info.id, mbox,__builtin_return_address (0 ), err); }return err; } -int snb_pcode_write_timeout (struct drm_i915_private *i915,u32 mbox,u32 val, -int fast_timeout_us,int slow_timeout_ms) +int intel_gt_pcode_write_timeout (struct intel_gt *gt,u32 mbox,u32 val, +int fast_timeout_us,int slow_timeout_ms) {int err; -mutex_lock (&i915->sb_lock); - err =__snb_pcode_rw (i915, mbox, &val,NULL , - fast_timeout_us, slow_timeout_ms, false); -mutex_unlock (&i915->sb_lock); +mutex_lock (>->i915->sb_lock); + err =__gt_pcode_rw (gt, mbox, &val,NULL , + fast_timeout_us, slow_timeout_ms, false); +mutex_unlock (>->i915->sb_lock);if (err) { -drm_dbg (&i915->drm, -"warning: pcode (write of 0x%08x to mbox %x) mailbox access failed for %ps: %d\n" , - val, mbox,__builtin_return_address (0 ), err); +drm_dbg (>->i915->drm, +"gt %d: warning: pcode (write of 0x%08x to mbox %x) mailbox access failed for %ps: %d\n" , + gt->info.id, val, mbox,__builtin_return_address (0 ), err); }return err; } -static bool skl_pcode_try_request (struct drm_i915_private *i915,u32 mbox, -u32 request,u32 reply_mask,u32 reply, -u32 *status) +static bool __gt_pcode_try_request (struct intel_gt *gt,u32 mbox, +u32 request,u32 reply_mask,u32 reply, +u32 *status) { - *status =__snb_pcode_rw (i915, mbox, &request,NULL ,500 ,0 , true); + *status =__gt_pcode_rw (gt, mbox, &request,NULL ,500 ,0 , true);return (*status ==0 ) && ((request & reply_mask) == reply); }/** -* skl_pcode_request - send PCODE request until acknowledgment -* @i915: device private +* intel_gt_pcode_request - send PCODE request until acknowledgment +* @gt: gt * @mbox: PCODE mailbox ID the request is targeted for * @request: request ID * @reply_mask: mask used to check for request acknowledgment
@@ -158,16 +159,16 @@ static bool skl_pcode_try_request(struct drm_i915_private *i915, u32 mbox,* Returns 0 on success, %-ETIMEDOUT in case of a timeout, <0 in case of some * other error as reported by PCODE. */ -int skl_pcode_request (struct drm_i915_private *i915,u32 mbox,u32 request, -u32 reply_mask,u32 reply,int timeout_base_ms) +int intel_gt_pcode_request (struct intel_gt *gt,u32 mbox,u32 request, +u32 reply_mask,u32 reply,int timeout_base_ms) {u32 status;int ret; -mutex_lock (&i915->sb_lock); +mutex_lock (>->i915->sb_lock);#define COND \ - skl_pcode_try_request(i915, mbox, request, reply_mask, reply, &status) + __gt_pcode_try_request(gt, mbox, request, reply_mask, reply, &status)/* * Prime the PCODE by doing a request first. Normally it guarantees
@@ -193,35 +194,48 @@ int skl_pcode_request(struct drm_i915_private *i915, u32 mbox, u32 request,* requests, and for any quirks of the PCODE firmware that delays * the request completion. */ -drm_dbg_kms (&i915->drm, +drm_dbg_kms (>->i915->drm,"PCODE timeout, retrying with preemption disabled\n" ); -drm_WARN_ON_ONCE (&i915->drm, timeout_base_ms >3 ); +drm_WARN_ON_ONCE (>->i915->drm, timeout_base_ms >3 );preempt_disable (); ret =wait_for_atomic (COND ,50 );preempt_enable (); out: -mutex_unlock (&i915->sb_lock); +mutex_unlock (>->i915->sb_lock);return status ? status : ret;#undef COND } +static int __gt_pcode_init (struct intel_gt *gt) +{ +int ret =intel_gt_pcode_request (gt,DG1_PCODE_STATUS , +DG1_UNCORE_GET_INIT_STATUS , +DG1_UNCORE_INIT_STATUS_COMPLETE , +DG1_UNCORE_INIT_STATUS_COMPLETE ,180000 ); + +drm_dbg (>->i915->drm,"gt %d: PCODE init status %d\n" , gt->info.id, ret); + +if (ret) +drm_err (>->i915->drm,"gt %d: Pcode did not report uncore initialization completion!\n" , + gt->info.id); + +return ret; +} +int intel_pcode_init (struct drm_i915_private *i915) { -int ret =0 ; +struct intel_gt *gt; +int i, ret =0 ;if (!IS_DGFX (i915))return ret; - ret =skl_pcode_request (i915,DG1_PCODE_STATUS , -DG1_UNCORE_GET_INIT_STATUS , -DG1_UNCORE_INIT_STATUS_COMPLETE , -DG1_UNCORE_INIT_STATUS_COMPLETE ,180000 ); - -drm_dbg (&i915->drm,"PCODE init status %d\n" , ret); - -if (ret) -drm_err (&i915->drm,"Pcode did not report uncore initialization completion!\n" ); +for_each_gt (gt, i915, i) { + ret =__gt_pcode_init (gt); +if (ret) +return ret; + } -return ret; +return 0 ; }
drivers/gpu/drm/i915/intel_pcode.h +21 -6
@@ -8,16 +8,31 @@#include <linux/types.h> +struct intel_gt ;struct drm_i915_private ; -int snb_pcode_read (struct drm_i915_private *i915,u32 mbox,u32 *val,u32 *val1); -int snb_pcode_write_timeout (struct drm_i915_private *i915,u32 mbox,u32 val, -int fast_timeout_us,int slow_timeout_ms); -#define snb_pcode_write (i915, mbox, val) \ +int intel_gt_pcode_read (struct intel_gt *gt,u32 mbox,u32 *val,u32 *val1); + +int intel_gt_pcode_write_timeout (struct intel_gt *gt,u32 mbox,u32 val, +int fast_timeout_us,int slow_timeout_ms); + +#define intel_gt_pcode_write (gt, mbox, val) \ + intel_gt_pcode_write_timeout(gt, mbox, val, 500, 0) + +int intel_gt_pcode_request (struct intel_gt *gt,u32 mbox,u32 request, +u32 reply_mask,u32 reply,int timeout_base_ms); + +#define snb_pcode_read (i915, mbox, val, val1) \ + intel_gt_pcode_read(&(i915)->gt0, mbox, val, val1) + +#define snb_pcode_write_timeout (i915, mbox, val, fast_timeout_us, slow_timeout_ms) \ + intel_gt_pcode_write_timeout(&(i915)->gt0, mbox, val, fast_timeout_us, slow_timeout_ms) + +#define snb_pcode_write (i915, mbox, val) \ snb_pcode_write_timeout(i915, mbox, val, 500, 0) -int skl_pcode_request (struct drm_i915_private *i915,u32 mbox,u32 request, -u32 reply_mask,u32 reply,int timeout_base_ms); +#define skl_pcode_request (i915, mbox, request, reply_mask, reply, timeout_base_ms) \ + intel_gt_pcode_request(&(i915)->gt0, mbox, request, reply_mask, reply, timeout_base_ms)int intel_pcode_init (struct drm_i915_private *i915);
Signature · 1 line
2.34.1
PATCH v2 7/9 drm/i915/gt: Fix memory leaks in per-gt sysfs
In reply to Ashutosh DixitAll kmalloc'd kobjects need a kobject_put() to free memory. For example in previous code, kobj_gt_release() never gets called. The requirement of kobject_put() now results in a slightly different code organization.
--- drivers/gpu/drm/i915/gt/intel_gt.c | 1 + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 35 ++++++++++-------------- drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 6 +--- drivers/gpu/drm/i915/gt/intel_gt_types.h | 3 ++ drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ 5 files changed, 22 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt.c +1 -0
@@ -783,6 +783,7 @@ void intel_gt_driver_unregister(struct intel_gt *gt) {intel_wakeref_t wakeref; +intel_gt_sysfs_unregister (gt);intel_rps_driver_unregister (>->rps);intel_pxp_fini (>->pxp);
drivers/gpu/drm/i915/gt/intel_gt_sysfs.c +15 -20
@@ -24,7 +24,7 @@ bool is_object_gt(struct kobject *kobj)static struct intel_gt *kobj_to_gt (struct kobject *kobj) { - return container_of(kobj, struct kobj_gt, base)->gt; + return container_of(kobj, struct intel_gt, sysfs_gtn); } struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev,
@@ -72,21 +72,19 @@ static struct attribute *id_attrs[] = { };ATTRIBUTE_GROUPS (id); -static void kobj_gt_release (struct kobject *kobj) +/* A kobject needs a release() method even if it does nothing */ +static void kobj_gtn_release (struct kobject *kobj) { -kfree (kobj); } -static struct kobj_type kobj_gt_type = { - .release = kobj_gt_release, +static struct kobj_type kobj_gtn_type = { + .release = kobj_gtn_release, .sysfs_ops = &kobj_sysfs_ops, .default_groups = id_groups, };void intel_gt_sysfs_register (struct intel_gt *gt) { -struct kobj_gt *kg; -/* * We need to make things right with the * ABI compatibility. The files were originally
@@ -98,25 +96,22 @@ void intel_gt_sysfs_register(struct intel_gt *gt)if (gt_is_root (gt))intel_gt_sysfs_pm_init (gt,gt_get_parent_obj (gt)); - kg =kzalloc (sizeof (*kg),GFP_KERNEL ); -if (!kg) +/* init and xfer ownership to sysfs tree */ +if (kobject_init_and_add (>->sysfs_gtn, &kobj_gtn_type, + gt->i915->sysfs_gt,"gt%d" , gt->info.id)) goto exit_fail; -kobject_init (&kg->base, &kobj_gt_type); - kg->gt = gt; - -/* xfer ownership to sysfs tree */ -if (kobject_add (&kg->base, gt->i915->sysfs_gt,"gt%d" , gt->info.id)) - goto exit_kobj_put; - -intel_gt_sysfs_pm_init (gt, &kg->base); +intel_gt_sysfs_pm_init (gt, >->sysfs_gtn);return ; -exit_kobj_put: -kobject_put (&kg->base); - exit_fail: +kobject_put (>->sysfs_gtn);drm_warn (>->i915->drm,"failed to initialize gt%d sysfs root\n" , gt->info.id); } + +void intel_gt_sysfs_unregister (struct intel_gt *gt) +{ +kobject_put (>->sysfs_gtn); +}
drivers/gpu/drm/i915/gt/intel_gt_sysfs.h +1 -5
@@ -13,11 +13,6 @@struct intel_gt ; -struct kobj_gt { -struct kobject base; -struct intel_gt *gt; -}; -bool is_object_gt (struct kobject *kobj);struct drm_i915_private *kobj_to_i915 (struct kobject *kobj);
@@ -28,6 +23,7 @@ intel_gt_create_kobj(struct intel_gt *gt, const char *name);void intel_gt_sysfs_register (struct intel_gt *gt); +void intel_gt_sysfs_unregister (struct intel_gt *gt);struct intel_gt *intel_gt_sysfs_get_drvdata (struct device *dev,const char *name);
drivers/gpu/drm/i915/gt/intel_gt_types.h +3 -0
@@ -222,6 +222,9 @@ struct intel_gt { } mocs;struct intel_pxp pxp; + +/* gt/gtN sysfs */ +struct kobject sysfs_gtn; };enum intel_gt_scratch_field {
drivers/gpu/drm/i915/i915_sysfs.c +2 -0
@@ -259,4 +259,6 @@ void i915_teardown_sysfs(struct drm_i915_private *dev_priv)device_remove_bin_file (kdev, &dpf_attrs_1);device_remove_bin_file (kdev, &dpf_attrs); + +kobject_put (dev_priv->sysfs_gt); }
Signature · 1 line
2.34.1
PATCH v2 2/9 drm/i915/gt: Add media freq factor to per-gt sysfs
In reply to Ashutosh DixitExpose new sysfs to program and retrieve media freq factor. Factor values of 0 (dynamic), 0.5 and 1.0 are supported via a u8.8 fixed point representation (corresponding to integer values of 0, 128 and 256 respectively).
Media freq factor is converted to media_ratio_mode for GuC. It is programmed into GuC using H2G SLPC interface. It is retrieved from GuC through a register read. A cached media_ratio_mode is maintained to preserve set values across GuC resets.
This patch adds the following sysfs files to gt/gtN sysfs:
* media_freq_factor
* media_freq_factor.scale
--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 130 ++++++++++++++++++ .../drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 6 + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 20 +++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 + .../gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 3 + 6 files changed, 161 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_regs.h +1 -0
@@ -732,6 +732,7 @@#define GEN6_AGGRESSIVE_TURBO (0 << 15)#define GEN9_SW_REQ_UNSLICE_RATIO_SHIFT 23#define GEN9_IGNORE_SLICE_RATIO (0 << 0) +#define GEN12_MEDIA_FREQ_RATIO REG_BIT(13)#define GEN6_RC_VIDEO_FREQ _MMIO(0xa00c)#define GEN6_RC_CTL_RC6pp_ENABLE (1 << 16)
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +130 -0
140 lines not on this page · raw message
drivers/gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h +6 -0
@@ -122,6 +122,12 @@ enum slpc_param_id { SLPC_MAX_PARAM = 32, }; +enum slpc_media_ratio_mode { +SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL =0 , +SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_ONE =1 , +SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_TWO =2 , +}; +enum slpc_event_id {SLPC_EVENT_RESET =0 ,SLPC_EVENT_SHUTDOWN =1 ,
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +20 -0
@@ -260,6 +260,7 @@ int intel_guc_slpc_init(struct intel_guc_slpc *slpc) slpc->boost_freq =0 ;atomic_set (&slpc->num_waiters,0 ); slpc->num_boosts =0 ; + slpc->media_ratio_mode =SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL ;mutex_init (&slpc->lock);INIT_WORK (&slpc->boost_work, slpc_boost_work);
@@ -506,6 +507,22 @@ int intel_guc_slpc_get_min_freq(struct intel_guc_slpc *slpc, u32 *val)return ret; } +int intel_guc_slpc_set_media_ratio_mode (struct intel_guc_slpc *slpc,u32 val) +{ +struct drm_i915_private *i915 =slpc_to_i915 (slpc); +intel_wakeref_t wakeref; +int ret =0 ; + +if (!HAS_MEDIA_RATIO_MODE (i915)) +return -ENODEV ; + +with_intel_runtime_pm (&i915->runtime_pm, wakeref) + ret = slpc_set_param(slpc, +SLPC_PARAM_MEDIA_FF_RATIO_MODE , + val); +return ret; +} +void intel_guc_pm_intrmsk_enable (struct intel_gt *gt) {u32 pm_intrmsk_mbz =0 ;
@@ -654,6 +671,9 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)return ret; } +/* Set cached media freq ratio mode */ +intel_guc_slpc_set_media_ratio_mode (slpc, slpc->media_ratio_mode); +return 0 ; }
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h +1 -0
@@ -38,6 +38,7 @@ int intel_guc_slpc_set_boost_freq(struct intel_guc_slpc *slpc, u32 val);int intel_guc_slpc_get_max_freq (struct intel_guc_slpc *slpc,u32 *val);int intel_guc_slpc_get_min_freq (struct intel_guc_slpc *slpc,u32 *val);int intel_guc_slpc_print_info (struct intel_guc_slpc *slpc,struct drm_printer *p); +int intel_guc_slpc_set_media_ratio_mode (struct intel_guc_slpc *slpc,u32 val);void intel_guc_pm_intrmsk_enable (struct intel_gt *gt);void intel_guc_slpc_boost (struct intel_guc_slpc *slpc);void intel_guc_slpc_dec_waiters (struct intel_guc_slpc *slpc);
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h +3 -0
@@ -29,6 +29,9 @@ struct intel_guc_slpc {u32 min_freq_softlimit;u32 max_freq_softlimit; +/* cached media ratio mode */ +u32 media_ratio_mode; +/* Protects set/reset of boost freq * and value of num_waiters */
Signature · 1 line
2.34.1
PATCH v2 6/9 drm/i915/gt: Add media RP0/RPn to per-gt sysfs
In reply to Ashutosh DixitFrom: Dale B Stimson <[email protected]>
Retrieve RP0 and RPn freq for media IP from PCODE and display in per-gt sysfs. This patch adds the following files to gt/gtN sysfs:
* media_RP0_freq_mhz
* media_RPn_freq_mhz
v2: Fixed commit author (Rodrigo)
--- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 47 +++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 15 +++++++ 2 files changed, 62 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +47 -0
@@ -12,6 +12,7 @@#include "i915_sysfs.h" #include "intel_gt.h" #include "intel_gt_regs.h" +#include "intel_pcode.h" #include "intel_gt_sysfs.h" #include "intel_gt_sysfs_pm.h" #include "intel_rc6.h"
@@ -669,13 +670,59 @@ static ssize_t media_freq_factor_store(struct device *dev,return err ?: count; } +static ssize_t media_RP0_freq_mhz_show (struct device *dev, +struct device_attribute *attr, +char *buff) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (dev, attr->attr.name); +u32 val; +int err; + + err =__intel_gt_pcode_read (gt,XEHPSDV_PCODE_FREQUENCY_CONFIG , +PCODE_MBOX_FC_SC_READ_FUSED_P0 , +PCODE_MBOX_DOMAIN_MEDIAFF , &val); + +if (err) +return err; + +/* data_out - Fused P0 for domain ID in units of 50 MHz */ + val *=GT_FREQUENCY_MULTIPLIER ; + +return sysfs_emit (buff,"%u\n" , val); +} + +static ssize_t media_RPn_freq_mhz_show (struct device *dev, +struct device_attribute *attr, +char *buff) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (dev, attr->attr.name); +u32 val; +int err; + + err =__intel_gt_pcode_read (gt,XEHPSDV_PCODE_FREQUENCY_CONFIG , +PCODE_MBOX_FC_SC_READ_FUSED_PN , +PCODE_MBOX_DOMAIN_MEDIAFF , &val); + +if (err) +return err; + +/* data_out - Fused P0 for domain ID in units of 50 MHz */ + val *=GT_FREQUENCY_MULTIPLIER ; + +return sysfs_emit (buff,"%u\n" , val); +} +static DEVICE_ATTR_RW (media_freq_factor);static struct device_attribute dev_attr_media_freq_factor_scale =__ATTR (media_freq_factor.scale,0444 , freq_factor_scale_show,NULL ); +static DEVICE_ATTR_RO (media_RP0_freq_mhz); +static DEVICE_ATTR_RO (media_RPn_freq_mhz);static const struct attribute *media_perf_power_attrs[] = { &dev_attr_media_freq_factor.attr, &dev_attr_media_freq_factor_scale.attr, + &dev_attr_media_RP0_freq_mhz.attr, + &dev_attr_media_RPn_freq_mhz.attr,NULL };
drivers/gpu/drm/i915/i915_reg.h +15 -0
@@ -6753,6 +6753,21 @@#define DG1_UNCORE_GET_INIT_STATUS 0x0#define DG1_UNCORE_INIT_STATUS_COMPLETE 0x1#define GEN12_PCODE_READ_SAGV_BLOCK_TIME_US 0x23 +#define XEHPSDV_PCODE_FREQUENCY_CONFIG 0x6e/* xehpsdv, pvc */ +/* XEHPSDV_PCODE_FREQUENCY_CONFIG sub-commands (param1) */ +#define PCODE_MBOX_FC_SC_READ_FUSED_P0 0x0 +#define PCODE_MBOX_FC_SC_READ_FUSED_PN 0x1 +/* PCODE_MBOX_DOMAIN_* - mailbox domain IDs */ +/* XEHPSDV_PCODE_FREQUENCY_CONFIG param2 */ +#define PCODE_MBOX_DOMAIN_NONE 0x0 +#define PCODE_MBOX_DOMAIN_GT 0x1 +#define PCODE_MBOX_DOMAIN_HBM 0x2 +#define PCODE_MBOX_DOMAIN_MEDIAFF 0x3 +#define PCODE_MBOX_DOMAIN_MEDIA_SAMPLER 0x4 +#define PCODE_MBOX_DOMAIN_SYSTOLIC_ARRAY 0x5 +#define PCODE_MBOX_DOMAIN_CHIPLET 0x6 +#define PCODE_MBOX_DOMAIN_BASE_CHIPLET_LINK 0x7 +#define PCODE_MBOX_DOMAIN_BASE 0x8#define GEN6_PCODE_DATA _MMIO(0x138128)#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16
Signature · 1 line
2.34.1
PATCH v2 5/9 drm/i915/pcode: Add a couple of pcode helpers
In reply to Ashutosh DixitFrom: Dale B Stimson <[email protected]>
Add a couple of helpers to help formatting pcode commands and improve code readability.
v2: Fixed commit author (Rodrigo)
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pcode.c | 32 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_pcode.h | 12 +++++++++++ 3 files changed, 47 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -6684,6 +6684,9 @@#define GEN6_PCODE_MAILBOX _MMIO(0x138124)#define GEN6_PCODE_READY (1 << 31) +#define GEN6_PCODE_MB_PARAM2 REG_GENMASK(23, 16) +#define GEN6_PCODE_MB_PARAM1 REG_GENMASK(15, 8) +#define GEN6_PCODE_MB_COMMAND REG_GENMASK(7, 0)#define GEN6_PCODE_ERROR_MASK 0xFF#define GEN6_PCODE_SUCCESS 0x0#define GEN6_PCODE_ILLEGAL_CMD 0x1
drivers/gpu/drm/i915/intel_pcode.c +32 -0
@@ -239,3 +239,35 @@ int intel_pcode_init(struct drm_i915_private *i915)return 0 ; } + +int __intel_gt_pcode_read (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 *val) +{ +intel_wakeref_t wakeref; +u32 mbox; +int err; + + mbox =REG_FIELD_PREP (GEN6_PCODE_MB_COMMAND , mbcmd) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM1 , p1) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM2 , p2); + +with_intel_runtime_pm (gt->uncore->rpm, wakeref) + err = intel_gt_pcode_read(gt, mbox, val, NULL); + +return err; +} + +int __intel_gt_pcode_write (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 val) +{ +intel_wakeref_t wakeref; +u32 mbox; +int err; + + mbox =REG_FIELD_PREP (GEN6_PCODE_MB_COMMAND , mbcmd) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM1 , p1) + |REG_FIELD_PREP (GEN6_PCODE_MB_PARAM2 , p2); + +with_intel_runtime_pm (gt->uncore->rpm, wakeref) + err = intel_gt_pcode_write(gt, mbox, val); + +return err; +}
drivers/gpu/drm/i915/intel_pcode.h +12 -0
@@ -36,4 +36,16 @@ int intel_gt_pcode_request(struct intel_gt *gt, u32 mbox, u32 request,int intel_pcode_init (struct drm_i915_private *i915); +/* +* Helpers for dGfx PCODE mailbox command formatting +*/ +int __intel_gt_pcode_read (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 *val); +int __intel_gt_pcode_write (struct intel_gt *gt,u32 mbcmd,u32 p1,u32 p2,u32 val); + +#define __snb_pcode_read (i915, mbcmd, p1, p2, val) \ + __intel_gt_pcode_read(&(i915)->gt0, mbcmd, p1, p2, val) + +#define __snb_pcode_write (i915, mbcmd, p1, p2, val) \ + __intel_gt_pcode_write(&(i915)->gt0, mbcmd, p1, p2, val) +#endif /* _INTEL_PCODE_H */
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 3/8] drm/i915/pcode: Extend pcode functions for multiple gt's
In reply to Rodrigo ViviQuoted 38 lines · Rodrigo Vivi
Quoted 11 lines · Ashutosh
Quoted 10 lines · Jani Nikula
Quoted 3 lines · Ashutosh Dixit
Each gt contains an independent instance of pcode. Extend pcode functions to interface with pcode on different gt's. Previous (GT0) pcode read/write interfaces are preserved.
The big problem here is that this hard couples display code to gt code, while we're trying hard to go the opposite direction. It doesn't matter that the existing interfaces are preserved as wrappers when it relies on an
intel_gtbeing available (viai915->gt0).I don't believe there is a big problem in here...
please note the
intel_pcode.his keeping the abstraction for display#define snb_pcode_write_timeout(i915, mbox, val, fast_timeout_us, slow_timeout_ms) \ intel_gt_pcode_write_timeout(&(i915)->gt0, mbox, val, fast_timeout_us, slow_timeout_ms)#define snb_pcode_write(i915, mbox, val) \ snb_pcode_write_timeout(i915, mbox, val, 500, 0)display only uses these macros that Ashutosh didn't touch.
Quoted 3 lines
Quoted 3 lines
Note how 'git grep
intel_gt--drivers/gpu/drm/i915/display/' matches only 1 line.As well with the patches applied:
$ git log --oneline -1 1f58f1195478 (HEAD -> drm-tip) drm/i915/gt: Expose per-gt RPS defaults in sysfs$ git grep intel_gt -- drivers/gpu/drm/i915/display/ drivers/gpu/drm/i915/display/intel_display.c: intel_gt_set_wedged(to_gt(dev_priv));Quoted 1 line
Quoted 6 lines
Quoted 3 lines
Hi Jani, would you have suggestions about how to do this (handle pcode on multiple gt's)? The thinking was this patch would be a straightforward way to avoid code duplication. Also:
Maybe it is just a matter of renaming the macros used by display in
intel_pcode.hto reflect that it should be used by display only?
In v2 I have added a patch ([PATCH 4/9] drm/i915/gt: Convert callers to user per-gt pcode functions) which correctly calls per-gt pcode functions where this is required. With this patch only display functions (and one other caller) are left calling the "global scope" snb_pcode_read/write* functions. So the legacy snb_pcode_read/write* are now basically being used only by display. Let's see if Jani is ok with this. Thanks.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Media freq factor and per-gt enhancements/fixes
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: drm/i915: Media freq factor and per-gt enhancements/fixes
URL : https://patchwork.freedesktop.org/series/102665/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11523 -> Patchwork_102665v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/index.html
Participating hosts (47 -> 49)
------------------------------
Additional (5): fi-rkl-11600 bat-dg2-8 bat-adlm-1 fi-icl-u2 fi-hsw-4770
Missing (3): fi-ctg-p8600 fi-bsw-cyan fi-hsw-4200u
Known issues
------------
Here are the changes found in Patchwork_102665v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3@smem:
- fi-rkl-11600: NOTRUN -> [INCOMPLETE][1] ([i915#5127])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-rkl-11600/igt@gem_exec_suspend@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-hsw-4770: NOTRUN -> [SKIP][2] ([fdo#109271]) +9 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-hsw-4770/igt@[email protected]
- fi-icl-u2: NOTRUN -> [SKIP][3] ([i915#2190])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-icl-u2/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-icl-u2: NOTRUN -> [SKIP][4] ([i915#4613]) +3 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-icl-u2/igt@[email protected]
- bat-dg1-5: NOTRUN -> [FAIL][5] ([i915#5701])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- bat-dg1-6: NOTRUN -> [FAIL][6] ([i915#5701])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
* igt@i915_pm_backlight@basic-brightness:
- fi-hsw-4770: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#3012])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-hsw-4770/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-hsw-4770: NOTRUN -> [SKIP][8] ([fdo#109271] / [fdo#111827]) +8 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-hsw-4770/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: NOTRUN -> [SKIP][9] ([fdo#111827]) +8 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-icl-u2/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: NOTRUN -> [SKIP][10] ([fdo#109278]) +2 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-icl-u2/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-icl-u2: NOTRUN -> [SKIP][11] ([fdo#109285])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-icl-u2/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-hsw-4770: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#533])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-hsw-4770/igt@[email protected]
* igt@kms_psr@primary_mmap_gtt:
- fi-hsw-4770: NOTRUN -> [SKIP][13] ([fdo#109271] / [i915#1072]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-hsw-4770/igt@kms_psr@primary_mmap_gtt.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-icl-u2: NOTRUN -> [SKIP][14] ([i915#3555])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-icl-u2/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- fi-icl-u2: NOTRUN -> [SKIP][15] ([i915#3301])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-icl-u2/igt@[email protected]
* igt@runner@aborted:
- bat-dg1-5: NOTRUN -> [FAIL][16] ([i915#4312])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-5/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [FAIL][17] ([i915#4312])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-bdw-5557u/igt@[email protected]
- bat-dg1-6: NOTRUN -> [FAIL][18] ([i915#4312])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/bat-dg1-6/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@hangcheck:
- fi-adl-ddr5: [DMESG-WARN][19] -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11523/fi-adl-ddr5/igt@i915_selftest@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-adl-ddr5/igt@i915_selftest@[email protected]
* igt@kms_flip@basic-flip-vs-dpms@a-edp1:
- fi-tgl-u2: [DMESG-WARN][21] ([i915#402]) -> [PASS][22] +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11523/fi-tgl-u2/igt@kms_flip@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-tgl-u2/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-cml-u2: [DMESG-WARN][23] ([i915#4269]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11523/fi-cml-u2/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-cml-u2/igt@[email protected]
#### Warnings ####
* igt@fbdev@eof:
- fi-kbl-8809g: [INCOMPLETE][25] ([i915#5557] / [i915#5717]) -> [INCOMPLETE][26] ([i915#5557])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11523/fi-kbl-8809g/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-kbl-8809g/igt@[email protected]
* igt@runner@aborted:
- fi-kbl-8809g: [FAIL][27] ([i915#5717]) -> [FAIL][28] ([i915#2722])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11523/fi-kbl-8809g/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/fi-kbl-8809g/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#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[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#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[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#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3576]: https://gitlab.freedesktop.org/drm/intel/issues/3576
[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#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[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#4269]: https://gitlab.freedesktop.org/drm/intel/issues/4269
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
[i915#4897]: https://gitlab.freedesktop.org/drm/intel/issues/4897
[i915#5127]: https://gitlab.freedesktop.org/drm/intel/issues/5127
[i915#5171]: https://gitlab.freedesktop.org/drm/intel/issues/5171
[i915#5174]: https://gitlab.freedesktop.org/drm/intel/issues/5174
[i915#5181]: https://gitlab.freedesktop.org/drm/intel/issues/5181
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5193]: https://gitlab.freedesktop.org/drm/intel/issues/5193
[i915#5270]: https://gitlab.freedesktop.org/drm/intel/issues/5270
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
[i915#5275]: https://gitlab.freedesktop.org/drm/intel/issues/5275
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5341]: https://gitlab.freedesktop.org/drm/intel/issues/5341
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5557]: https://gitlab.freedesktop.org/drm/intel/issues/5557
[i915#5606]: https://gitlab.freedesktop.org/drm/intel/issues/5606
[i915#5607]: https://gitlab.freedesktop.org/drm/intel/issues/5607
[i915#5608]: https://gitlab.freedesktop.org/drm/intel/issues/5608
[i915#5634]: https://gitlab.freedesktop.org/drm/intel/issues/5634
[i915#5701]: https://gitlab.freedesktop.org/drm/intel/issues/5701
[i915#5703]: https://gitlab.freedesktop.org/drm/intel/issues/5703
[i915#5717]: https://gitlab.freedesktop.org/drm/intel/issues/5717
Build changes
-------------
* IGT: IGT_6440 -> IGTPW_6925
* Linux: CI_DRM_11523 -> Patchwork_102665v1
CI-20190529: 20190529
CI_DRM_11523: 6b6803c3f43f5d0f960246b4b52f956f1a579833 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_6925: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_6925/index.html
IGT_6440: 04262fc75ff3ec42f4db0c929d46b7cd5083911f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_102665v1: d883cffbf2383a96420fd6dc099056295de24a12 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d6cf80273360 drm/i915/gt: Expose default value for media_freq_factor in per-gt sysfs 1f0f3ec25497 drm/i915/gt: Expose per-gt RPS defaults in sysfs bb5327732fe5 drm/i915/gt: Fix memory leaks in per-gt sysfs a4c2bfa4f705 drm/i915/gt: Add media RP0/RPn to per-gt sysfs 94c6d3942fe5 drm/i915/pcode: Add a couple of pcode helpers 504368cb6143 drm/i915/pcode: Extend pcode functions for multiple gt's 7d4e345652f1 drm/i915/gt: Add media freq factor to per-gt sysfs 0ad13f8ef932 drm/i915: Introduce has_media_ratio_mode
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_102665v1/index.html
Re: [Intel-gfx] [PATCH 7/9] drm/i915/gt: Fix memory leaks in per-gt sysfs
In reply to Ashutosh DixitHi Ashutosh,
Quoted 133 lines · Ashutosh Dixit
All kmalloc'd kobjects need a
kobject_put()to free memory. For example in previous code,kobj_gt_release()never gets called. The requirement ofkobject_put()now results in a slightly different code organization.Cc Andi Shyti <[email protected]>Cc Andrzej Hajda <[email protected]>Cc Rodrigo Vivi <[email protected]>Fixes b770bcfae9ad ("drm/i915/gt: create per-tile sysfs interface")Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt.c | 1 + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 35 ++++++++++-------------- drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 6 +--- drivers/gpu/drm/i915/gt/intel_gt_types.h | 3 ++ drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ 5 files changed, 22 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/gt/intel_gt.c +1
-0@@ -783,6 +783,7 @@ void intel_gt_driver_unregister(struct intel_gt *gt) {intel_wakeref_t wakeref; +intel_gt_sysfs_unregister (gt);intel_rps_driver_unregister (>->rps);intel_pxp_fini (>->pxp);drivers/gpu/drm/i915/gt/intel_gt_sysfs.c +15
-20@@ -24,7 +24,7 @@ bool is_object_gt(struct kobject *kobj)static struct intel_gt *kobj_to_gt (struct kobject *kobj) { - return container_of(kobj, struct kobj_gt, base)->gt; + return container_of(kobj, struct intel_gt, sysfs_gtn); } struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev,@@ -72,21 +72,19 @@ static struct attribute *id_attrs[] = { };ATTRIBUTE_GROUPS (id); -static void kobj_gt_release (struct kobject *kobj) +/* A kobject needs a release() method even if it does nothing */ +static void kobj_gtn_release (struct kobject *kobj) { -kfree (kobj); } -static struct kobj_type kobj_gt_type = { - .release = kobj_gt_release, +static struct kobj_type kobj_gtn_type = { + .release = kobj_gtn_release, .sysfs_ops = &kobj_sysfs_ops, .default_groups = id_groups, };void intel_gt_sysfs_register (struct intel_gt *gt) { -struct kobj_gt *kg; -/* * We need to make things right with the * ABI compatibility. The files were originally @@ -98,25 +96,22 @@ void intel_gt_sysfs_register(struct intel_gt *gt)if (gt_is_root (gt))intel_gt_sysfs_pm_init (gt,gt_get_parent_obj (gt)); - kg =kzalloc (sizeof (*kg),GFP_KERNEL ); -if (!kg) +/* init and xfer ownership to sysfs tree */ +if (kobject_init_and_add (>->sysfs_gtn, &kobj_gtn_type, + gt->i915->sysfs_gt,"gt%d" , gt->info.id)) goto exit_fail; -kobject_init (&kg->base, &kobj_gt_type); - kg->gt = gt; - -/* xfer ownership to sysfs tree */ -if (kobject_add (&kg->base, gt->i915->sysfs_gt,"gt%d" , gt->info.id)) - goto exit_kobj_put; - -intel_gt_sysfs_pm_init (gt, &kg->base); +intel_gt_sysfs_pm_init (gt, >->sysfs_gtn);return ; -exit_kobj_put: -kobject_put (&kg->base); - exit_fail: +kobject_put (>->sysfs_gtn);drm_warn (>->i915->drm,"failed to initialize gt%d sysfs root\n" , gt->info.id); } + +void intel_gt_sysfs_unregister (struct intel_gt *gt) +{ +kobject_put (>->sysfs_gtn); +}drivers/gpu/drm/i915/gt/intel_gt_sysfs.h +1
-5@@ -13,11 +13,6 @@struct intel_gt ; -struct kobj_gt { -struct kobject base; -struct intel_gt *gt; -}; -bool is_object_gt (struct kobject *kobj);struct drm_i915_private *kobj_to_i915 (struct kobject *kobj);@@ -28,6 +23,7 @@ intel_gt_create_kobj(struct intel_gt *gt, const char *name);void intel_gt_sysfs_register (struct intel_gt *gt); +void intel_gt_sysfs_unregister (struct intel_gt *gt);struct intel_gt *intel_gt_sysfs_get_drvdata (struct device *dev,const char *name);drivers/gpu/drm/i915/gt/intel_gt_types.h +0
-0
drivers/gpu/drm/i915/gt/intel_gt_types.h struct intel_gt { · line 227
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-0@@ -222,6 +222,9 @@ struct intel_gt { } mocs;struct intel_pxp pxp; + +/* gt/gtN sysfs */ +struct kobject sysfs_gtn;
If you put kobject as a part of intel_gt what assures you that lifetime of kobject is shorter than intel_gt? Ie its refcounter is 0 on removal of intel_gt?
Regards
Andrzej
Quoted 14 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h +0
-0};enum intel_gt_scratch_field {drivers/gpu/drm/i915/i915_sysfs.c +2
-0@@ -259,4 +259,6 @@ void i915_teardown_sysfs(struct drm_i915_private *dev_priv)device_remove_bin_file (kdev, &dpf_attrs_1);device_remove_bin_file (kdev, &dpf_attrs); + +kobject_put (dev_priv->sysfs_gt); }
Re: [Intel-gfx] [PATCH 7/9] drm/i915/gt: Fix memory leaks in per-gt sysfs
Quoted 2 lines · Andrzej Hajda
Hi Ashutosh,
Hi Andrzej,
Quoted 9 lines · Ashutosh Dixit
Quoted 8 lines
All kmalloc'd kobjects need a
kobject_put()to free memory. For example in previous code,kobj_gt_release()never gets called. The requirement ofkobject_put()now results in a slightly different code organization.Cc Andi Shyti <[email protected]>Cc Andrzej Hajda <[email protected]>Cc Rodrigo Vivi <[email protected]>Fixes b770bcfae9ad ("drm/i915/gt: create per-tile sysfs interface")
/snip/
Quoted 30 lines
Quoted 30 lines
drivers/gpu/drm/i915/gt/intel_gt_sysfs.c +4
-0+void intel_gt_sysfs_unregister (struct intel_gt *gt) +{ +kobject_put (>->sysfs_gtn); +}drivers/gpu/drm/i915/gt/intel_gt_sysfs.h +1
-4@@ -13,11 +13,6 @@struct intel_gt ; -struct kobj_gt { -struct kobject base; -struct intel_gt *gt; -}; -bool is_object_gt (struct kobject *kobj);struct drm_i915_private *kobj_to_i915 (struct kobject *kobj);@@ -28,6 +23,7 @@ intel_gt_create_kobj(struct intel_gt *gt, const char *name);void intel_gt_sysfs_register (struct intel_gt *gt); +void intel_gt_sysfs_unregister (struct intel_gt *gt);struct intel_gt *intel_gt_sysfs_get_drvdata (struct device *dev,const char *name); diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h
b/drivers/gpu/drm/i915/gt/intel_gt_types.h
index937b2e1a305e..4c72b4f983a6100644drivers/gpu/drm/i915/gt/intel_gt_types.h +0
-0@@ -222,6 +222,9 @@ struct intel_gt { } mocs;
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h struct intel_gt { · line 227
Quoted 4 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-0struct intel_pxp pxp; + +/* gt/gtN sysfs */ +struct kobject sysfs_gtn;If you put kobject as a part of
intel_gtwhat assures you that lifetime of kobject is shorter thanintel_gt? Ie its refcounter is 0 on removal ofintel_gt?
Because we are explicitly doing a kobject_put() in intel_gt_sysfs_unregister(). Which is exactly what we are *not* doing in the previous code.
Let me explain a bit about the previous code (but feel free to skip since the patch should speak for itself):
* Previously we kzalloc a 'struct kobj_gt'
* But we don't save a pointer to the 'struct kobj_gt' so we don't have the pointer to the kobject to be able to do a kobject_put() on it later
* Therefore we need to store the pointer in 'struct intel_gt'
* But if we have to put the pointer in 'struct intel_gt' we might as well put the kobject as part of 'struct intel_gt' and that also removes the need to have a 'struct kobj_gt' (kobj_to_gt() can just use container_of() to get gt from kobj).
* So I think this patch simpler/cleaner than the original code if you take the requirement for kobject_put() into account.
Thanks.
--
Ashutosh
Vivi, Rodrigo
maintainerRe: [Intel-gfx] [PATCH 3/8] drm/i915/pcode: Extend pcode functions for multiple gt's
In reply to Dixit, AshutoshQuoted 60 lines · Ashutosh
Quoted 50 lines · Rodrigo Vivi
Quoted 10 lines · Ashutosh
Quoted 9 lines · Jani Nikula
Quoted 5 lines · Ashutosh Dixit
Each gt contains an independent instance of pcode. Extend pcode functions
to interface with pcode on different gt's. Previous (GT0) pcode read/write
interfaces are preserved.Quoted 7 lines
Quoted 7 lines
The big problem here is that this hard couples display code to gt code,
while we're trying hard to go the opposite direction. It doesn't matter
that the existing interfaces are preserved as wrappers when it relies on
anintel_gtbeing available (viai915->gt0).I don't believe there is a big problem in here...
please note the
intel_pcode.his keeping the abstraction for display#define
snb_pcode_write_timeout(i915, mbox, val, fast_timeout_us, slow_timeout_ms)\
intel_gt_pcode_write_timeout(&(i915)->gt0, mbox, val, fast_timeout_us, slow_timeout_ms)#define
snb_pcode_write(i915, mbox, val)\
snb_pcode_write_timeout(i915, mbox, val, 500, 0)display only uses these macros that Ashutosh didn't touch.
Quoted 4 lines
Quoted 4 lines
Note how 'git grep
intel_gt--drivers/gpu/drm/i915/display/' matches
only 1 line.As well with the patches applied:
$ git log --oneline -1 1f58f1195478 (HEAD -> drm-tip) drm/i915/gt: Expose per-gt RPS defaults in sysfs$ git grep intel_gt -- drivers/gpu/drm/i915/display/ drivers/gpu/drm/i915/display/intel_display.c: intel_gt_set_wedged(to_gt(dev_priv));Quoted 1 line
Quoted 8 lines
Quoted 5 lines
Hi Jani, would you have suggestions about how to do this (handle pcode on
multiple gt's)? The thinking was this patch would be a straightforward way
to avoid code duplication. Also:Maybe it is just a matter of renaming the macros used by display in
intel_pcode.hto reflect that it should be used by display only?
Quoted 11 lines
In v2 I have added a patch ([PATCH 4/9] drm/i915/gt: Convert callers to
user per-gt pcode functions) which correctly calls per-gt pcode functions
where this is required. With this patch only display functions (and one
other caller) are left calling the "global scope" snb_pcode_read/write*
functions. So the legacy snb_pcode_read/write* are now basically being used
only by display. Let's see if Jani is ok with this. Thanks.
Jani is not happy with this abstraction because it still creates some dependency and also no with the name intel_gt_pcode_ in the functions...
He has some valid points.
I believe the right way to do this is to keep intel_pcode totally clean from intel_gt and only receive intel_uncore as the argument. Then, if needed we create display/intel_display_pcode and/or gt/intel_gt_pcode with the needed abstractions... but better with none I'd say.
Re: [Intel-gfx] [PATCH 7/9] drm/i915/gt: Fix memory leaks in per-gt sysfs
In reply to Dixit, AshutoshQuoted 56 lines · Ashutosh
Quoted 1 line · Andrzej Hajda
Hi Ashutosh,
Hi Andrzej,
Quoted 9 lines · Ashutosh Dixit
Quoted 8 lines
All kmalloc'd kobjects need a
kobject_put()to free memory. For example in previous code,kobj_gt_release()never gets called. The requirement ofkobject_put()now results in a slightly different code organization.Cc Andi Shyti <[email protected]>Cc Andrzej Hajda <[email protected]>Cc Rodrigo Vivi <[email protected]>Fixes b770bcfae9ad ("drm/i915/gt: create per-tile sysfs interface")/snip/
Quoted 29 lines
Quoted 29 lines
drivers/gpu/drm/i915/gt/intel_gt_sysfs.c +4
-0+void intel_gt_sysfs_unregister (struct intel_gt *gt) +{ +kobject_put (>->sysfs_gtn); +}drivers/gpu/drm/i915/gt/intel_gt_sysfs.h +1
-4@@ -13,11 +13,6 @@struct intel_gt ; -struct kobj_gt { -struct kobject base; -struct intel_gt *gt; -}; -bool is_object_gt (struct kobject *kobj);struct drm_i915_private *kobj_to_i915 (struct kobject *kobj);@@ -28,6 +23,7 @@ intel_gt_create_kobj(struct intel_gt *gt, const char *name);void intel_gt_sysfs_register (struct intel_gt *gt); +void intel_gt_sysfs_unregister (struct intel_gt *gt);struct intel_gt *intel_gt_sysfs_get_drvdata (struct device *dev,const char *name); diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h
b/drivers/gpu/drm/i915/gt/intel_gt_types.h
index937b2e1a305e..4c72b4f983a6100644drivers/gpu/drm/i915/gt/intel_gt_types.h +0
-0@@ -222,6 +222,9 @@ struct intel_gt {Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h struct intel_gt { · line 227
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-0} mocs;struct intel_pxp pxp; + +/* gt/gtN sysfs */ +struct kobject sysfs_gtn;If you put kobject as a part of
intel_gtwhat assures you that lifetime of kobject is shorter thanintel_gt? Ie its refcounter is 0 on removal ofintel_gt?Because we are explicitly doing a
kobject_put()inintel_gt_sysfs_unregister(). Which is exactly what we are *not* doing in the previous code.
Quoted 12 lines
Let me explain a bit about the previous code (but feel free to skip since the patch should speak for itself):
* Previously we kzalloc a 'structkobj_gt'
* But we don't save a pointer to the 'structkobj_gt' so we don't have the pointer to the kobject to be able to do akobject_put()on it later
* Therefore we need to store the pointer in 'structintel_gt'
* But if we have to put the pointer in 'structintel_gt' we might as well put the kobject as part of 'structintel_gt' and that also removes the need to have a 'structkobj_gt' (kobj_to_gt()can just usecontainer_of()to get gt from kobj).
* So I think this patch simpler/cleaner than the original code if you take the requirement forkobject_put()into account.
I fully agree that previous code is incorrect but I am not convinced current code is correct.
If some objects are kref-counted it means usually they can have multiple concurrent users and kobject_put does not work as traditional destructor/cleanup/unregister.
So in this particular case after calling kobject_init_and_add sysfs core can get multiple references on the object. Later, during driver unregistration kobject_put is called, but if the object is still in use by sysfs core, the object will not be destroyed/released. If the driver unregistration continues memory will be freed, leaving sysfs-core (or other users) with dangling pointers. Unless there is some additional synchronization mechanism I am not aware of.
Regards
Andrzej
Quoted 3 lines
Thanks.
--
Ashutosh
Re: [Intel-gfx] [PATCH 2/9] drm/i915/gt: Add media freq factor to per-gt sysfs
In reply to Ashutosh DixitQuoted 75 lines · Ashutosh Dixit
Expose new sysfs to program and retrieve media freq factor. Factor values of 0 (dynamic), 0.5 and 1.0 are supported via a u8.8 fixed point representation (corresponding to integer values of 0, 128 and 256 respectively).
Media freq factor is converted to
media_ratio_modefor GuC. It is programmed into GuC using H2G SLPC interface. It is retrieved from GuC through a register read. A cachedmedia_ratio_modeis maintained to preserve set values across GuC resets.This patch adds the following sysfs files to gt/gtN sysfs:
*media_freq_factor
* media_freq_factor.scaleCc Rodrigo Vivi <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Dale B Stimson <[email protected]>Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 130 ++++++++++++++++++ .../drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 6 + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 20 +++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 + .../gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 3 + 6 files changed, 161 insertions(+)drivers/gpu/drm/i915/gt/intel_gt_regs.h +1
-0@@ -732,6 +732,7 @@#define GEN6_AGGRESSIVE_TURBO (0 << 15)#define GEN9_SW_REQ_UNSLICE_RATIO_SHIFT 23#define GEN9_IGNORE_SLICE_RATIO (0 << 0) +#define GEN12_MEDIA_FREQ_RATIO REG_BIT(13)#define GEN6_RC_VIDEO_FREQ _MMIO(0xa00c)#define GEN6_RC_CTL_RC6pp_ENABLE (1 << 16)drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +28
-0@@ -557,6 +557,128 @@ static const struct attribute *freq_attrs[] = { NULL }; +/* +* Scaling for multipliers (aka frequency factors). +* The format of the value in the register is u8.8. +* +* The presentation to userspace is inspired by the perf event framework. +* See: +* Documentation/ABI/testing/sysfs-bus-event_source-devices-events +* for description of: +* /sys/bus/event_source/devices/<pmu>/events/<event>.scale +* +* Summary: Expose two sysfs files for each multiplier. +* +* 1. File <attr> contains a raw hardware value. +* 2. File <attr>.scale contains the multiplicative scale factor to be +* used by userspace to compute the actual value. +* +* So userspace knows that to get the frequency_factor it multiplies the +* provided value by the specified scale factor and vice-versa. +* +* That way there is no precision loss in the kernel interface and API +* is future proof should one day the hardware register change to u16.u16, +* on some platform. (Or any other fixed point representation.) +* +* Example: +* File <attr> contains the value 2.5, represented as u8.8 0x0280, which +* is comprised of: +* - an integer part of 2 +* - a fractional part of 0x80 (representing 0x80 / 2^8 == 0x80 / 256).
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c static const struct attribute *freq_attrs[] = { · line 597
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +10
-0+* File <attr>.scale contains a string representation of floating point +* value 0.00390625 (which is (1 / 256)). +* Userspace computes the actual value: +* 0x0280 * 0.00390625 -> 2.5 +* or converts an actual value to the value to be written into <attr>: +* 2.5 / 0.00390625 -> 0x0280 +*/ + +#define U8_8_VAL_MASK 0xffff +#define U8_8_SCALE_TO_VALUE "0.00390625"
I really like this style because it gets future proof...
Well, honestly I don't believe that for Media multipliers we will be ever move away from the GuC API. Nevertheless we have other cases in the pipeline like balancing the gt and basedie that benefits of this abstraction and it is good to have a standard api and in sync.
For this reason I'm in favor of this one here and code looks correct to me, so:
Should we split this series with only this 2 first patches so we don't get blocked on the intel_pcode refactor?
Quoted 191 lines
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +92
-0+ +static ssize_t freq_factor_scale_show (struct device *dev, +struct device_attribute *attr, +char *buff) +{ +return sysfs_emit (buff,"%s\n" ,U8_8_SCALE_TO_VALUE ); +} + +static u32 media_ratio_mode_to_factor (u32 mode) +{ +/* 0 -> 0, 1 -> 256, 2 -> 128 */ +return !mode ? mode :256 / mode; +} + +static ssize_t media_freq_factor_show (struct device *dev, +struct device_attribute *attr, +char *buff) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (dev, attr->attr.name); +struct intel_guc_slpc *slpc = >->uc.guc.slpc; +intel_wakeref_t wakeref; +u32 mode; + +/* +* Retrieve media_ratio_mode from GEN6_RPNSWREQ bit 13 set by +* GuC. GEN6_RPNSWREQ:13 value 0 represents 1:2 and 1 represents 1:1 +*/ +if (IS_XEHPSDV (gt->i915) && + slpc->media_ratio_mode ==SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL ) { +/* +* For XEHPSDV dynamic mode GEN6_RPNSWREQ:13 does not contain +* the media_ratio_mode, just return the cached media ratio +*/ + mode = slpc->media_ratio_mode; + }else { +with_intel_runtime_pm (gt->uncore->rpm, wakeref) + mode = intel_uncore_read(gt->uncore, GEN6_RPNSWREQ); + mode =REG_FIELD_GET (GEN12_MEDIA_FREQ_RATIO , mode) ? +SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_ONE : +SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_TWO ; + } + +return sysfs_emit (buff,"%u\n" ,media_ratio_mode_to_factor (mode)); +} + +static ssize_t media_freq_factor_store (struct device *dev, +struct device_attribute *attr, +const char *buff,size_t count) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (dev, attr->attr.name); +struct intel_guc_slpc *slpc = >->uc.guc.slpc; +u32 factor, mode; +int err; + + err =kstrtou32 (buff,0 , &factor); +if (err) +return err; + +for (mode =SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL ; + mode <=SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_TWO ; mode++) +if (factor ==media_ratio_mode_to_factor (mode)) +break ; + +if (mode >SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_TWO ) +return -EINVAL ; + + err =intel_guc_slpc_set_media_ratio_mode (slpc, mode); +if (!err) { + slpc->media_ratio_mode = mode; +DRM_DEBUG ("Set slpc->media_ratio_mode to %d" , mode); + } +return err ?: count; +} + +static DEVICE_ATTR_RW (media_freq_factor); +static struct device_attribute dev_attr_media_freq_factor_scale = +__ATTR (media_freq_factor.scale,0444 , freq_factor_scale_show,NULL ); + +static const struct attribute *media_perf_power_attrs[] = { + &dev_attr_media_freq_factor.attr, + &dev_attr_media_freq_factor_scale.attr, +NULL +}; +static int intel_sysfs_rps_init (struct intel_gt *gt,struct kobject *kobj,const struct attribute *const *attrs) {@@ -598,4 +720,12 @@ void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj)drm_warn (>->i915->drm,"failed to create gt%u throttle sysfs files (%pe)" , gt->info.id,ERR_PTR (ret)); + +if (HAS_MEDIA_RATIO_MODE (gt->i915) &&intel_uc_uses_guc_slpc (>->uc)) { + ret =sysfs_create_files (kobj, media_perf_power_attrs); +if (ret) +drm_warn (>->i915->drm, +"failed to create add gt%u media_perf_power_attrs sysfs (%pe)\n" , + gt->info.id,ERR_PTR (ret)); + } }drivers/gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h +6
-0@@ -122,6 +122,12 @@ enum slpc_param_id { SLPC_MAX_PARAM = 32, }; +enum slpc_media_ratio_mode { +SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL =0 , +SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_ONE =1 , +SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_TWO =2 , +}; +enum slpc_event_id {SLPC_EVENT_RESET =0 ,SLPC_EVENT_SHUTDOWN =1 ,drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +20
-0@@ -260,6 +260,7 @@ int intel_guc_slpc_init(struct intel_guc_slpc *slpc) slpc->boost_freq =0 ;atomic_set (&slpc->num_waiters,0 ); slpc->num_boosts =0 ; + slpc->media_ratio_mode =SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL ;mutex_init (&slpc->lock);INIT_WORK (&slpc->boost_work, slpc_boost_work);@@ -506,6 +507,22 @@ int intel_guc_slpc_get_min_freq(struct intel_guc_slpc *slpc, u32 *val)return ret; } +int intel_guc_slpc_set_media_ratio_mode (struct intel_guc_slpc *slpc,u32 val) +{ +struct drm_i915_private *i915 =slpc_to_i915 (slpc); +intel_wakeref_t wakeref; +int ret =0 ; + +if (!HAS_MEDIA_RATIO_MODE (i915)) +return -ENODEV ; + +with_intel_runtime_pm (&i915->runtime_pm, wakeref) + ret = slpc_set_param(slpc, +SLPC_PARAM_MEDIA_FF_RATIO_MODE , + val); +return ret; +} +void intel_guc_pm_intrmsk_enable (struct intel_gt *gt) {u32 pm_intrmsk_mbz =0 ;@@ -654,6 +671,9 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)return ret; } +/* Set cached media freq ratio mode */ +intel_guc_slpc_set_media_ratio_mode (slpc, slpc->media_ratio_mode); +return 0 ; }drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h +1
-0@@ -38,6 +38,7 @@ int intel_guc_slpc_set_boost_freq(struct intel_guc_slpc *slpc, u32 val);int intel_guc_slpc_get_max_freq (struct intel_guc_slpc *slpc,u32 *val);int intel_guc_slpc_get_min_freq (struct intel_guc_slpc *slpc,u32 *val);int intel_guc_slpc_print_info (struct intel_guc_slpc *slpc,struct drm_printer *p); +int intel_guc_slpc_set_media_ratio_mode (struct intel_guc_slpc *slpc,u32 val);void intel_guc_pm_intrmsk_enable (struct intel_gt *gt);void intel_guc_slpc_boost (struct intel_guc_slpc *slpc);void intel_guc_slpc_dec_waiters (struct intel_guc_slpc *slpc);drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h +3
-0@@ -29,6 +29,9 @@ struct intel_guc_slpc {u32 min_freq_softlimit;u32 max_freq_softlimit; +/* cached media ratio mode */ +u32 media_ratio_mode; +/* Protects set/reset of boost freq * and value of num_waiters */ Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 7/9] drm/i915/gt: Fix memory leaks in per-gt sysfs
In reply to Andrzej HajdaHi Andrzej and Ashutosh,
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines
Quoted 5 lines
b/drivers/gpu/drm/i915/gt/intel_gt_types.h
index937b2e1a305e..4c72b4f983a6100644drivers/gpu/drm/i915/gt/intel_gt_types.h +0
-0@@ -222,6 +222,9 @@ struct intel_gt {Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h struct intel_gt { · line 227
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-0} mocs;struct intel_pxp pxp; + +/* gt/gtN sysfs */ +struct kobject sysfs_gtn;If you put kobject as a part of
intel_gtwhat assures you that lifetime of kobject is shorter thanintel_gt? Ie its refcounter is 0 on removal ofintel_gt?Because we are explicitly doing a
kobject_put()inintel_gt_sysfs_unregister(). Which is exactly what we are *not* doing in the previous code.
Quoted 12 lines
Quoted 4 lines
Let me explain a bit about the previous code (but feel free to skip since the patch should speak for itself):
* Previously we kzalloc a 'structkobj_gt'
* But we don't save a pointer to the 'structkobj_gt' so we don't have theQuoted 8 lines
pointer to the kobject to be able to do a
kobject_put()on it later
* Therefore we need to store the pointer in 'structintel_gt'
* But if we have to put the pointer in 'structintel_gt' we might as well put the kobject as part of 'structintel_gt' and that also removes the need to have a 'structkobj_gt' (kobj_to_gt()can just usecontainer_of()to get gt from kobj).
* So I think this patch simpler/cleaner than the original code if you take the requirement forkobject_put()into account.
This is my oversight. This was something I completely forgot to fix but it was my intention to do and actually I had some fixes ongoing. But because this patch took too long to get in I completely forgot about it (Sujaritha was actually the first who pointed this out).
Thanks, Ashutosh for taking this.
Quoted 4 lines
I fully agree that previous code is incorrect but I am not convinced current code is correct.
If some objects are kref-counted it means usually they can have multiple concurrent users andkobject_putdoes not work as traditional
Quoted 8 lines
destructor/cleanup/unregister.
So in this particular case after callingkobject_init_and_addsysfs core can get multiple references on the object. Later, during driver unregistrationkobject_putis called, but if the object is still in use by sysfs core, the object will not be destroyed/released. If the driver unregistration continues memory will be freed, leaving sysfs-core (or other users) with dangling pointers. Unless there is some additional synchronization mechanism I am not aware of.
Thanks Andrzej for summarizing this and what you said is actually what happens. I had a similar solution developed and I had wrong pointer reference happening.
Thanks,
Andi
Re: [Intel-gfx] [PATCH 5/8] drm/i915/gt: Add media RP0/RPn to per-gt sysfs
In reply to Ashutosh DixitHi Ashutosh,
Quoted 4 lines · Ashutosh Dixit
Retrieve RP0 and RPn freq for media IP from PCODE and display in per-gt sysfs. This patch adds the following files to gt/gtN sysfs:
*media_RP0_freq_mhz
*media_RPn_freq_mhz
--------- ^
Can we keep it in lowercase ? So it will be like:media_rp0_freq_mhzmedia_rpn_freq_mhz
Or is it merged with capital letters at other sysfs path ?
Regards,
Kamil
Quoted 112 lines
Cc: Rodrigo Vivi <[email protected]>
Cc: Joonas Lahtinen <[email protected]>
Original-author: Dale B Stimson <[email protected]>Signed-off-by Dale B Stimson <[email protected]>Signed-off-by Ashutosh Dixit <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 47 +++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 15 +++++++ 2 files changed, 62 insertions(+)drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +47
-0@@ -12,6 +12,7 @@#include "i915_sysfs.h" #include "intel_gt.h" #include "intel_gt_regs.h" +#include "intel_pcode.h" #include "intel_gt_sysfs.h" #include "intel_gt_sysfs_pm.h" #include "intel_rc6.h" @@ -669,13 +670,59 @@ static ssize_t media_freq_factor_store(struct device *dev,return err ?: count; } +static ssize_t media_RP0_freq_mhz_show (struct device *dev, +struct device_attribute *attr, +char *buff) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (dev, attr->attr.name); +u32 val; +int err; + + err =__intel_gt_pcode_read (gt,XEHPSDV_PCODE_FREQUENCY_CONFIG , +PCODE_MBOX_FC_SC_READ_FUSED_P0 , +PCODE_MBOX_DOMAIN_MEDIAFF , &val); + +if (err) +return err; + +/* data_out - Fused P0 for domain ID in units of 50 MHz */ + val *=GT_FREQUENCY_MULTIPLIER ; + +return sysfs_emit (buff,"%u\n" , val); +} + +static ssize_t media_RPn_freq_mhz_show (struct device *dev, +struct device_attribute *attr, +char *buff) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (dev, attr->attr.name); +u32 val; +int err; + + err =__intel_gt_pcode_read (gt,XEHPSDV_PCODE_FREQUENCY_CONFIG , +PCODE_MBOX_FC_SC_READ_FUSED_PN , +PCODE_MBOX_DOMAIN_MEDIAFF , &val); + +if (err) +return err; + +/* data_out - Fused P0 for domain ID in units of 50 MHz */ + val *=GT_FREQUENCY_MULTIPLIER ; + +return sysfs_emit (buff,"%u\n" , val); +} +static DEVICE_ATTR_RW (media_freq_factor);static struct device_attribute dev_attr_media_freq_factor_scale =__ATTR (media_freq_factor.scale,0444 , freq_factor_scale_show,NULL ); +static DEVICE_ATTR_RO (media_RP0_freq_mhz); +static DEVICE_ATTR_RO (media_RPn_freq_mhz);static const struct attribute *media_perf_power_attrs[] = { &dev_attr_media_freq_factor.attr, &dev_attr_media_freq_factor_scale.attr, + &dev_attr_media_RP0_freq_mhz.attr, + &dev_attr_media_RPn_freq_mhz.attr,NULL };drivers/gpu/drm/i915/i915_reg.h +15
-0@@ -6753,6 +6753,21 @@#define DG1_UNCORE_GET_INIT_STATUS 0x0#define DG1_UNCORE_INIT_STATUS_COMPLETE 0x1#define GEN12_PCODE_READ_SAGV_BLOCK_TIME_US 0x23 +#define XEHPSDV_PCODE_FREQUENCY_CONFIG 0x6e/* xehpsdv, pvc */ +/* XEHPSDV_PCODE_FREQUENCY_CONFIG sub-commands (param1) */ +#define PCODE_MBOX_FC_SC_READ_FUSED_P0 0x0 +#define PCODE_MBOX_FC_SC_READ_FUSED_PN 0x1 +/* PCODE_MBOX_DOMAIN_* - mailbox domain IDs */ +/* XEHPSDV_PCODE_FREQUENCY_CONFIG param2 */ +#define PCODE_MBOX_DOMAIN_NONE 0x0 +#define PCODE_MBOX_DOMAIN_GT 0x1 +#define PCODE_MBOX_DOMAIN_HBM 0x2 +#define PCODE_MBOX_DOMAIN_MEDIAFF 0x3 +#define PCODE_MBOX_DOMAIN_MEDIA_SAMPLER 0x4 +#define PCODE_MBOX_DOMAIN_SYSTOLIC_ARRAY 0x5 +#define PCODE_MBOX_DOMAIN_CHIPLET 0x6 +#define PCODE_MBOX_DOMAIN_BASE_CHIPLET_LINK 0x7 +#define PCODE_MBOX_DOMAIN_BASE 0x8#define GEN6_PCODE_DATA _MMIO(0x138128)#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 2/9] drm/i915/gt: Add media freq factor to per-gt sysfs
In reply to Rodrigo ViviQuoted 12 lines · Rodrigo Vivi
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c static const struct attribute *freq_attrs[] = { · line 597
Quoted 2 lines · Ashutosh Dixit
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +2
-0+#define U8_8_VAL_MASK 0xffff +#define U8_8_SCALE_TO_VALUE "0.00390625"I really like this style because it gets future proof...
Well, honestly I don't believe that for Media multipliers we will be ever move away from the GuC API. Nevertheless we have other cases in the pipeline like balancing the gt and basedie that benefits of this abstraction and it is good to have a standard api and in sync.
Quoted 4 lines
For this reason I'm in favor of this one here and code looks correct to me, so:
Reviewed-by Rodrigo Vivi <[email protected]>
Thanks.
Quoted 2 lines
Should we split this series with only this 2 first patches so we don't get blocked on the
intel_pcoderefactor?
I have posted a series with with just the first 2 patches here:
https://patchwork.freedesktop.org/series/103110/
We can look at merging this after it goes through CI.
Thanks.
--
Ashutosh
Re: [Intel-gfx] [PATCH 5/8] drm/i915/gt: Add media RP0/RPn to per-gt sysfs
In reply to Kamil KoniecznyQuoted 2 lines · Kamil Konieczny
Hi Ashutosh,
Hi Kamil,
Quoted 11 lines · Ashutosh Dixit
Quoted 4 lines
Retrieve RP0 and RPn freq for media IP from PCODE and display in per-gt sysfs. This patch adds the following files to gt/gtN sysfs:
*media_RP0_freq_mhz
*media_RPn_freq_mhz--------- ^
Can we keep it in lowercase ? So it will be like:media_rp0_freq_mhzmedia_rpn_freq_mhzOr is it merged with capital letters at other sysfs path ?
Unfortunately that is the case as we can see below:
$ ls -l /sys/class/drm/card0/gt/gt0/rps* -r--r--r-- 1 root root 4096 Jan 20 19:55 rps_RP0_freq_mhz -r--r--r-- 1 root root 4096 Jan 20 19:55 rps_RP1_freq_mhz -r--r--r-- 1 root root 4096 Jan 20 19:55 rps_RPn_freq_mhz
We could have have discussed it before the other RPS patches were merged but I think at this point we'd need to maintain consistency with the previous naming scheme (the frequencies are actually known as RP0/RPn).
Thanks.
--
Ashutosh
Jani Nikula
maintainerRe: [Intel-gfx] [PATCH 3/8] drm/i915/pcode: Extend pcode functions for multiple gt's
In reply to Vivi, RodrigoQuoted 77 lines · Rodrigo
Quoted 60 lines · Ashutosh
Quoted 50 lines · Rodrigo Vivi
Quoted 10 lines · Ashutosh
Quoted 9 lines · Jani Nikula
Quoted 5 lines · Ashutosh Dixit
Each gt contains an independent instance of pcode. Extend pcode functions
to interface with pcode on different gt's. Previous (GT0) pcode read/write
interfaces are preserved.Quoted 7 lines
Quoted 7 lines
The big problem here is that this hard couples display code to gt code,
while we're trying hard to go the opposite direction. It doesn't matter
that the existing interfaces are preserved as wrappers when it relies on
anintel_gtbeing available (viai915->gt0).I don't believe there is a big problem in here...
please note the
intel_pcode.his keeping the abstraction for display#define
snb_pcode_write_timeout(i915, mbox, val, fast_timeout_us, slow_timeout_ms)\
intel_gt_pcode_write_timeout(&(i915)->gt0, mbox, val, fast_timeout_us, slow_timeout_ms)#define
snb_pcode_write(i915, mbox, val)\
snb_pcode_write_timeout(i915, mbox, val, 500, 0)display only uses these macros that Ashutosh didn't touch.
Quoted 4 lines
Quoted 4 lines
Note how 'git grep
intel_gt--drivers/gpu/drm/i915/display/' matches
only 1 line.As well with the patches applied:
$ git log --oneline -1 1f58f1195478 (HEAD -> drm-tip) drm/i915/gt: Expose per-gt RPS defaults in sysfs$ git grep intel_gt -- drivers/gpu/drm/i915/display/ drivers/gpu/drm/i915/display/intel_display.c: intel_gt_set_wedged(to_gt(dev_priv));Quoted 1 line
Quoted 8 lines
Quoted 5 lines
Hi Jani, would you have suggestions about how to do this (handle pcode on
multiple gt's)? The thinking was this patch would be a straightforward way
to avoid code duplication. Also:Maybe it is just a matter of renaming the macros used by display in
intel_pcode.hto reflect that it should be used by display only?Quoted 11 lines
In v2 I have added a patch ([PATCH 4/9] drm/i915/gt: Convert callers to
user per-gt pcode functions) which correctly calls per-gt pcode functions
where this is required. With this patch only display functions (and one
other caller) are left calling the "global scope" snb_pcode_read/write*
functions. So the legacy snb_pcode_read/write* are now basically being used
only by display. Let's see if Jani is ok with this. Thanks.Jani is not happy with this abstraction because it still creates some dependency and also no with the name
intel_gt_pcode_in the functions...
Quoted 6 lines
He has some valid points.
I believe the right way to do this is to keep
intel_pcodetotally clean fromintel_gtand only receiveintel_uncoreas the argument. Then, if needed we create display/intel_display_pcode and/or gt/intel_gt_pcode with the needed abstractions... but better with none I'd say.
I'd prefer it if you only passed uncore, not gt, to the pcode functions.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 7/9] drm/i915/gt: Fix memory leaks in per-gt sysfs
In reply to Andi ShytiQuoted 54 lines · Andi Shyti
Hi Andrzej and Ashutosh,
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines
Quoted 5 lines
b/drivers/gpu/drm/i915/gt/intel_gt_types.h
index937b2e1a305e..4c72b4f983a6100644drivers/gpu/drm/i915/gt/intel_gt_types.h +0
-0@@ -222,6 +222,9 @@ struct intel_gt {Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h struct intel_gt { · line 227
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-0} mocs;struct intel_pxp pxp; + +/* gt/gtN sysfs */ +struct kobject sysfs_gtn;If you put kobject as a part of
intel_gtwhat assures you that lifetime of kobject is shorter thanintel_gt? Ie its refcounter is 0 on removal ofintel_gt?Because we are explicitly doing a
kobject_put()inintel_gt_sysfs_unregister(). Which is exactly what we are *not* doing in the previous code.Quoted 12 lines
Quoted 4 lines
Let me explain a bit about the previous code (but feel free to skip since the patch should speak for itself):
* Previously we kzalloc a 'structkobj_gt'
* But we don't save a pointer to the 'structkobj_gt' so we don't have theQuoted 8 lines
pointer to the kobject to be able to do a
kobject_put()on it later
* Therefore we need to store the pointer in 'structintel_gt'
* But if we have to put the pointer in 'structintel_gt' we might as well put the kobject as part of 'structintel_gt' and that also removes the need to have a 'structkobj_gt' (kobj_to_gt()can just usecontainer_of()to get gt from kobj).
* So I think this patch simpler/cleaner than the original code if you take the requirement forkobject_put()into account.This is my oversight. This was something I completely forgot to fix but it was my intention to do and actually I had some fixes ongoing. But because this patch took too long to get in I completely forgot about it (Sujaritha was actually the first who pointed this out).
Thanks, Ashutosh for taking this.
Quoted 4 lines
I fully agree that previous code is incorrect but I am not convinced current code is correct.
If some objects are kref-counted it means usually they can have multiple concurrent users andkobject_putdoes not work as traditionalQuoted 8 lines
destructor/cleanup/unregister.
So in this particular case after callingkobject_init_and_addsysfs core can get multiple references on the object. Later, during driver unregistrationkobject_putis called, but if the object is still in use by sysfs core, the object will not be destroyed/released. If the driver unregistration continues memory will be freed, leaving sysfs-core (or other users) with dangling pointers. Unless there is some additional synchronization mechanism I am not aware of.
Quoted 3 lines
Thanks Andrzej for summarizing this and what you said is actually what happens. I had a similar solution developed and I had wrong pointer reference happening.
Hi Andrzej/Andi,
I did do some research into kobject's and such before writing this patch and based on that I believe the patch is correct. Presenting some evidence below.
The patch is verified by:
a. Putting a printk in the release() method when it exists (it does for
sysfs_gtn kobject)
b. Enabling dynamic prints for lib/kobject.c
For example, with the following:
# echo 'file kobject.c +p' > /sys/kernel/debug/dynamic_debug/control # echo -n "0000:03:00.0" > /sys/bus/pci/drivers/i915/unbind
We see this in dmesg (see kobject_cleanup() called from kobject_put()):
[ 1034.930007] kobject: '.defaults' (ffff88817130a640): kobject_cleanup, parent ffff8882262b5778 [ 1034.930020] kobject: '.defaults' (ffff88817130a640): auto cleanup kobject_del [ 1034.930336] kobject: '.defaults' (ffff88817130a640): calling ktype release [ 1034.930340] kobject: (ffff88817130a640): dynamic_kobj_release [ 1034.930354] kobject: '.defaults': free name [ 1034.930366] kobject: 'gt0' (ffff8882262b5778): kobject_cleanup, parent ffff88817130a240 [ 1034.930371] kobject: 'gt0' (ffff8882262b5778): auto cleanup kobject_del [ 1034.931930] kobject: 'gt0' (ffff8882262b5778): calling ktype release [ 1034.931936] kobject: 'gt0': free name [ 1034.958004] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): fill_kobj_path: path = '/devices/i915_0000_03_00.0' [ 1034.958155] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): kobject_cleanup, parent 0000000000000000 [ 1034.958162] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): calling ktype release [ 1034.958188] kobject: 'i915_0000_03_00.0': free name [ 1034.958729] kobject: 'gt' (ffff88817130a240): kobject_cleanup, parent ffff8881160c5000 [ 1034.958736] kobject: 'gt' (ffff88817130a240): auto cleanup kobject_del [ 1034.958762] kobject: 'gt' (ffff88817130a240): calling ktype release [ 1034.958767] kobject: (ffff88817130a240): dynamic_kobj_release [ 1034.958778] kobject: 'gt': free name
We have the following directory structure (one of the patches is creating /sys/class/drm/card0/gt/gt0/.defaults):
/sys/class/drm/card0/gt
|-gt0
|-.defaultsAnd we see from dmesg .defaults, gt0 and gt kobjects being cleaned up in that order.
Looking at lib/kobject.c there are several interesting things:
* Three subsystems are involved: kobject, sysfs and kernfs.
* A child kobject takes a reference on the parent, so we must do a kobject_put() on the child before doing kobject_put() on the parent (creating a child kobject creates a corresponding sub-directory in sysfs).
* Adding files to a sysfs directory does not take a reference on the kobject, only on the parent kernfs_node.
* Since we do call sysfs_create_group() (for RC6) ordinarily we will need to call sysfs_remove_group() but this does not seem to be needed because we are not creating a directory for the group (by providing a name for the group). So sysfs_create_group() is equivalent to sysfs_create_files(). So it seems we don't need sysfs_remove_group().
* Similarly it appears files created by sysfs_create_files() do not need to be removed by sysfs_remove_files() because __kobject_del() and sysfs_remove_dir() called from kobject_cleanup() do that for us (the comment in kobject_cleanup() says "remove from sysfs if the caller did not do it").
Based on the above it is clear that no one except a child kobject takes a reference on the parent kobject and as long as we kobject_put() them in the correct order (as we seem to be doing based on dmesg trace above) we should be ok.
Also what is followed in this patch is a fairly standard coding pattern. Further, in case of any errors we generally see failure to unload the module etc. and none of these things are being observed, module reload works fine.
I hope these points are helpful in completing review of the patch.
Thanks.
--
Ashutosh
Re: [Intel-gfx] [PATCH 7/9] drm/i915/gt: Fix memory leaks in per-gt sysfs
Quoted 131 lines · Ashutosh
Quoted 51 lines · Andi Shyti
Hi Andrzej and Ashutosh,
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines
Quoted 5 lines
b/drivers/gpu/drm/i915/gt/intel_gt_types.h
index937b2e1a305e..4c72b4f983a6100644drivers/gpu/drm/i915/gt/intel_gt_types.h +0
-0@@ -222,6 +222,9 @@ struct intel_gt {Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h struct intel_gt { · line 227
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-0} mocs;struct intel_pxp pxp; + +/* gt/gtN sysfs */ +struct kobject sysfs_gtn;If you put kobject as a part of
intel_gtwhat assures you that lifetime of kobject is shorter thanintel_gt? Ie its refcounter is 0 on removal ofintel_gt?Because we are explicitly doing a
kobject_put()inintel_gt_sysfs_unregister(). Which is exactly what we are *not* doing in the previous code.Quoted 12 lines
Quoted 4 lines
Let me explain a bit about the previous code (but feel free to skip since the patch should speak for itself):
* Previously we kzalloc a 'structkobj_gt'
* But we don't save a pointer to the 'structkobj_gt' so we don't have theQuoted 8 lines
pointer to the kobject to be able to do a
kobject_put()on it later
* Therefore we need to store the pointer in 'structintel_gt'
* But if we have to put the pointer in 'structintel_gt' we might as well put the kobject as part of 'structintel_gt' and that also removes the need to have a 'structkobj_gt' (kobj_to_gt()can just usecontainer_of()to get gt from kobj).
* So I think this patch simpler/cleaner than the original code if you take the requirement forkobject_put()into account.This is my oversight. This was something I completely forgot to fix but it was my intention to do and actually I had some fixes ongoing. But because this patch took too long to get in I completely forgot about it (Sujaritha was actually the first who pointed this out).
Thanks, Ashutosh for taking this.
Quoted 4 lines
I fully agree that previous code is incorrect but I am not convinced current code is correct.
If some objects are kref-counted it means usually they can have multiple concurrent users andkobject_putdoes not work as traditionalQuoted 8 lines
destructor/cleanup/unregister.
So in this particular case after callingkobject_init_and_addsysfs core can get multiple references on the object. Later, during driver unregistrationkobject_putis called, but if the object is still in use by sysfs core, the object will not be destroyed/released. If the driver unregistration continues memory will be freed, leaving sysfs-core (or other users) with dangling pointers. Unless there is some additional synchronization mechanism I am not aware of.Quoted 3 lines
Thanks Andrzej for summarizing this and what you said is actually what happens. I had a similar solution developed and I had wrong pointer reference happening.
Hi Andrzej/Andi,
I did do some research into kobject's and such before writing this patch and based on that I believe the patch is correct. Presenting some evidence below.
The patch is verified by:
a. Putting a printk in the
release()method when it exists (it does for
sysfs_gtnkobject)
b. Enabling dynamic prints forlib/kobject.cFor example, with the following:
# echo 'file kobject.c +p' > /sys/kernel/debug/dynamic_debug/control # echo -n "0000:03:00.0" > /sys/bus/pci/drivers/i915/unbindWe see this in dmesg (see
kobject_cleanup()called fromkobject_put()):[ 1034.930007] kobject: '.defaults' (ffff88817130a640): kobject_cleanup, parent ffff8882262b5778 [ 1034.930020] kobject: '.defaults' (ffff88817130a640): auto cleanup kobject_del [ 1034.930336] kobject: '.defaults' (ffff88817130a640): calling ktype release [ 1034.930340] kobject: (ffff88817130a640): dynamic_kobj_release [ 1034.930354] kobject: '.defaults': free name [ 1034.930366] kobject: 'gt0' (ffff8882262b5778): kobject_cleanup, parent ffff88817130a240 [ 1034.930371] kobject: 'gt0' (ffff8882262b5778): auto cleanup kobject_del [ 1034.931930] kobject: 'gt0' (ffff8882262b5778): calling ktype release [ 1034.931936] kobject: 'gt0': free name [ 1034.958004] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): fill_kobj_path: path = '/devices/i915_0000_03_00.0' [ 1034.958155] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): kobject_cleanup, parent 0000000000000000 [ 1034.958162] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): calling ktype release [ 1034.958188] kobject: 'i915_0000_03_00.0': free name [ 1034.958729] kobject: 'gt' (ffff88817130a240): kobject_cleanup, parent ffff8881160c5000 [ 1034.958736] kobject: 'gt' (ffff88817130a240): auto cleanup kobject_del [ 1034.958762] kobject: 'gt' (ffff88817130a240): calling ktype release [ 1034.958767] kobject: (ffff88817130a240): dynamic_kobj_release [ 1034.958778] kobject: 'gt': free nameWe have the following directory structure (one of the patches is creating
/sys/class/drm/card0/gt/gt0/.defaults):/sys/class/drm/card0/gt |-gt0 |-.defaultsAnd we see from dmesg .defaults, gt0 and gt kobjects being cleaned up in that order.
Looking at
lib/kobject.cthere are several interesting things:* Three subsystems are involved: kobject, sysfs and kernfs.
* A child kobject takes a reference on the parent, so we must do a
kobject_put()on the child before doingkobject_put()on the parent (creating a child kobject creates a corresponding sub-directory in sysfs).* Adding files to a sysfs directory does not take a reference on the kobject, only on the parent
kernfs_node.* Since we do call
sysfs_create_group()(for RC6) ordinarily we will need to callsysfs_remove_group()but this does not seem to be needed because we are not creating a directory for the group (by providing a name for the group). Sosysfs_create_group()is equivalent tosysfs_create_files(). So it seems we don't needsysfs_remove_group().* Similarly it appears files created by
sysfs_create_files()do not need to be removed bysysfs_remove_files()because__kobject_del()andsysfs_remove_dir()called fromkobject_cleanup()do that for us (the comment inkobject_cleanup()says "remove from sysfs if the caller did not do it").Based on the above it is clear that no one except a child kobject takes a reference on the parent kobject and as long as we
kobject_put()them in the correct order (as we seem to be doing based on dmesg trace above) we should be ok.
Quoted 6 lines
Also what is followed in this patch is a fairly standard coding pattern. Further, in case of any errors we generally see failure to unload the module etc. and none of these things are being observed, module reload works fine.
I hope these points are helpful in completing review of the patch.
See [1], it is quite old, so maybe it is not valid anymore, but I see no code proving sth has changed. Also current doc says also [2] similar things, especially:
"Once you registered your kobject via kobject_add(), you must never use kfree() to free it directly"
[1]: https://lwn.net/Articles/36850/
[2]: https://elixir.bootlin.com/linux/v5.18-rc4/source/Documentation/core-api/kobject.rst#L246
Regards
Andrzej
Quoted 4 lines
Thanks.
--
Ashutosh
Re: [Intel-gfx] [PATCH 7/9] drm/i915/gt: Fix memory leaks in per-gt sysfs
Quoted 137 lines · Andrzej Hajda
Quoted 136 lines · Ashutosh
Quoted 51 lines · Andi Shyti
Hi Andrzej and Ashutosh,
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines
Quoted 5 lines
b/drivers/gpu/drm/i915/gt/intel_gt_types.h
index937b2e1a305e..4c72b4f983a6100644drivers/gpu/drm/i915/gt/intel_gt_types.h +0
-0@@ -222,6 +222,9 @@ struct intel_gt {Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h struct intel_gt { · line 226
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-0} mocs;struct intel_pxp pxp; + +/* gt/gtN sysfs */ +struct kobject sysfs_gtn;If you put kobject as a part of
intel_gtwhat assures you that lifetime of kobject is shorter thanintel_gt? Ie its refcounter is 0 on removal ofintel_gt?Because we are explicitly doing a
kobject_put()inintel_gt_sysfs_unregister(). Which is exactly what we are *not* doing in the previous code.Quoted 12 lines
Quoted 4 lines
Let me explain a bit about the previous code (but feel free to skip since the patch should speak for itself):
* Previously we kzalloc a 'structkobj_gt'
* But we don't save a pointer to the 'structkobj_gt' so we don't have theQuoted 8 lines
pointer to the kobject to be able to do a
kobject_put()on it later
* Therefore we need to store the pointer in 'structintel_gt'
* But if we have to put the pointer in 'structintel_gt' we might as well put the kobject as part of 'structintel_gt' and that also removes the need to have a 'structkobj_gt' (kobj_to_gt()can just usecontainer_of()to get gt from kobj).
* So I think this patch simpler/cleaner than the original code if you take the requirement forkobject_put()into account.This is my oversight. This was something I completely forgot to fix but it was my intention to do and actually I had some fixes ongoing. But because this patch took too long to get in I completely forgot about it (Sujaritha was actually the first who pointed this out).
Thanks, Ashutosh for taking this.
Quoted 4 lines
I fully agree that previous code is incorrect but I am not convinced current code is correct.
If some objects are kref-counted it means usually they can have multiple concurrent users andkobject_putdoes not work as traditionalQuoted 8 lines
destructor/cleanup/unregister.
So in this particular case after callingkobject_init_and_addsysfs core can get multiple references on the object. Later, during driver unregistrationkobject_putis called, but if the object is still in use by sysfs core, the object will not be destroyed/released. If the driver unregistration continues memory will be freed, leaving sysfs-core (or other users) with dangling pointers. Unless there is some additional synchronization mechanism I am not aware of.Quoted 3 lines
Thanks Andrzej for summarizing this and what you said is actually what happens. I had a similar solution developed and I had wrong pointer reference happening.
Hi Andrzej/Andi,
I did do some research into kobject's and such before writing this patch and based on that I believe the patch is correct. Presenting some evidence below.
The patch is verified by:
a. Putting a printk in the
release()method when it exists (it does for
sysfs_gtnkobject)
b. Enabling dynamic prints forlib/kobject.cFor example, with the following:
# echo 'file kobject.c +p' > /sys/kernel/debug/dynamic_debug/control # echo -n "0000:03:00.0" > /sys/bus/pci/drivers/i915/unbindWe see this in dmesg (see
kobject_cleanup()called fromkobject_put()):[ 1034.930007] kobject: '.defaults' (ffff88817130a640): kobject_cleanup, parent ffff8882262b5778 [ 1034.930020] kobject: '.defaults' (ffff88817130a640): auto cleanup kobject_del [ 1034.930336] kobject: '.defaults' (ffff88817130a640): calling ktype release [ 1034.930340] kobject: (ffff88817130a640): dynamic_kobj_release [ 1034.930354] kobject: '.defaults': free name [ 1034.930366] kobject: 'gt0' (ffff8882262b5778): kobject_cleanup, parent ffff88817130a240 [ 1034.930371] kobject: 'gt0' (ffff8882262b5778): auto cleanup kobject_del [ 1034.931930] kobject: 'gt0' (ffff8882262b5778): calling ktype release [ 1034.931936] kobject: 'gt0': free name [ 1034.958004] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): fill_kobj_path: path = '/devices/i915_0000_03_00.0' [ 1034.958155] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): kobject_cleanup, parent 0000000000000000 [ 1034.958162] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): calling ktype release [ 1034.958188] kobject: 'i915_0000_03_00.0': free name [ 1034.958729] kobject: 'gt' (ffff88817130a240): kobject_cleanup, parent ffff8881160c5000 [ 1034.958736] kobject: 'gt' (ffff88817130a240): auto cleanup kobject_del [ 1034.958762] kobject: 'gt' (ffff88817130a240): calling ktype release [ 1034.958767] kobject: (ffff88817130a240): dynamic_kobj_release [ 1034.958778] kobject: 'gt': free nameWe have the following directory structure (one of the patches is creating
/sys/class/drm/card0/gt/gt0/.defaults):/sys/class/drm/card0/gt |-gt0 |-.defaultsAnd we see from dmesg .defaults, gt0 and gt kobjects being cleaned up in that order.
Looking at
lib/kobject.cthere are several interesting things:* Three subsystems are involved: kobject, sysfs and kernfs.
* A child kobject takes a reference on the parent, so we must do a
kobject_put()on the child before doingkobject_put()on the parent (creating a child kobject creates a corresponding sub-directory in sysfs).* Adding files to a sysfs directory does not take a reference on the kobject, only on the parent
kernfs_node.* Since we do call
sysfs_create_group()(for RC6) ordinarily we will need to callsysfs_remove_group()but this does not seem to be needed because we are not creating a directory for the group (by providing a name for the group). Sosysfs_create_group()is equivalent tosysfs_create_files(). So it seems we don't needsysfs_remove_group().* Similarly it appears files created by
sysfs_create_files()do not need to be removed bysysfs_remove_files()because__kobject_del()andsysfs_remove_dir()called fromkobject_cleanup()do that for us (the comment inkobject_cleanup()says "remove from sysfs if the caller did not do it").Based on the above it is clear that no one except a child kobject takes a reference on the parent kobject and as long as we
kobject_put()them in the correct order (as we seem to be doing based on dmesg trace above) we should be ok.Also what is followed in this patch is a fairly standard coding pattern. Further, in case of any errors we generally see failure to unload the module etc. and none of these things are being observed, module reload works fine.
Quoted 4 lines
Quoted 1 line
I hope these points are helpful in completing review of the patch.
See [1], it is quite old, so maybe it is not valid anymore, but I see no code proving sth has changed.
Hi Andrzej,
A lot has changed since that article from 2003 (for 2.5 kernel). For instance there is kernfs (as I mention above):
https://lwn.net/Articles/571590/
A process having a sysfs file open today in my view will result in the following:
* It will take a reference on kernfs_node (not on kobject as was the case in kernel 2.5 in [1])
* An open file will prevent the module from being unloaded (not the kernel crashing as in 2.5 in [1])
So this is what I would expect with today's kernel. I am not seeing anything we've done here which violates anything in [1] or [2].
Quoted 3 lines
Also current doc says also [2] similar things, especially:
"Once you registered your kobject viakobject_add(), you must never usekfree()to free it directly"
Correct, we are using kobject_put(), not kfree'ing the kobject.
Thanks.
--
Ashutosh
Re: [Intel-gfx] [PATCH 7/9] drm/i915/gt: Fix memory leaks in per-gt sysfs
Quoted 146 lines · Ashutosh
Quoted 132 lines · Andrzej Hajda
Quoted 131 lines · Ashutosh
Quoted 51 lines · Andi Shyti
Hi Andrzej and Ashutosh,
Quoted 17 lines
Quoted 17 lines
Quoted 5 lines
Quoted 5 lines
b/drivers/gpu/drm/i915/gt/intel_gt_types.h
index937b2e1a305e..4c72b4f983a6100644drivers/gpu/drm/i915/gt/intel_gt_types.h +0
-0@@ -222,6 +222,9 @@ struct intel_gt {Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h struct intel_gt { · line 226
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-0} mocs;struct intel_pxp pxp; + +/* gt/gtN sysfs */ +struct kobject sysfs_gtn;If you put kobject as a part of
intel_gtwhat assures you that lifetime of kobject is shorter thanintel_gt? Ie its refcounter is 0 on removal ofintel_gt?Because we are explicitly doing a
kobject_put()inintel_gt_sysfs_unregister(). Which is exactly what we are *not* doing in the previous code.Quoted 12 lines
Quoted 4 lines
Let me explain a bit about the previous code (but feel free to skip since the patch should speak for itself):
* Previously we kzalloc a 'structkobj_gt'
* But we don't save a pointer to the 'structkobj_gt' so we don't have theQuoted 8 lines
pointer to the kobject to be able to do a
kobject_put()on it later
* Therefore we need to store the pointer in 'structintel_gt'
* But if we have to put the pointer in 'structintel_gt' we might as well put the kobject as part of 'structintel_gt' and that also removes the need to have a 'structkobj_gt' (kobj_to_gt()can just usecontainer_of()to get gt from kobj).
* So I think this patch simpler/cleaner than the original code if you take the requirement forkobject_put()into account.This is my oversight. This was something I completely forgot to fix but it was my intention to do and actually I had some fixes ongoing. But because this patch took too long to get in I completely forgot about it (Sujaritha was actually the first who pointed this out).
Thanks, Ashutosh for taking this.
Quoted 4 lines
I fully agree that previous code is incorrect but I am not convinced current code is correct.
If some objects are kref-counted it means usually they can have multiple concurrent users andkobject_putdoes not work as traditionalQuoted 8 lines
destructor/cleanup/unregister.
So in this particular case after callingkobject_init_and_addsysfs core can get multiple references on the object. Later, during driver unregistrationkobject_putis called, but if the object is still in use by sysfs core, the object will not be destroyed/released. If the driver unregistration continues memory will be freed, leaving sysfs-core (or other users) with dangling pointers. Unless there is some additional synchronization mechanism I am not aware of.Quoted 3 lines
Thanks Andrzej for summarizing this and what you said is actually what happens. I had a similar solution developed and I had wrong pointer reference happening.
Hi Andrzej/Andi,
I did do some research into kobject's and such before writing this patch and based on that I believe the patch is correct. Presenting some evidence below.
The patch is verified by:
a. Putting a printk in the
release()method when it exists (it does for
sysfs_gtnkobject)
b. Enabling dynamic prints forlib/kobject.cFor example, with the following:
# echo 'file kobject.c +p' > /sys/kernel/debug/dynamic_debug/control # echo -n "0000:03:00.0" > /sys/bus/pci/drivers/i915/unbindWe see this in dmesg (see
kobject_cleanup()called fromkobject_put()):[ 1034.930007] kobject: '.defaults' (ffff88817130a640): kobject_cleanup, parent ffff8882262b5778 [ 1034.930020] kobject: '.defaults' (ffff88817130a640): auto cleanup kobject_del [ 1034.930336] kobject: '.defaults' (ffff88817130a640): calling ktype release [ 1034.930340] kobject: (ffff88817130a640): dynamic_kobj_release [ 1034.930354] kobject: '.defaults': free name [ 1034.930366] kobject: 'gt0' (ffff8882262b5778): kobject_cleanup, parent ffff88817130a240 [ 1034.930371] kobject: 'gt0' (ffff8882262b5778): auto cleanup kobject_del [ 1034.931930] kobject: 'gt0' (ffff8882262b5778): calling ktype release [ 1034.931936] kobject: 'gt0': free name [ 1034.958004] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): fill_kobj_path: path = '/devices/i915_0000_03_00.0' [ 1034.958155] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): kobject_cleanup, parent 0000000000000000 [ 1034.958162] kobject: 'i915_0000_03_00.0' (ffff88810e1f8800): calling ktype release [ 1034.958188] kobject: 'i915_0000_03_00.0': free name [ 1034.958729] kobject: 'gt' (ffff88817130a240): kobject_cleanup, parent ffff8881160c5000 [ 1034.958736] kobject: 'gt' (ffff88817130a240): auto cleanup kobject_del [ 1034.958762] kobject: 'gt' (ffff88817130a240): calling ktype release [ 1034.958767] kobject: (ffff88817130a240): dynamic_kobj_release [ 1034.958778] kobject: 'gt': free nameWe have the following directory structure (one of the patches is creating
/sys/class/drm/card0/gt/gt0/.defaults):/sys/class/drm/card0/gt |-gt0 |-.defaultsAnd we see from dmesg .defaults, gt0 and gt kobjects being cleaned up in that order.
Looking at
lib/kobject.cthere are several interesting things:* Three subsystems are involved: kobject, sysfs and kernfs.
* A child kobject takes a reference on the parent, so we must do a
kobject_put()on the child before doingkobject_put()on the parent (creating a child kobject creates a corresponding sub-directory in sysfs).* Adding files to a sysfs directory does not take a reference on the kobject, only on the parent
kernfs_node.* Since we do call
sysfs_create_group()(for RC6) ordinarily we will need to callsysfs_remove_group()but this does not seem to be needed because we are not creating a directory for the group (by providing a name for the group). Sosysfs_create_group()is equivalent tosysfs_create_files(). So it seems we don't needsysfs_remove_group().* Similarly it appears files created by
sysfs_create_files()do not need to be removed bysysfs_remove_files()because__kobject_del()andsysfs_remove_dir()called fromkobject_cleanup()do that for us (the comment inkobject_cleanup()says "remove from sysfs if the caller did not do it").Based on the above it is clear that no one except a child kobject takes a reference on the parent kobject and as long as we
kobject_put()them in the correct order (as we seem to be doing based on dmesg trace above) we should be ok.Quoted 8 lines
Quoted 6 lines
Also what is followed in this patch is a fairly standard coding pattern. Further, in case of any errors we generally see failure to unload the module etc. and none of these things are being observed, module reload works fine.
I hope these points are helpful in completing review of the patch.
See [1], it is quite old, so maybe it is not valid anymore, but I see no code proving sth has changed.
Hi Andrzej,
A lot has changed since that article from 2003 (for 2.5 kernel). For instance there is kernfs (as I mention above):
Quoted 8 lines
https://lwn.net/Articles/571590/A process having a sysfs file open today in my view will result in the following:
* It will take a reference onkernfs_node(not on kobject as was the case in kernel 2.5 in [1])
* An open file will prevent the module from being unloaded (not the kernel crashing as in 2.5 in [1])
Thats nice, but kernfs_node->priv still points to kobject so their lifetimes are bounded.
Quoted 7 lines
So this is what I would expect with today's kernel. I am not seeing anything we've done here which violates anything in [1] or [2].
Quoted 3 lines
Also current doc says also [2] similar things, especially:
"Once you registered your kobject viakobject_add(), you must never usekfree()to free it directly"Correct, we are using
kobject_put(), not kfree'ing the kobject.
That I wouldn't agree. kobject_put is called, then the object in which kobject is embedded is kfree'd somewhere later on driver removal, without awareness of this kobject. According to your analysis it should have 0 refs, but this is analysis of the current code, even if it is true now it could change in the future. And IMO it is against docs[2]:
- "One important point cannot be overstated: every kobject must have arelease() method, and the kobject must persist (in a consistent state)
until that method is called. If these constraints are not met, the code is
flawed." - empty release method means clearly it is against the docs.
-"The end result is that a structure protected by a kobject cannot be freed
before its reference count goes to zero. The reference count is not under
the direct control of the code which created the kobject.".
So either docs and part of kobject code were not updated to reflect changes you are assuming, either your assumption is incorrect.
Looking at other users of kobject it seems they follow docs, their release method either frees memory directly either kref_put on containing struct, it was just quick scan so I could overlooked sth.
Regards
Andrzej
Quoted 7 lines
Thanks.
--
Ashutosh
Re: [Intel-gfx] [PATCH 7/9] drm/i915/gt: Fix memory leaks in per-gt sysfs
Quoted 18 lines · Andrzej Hajda
Quoted 8 lines · Ashutosh
Quoted 2 lines · Andrzej Hajda
See [1], it is quite old, so maybe it is not valid anymore, but I see no code proving sth has changed.
Hi Andrzej,
A lot has changed since that article from 2003 (for 2.5 kernel). For instance there is kernfs (as I mention above):
Quoted 8 lines
https://lwn.net/Articles/571590/A process having a sysfs file open today in my view will result in the following:
* It will take a reference onkernfs_node(not on kobject as was the case in kernel 2.5 in [1])
* An open file will prevent the module from being unloaded (not the kernel crashing as in 2.5 in [1])
Quoted 2 lines
Thats nice, but
kernfs_node->privstill points to kobject so their lifetimes are bounded.
Yes, of course there has to be some connection between the kernfs and kobject.
Quoted 5 lines
Quoted 5 lines
So this is what I would expect with today's kernel. I am not seeing anything we've done here which violates anything in [1] or [2].
Quoted 3 lines
Also current doc says also [2] similar things, especially:
"Once you registered your kobject viakobject_add(), you must never usekfree()to free it directly"
Quoted 7 lines
Quoted 1 line
Correct, we are using
kobject_put(), not kfree'ing the kobject.That I wouldn't agree.
kobject_putis called, then the object in which kobject is embedded is kfree'd somewhere later on driver removal, without awareness of this kobject. According to your analysis it should have 0 refs, but this is analysis of the current code, even if it is true now it could change in the future.
Yes but we cannot anticipate all changes which can happen in the future, (though we should handle and make any changes which we can anticipate at present). This is also basically what the kernel philosophy is, don't make unnecessary generalizations and try to handle unforseen situations which can happen in the future.
Let me add some explanations about the patch before addressing your next point.
1. We are adding 'struct kobject sysfs_gt' to 'struct intel_gt'. We are adding the kobject directly, not pointer to kobject. This allows us to "reach" 'struct intel_gt' from the kobject using a simple container_of:
see kobj_to_gt().
2. Because the kobject is not kmalloc'd it cannot be kfree'd so the release method has to be empty (or NULL). 'struct intel_gt' is kmalloc'd separately elsewhere and memory for the kobject will be freed as part of intel_gt.
3. To provide a NULL or empty release method we need to provide a 'struct kobj_type kobj_gt_type' associated with the sysfs_gt kobject. This works nicely because we were anyway need one for .default_groups (we may add other attributes to 'id_groups' in the future). Note that the kobject is initialized and added to sysfs using kobject_init_and_add().
4. The only reason for providing an empty release method rather than a NULL release method is the following pr_debug in kobject_cleanup():
if (t && !t->release)
pr_debug("kobject: '%s' (%p): does not have a release() function, it is broken and must be fixed. See Documentation/core-api/kobject.rst.\n",
kobject_name(kobj), kobj);This statement could possibly be removed because the release method is not needed in the case I just described above, maybe I'll send a patch to suggest removing it. Though I think what they will say is that since NULL release methods are uncommon maybe just provide an empty release method when you need a NULL release method (which is what I have done in the patch).
Also note that, as described below, there are several other cases in the kernel which either have NULL or an empty release methods. See below.
Quoted 11 lines
And IMO it is against docs[2]:
- "One important point cannot be overstated: every kobject must have arelease()method, and the kobject must persist (in a consistent state) until that method is called. If these constraints are not met, the code is flawed." - empty release method means clearly it is against the docs. -"The end result is that a structure protected by a kobject cannot be freed before its reference count goes to zero. The reference count is not under the direct control of the code which created the kobject.".So either docs and part of kobject code were not updated to reflect changes you are assuming, either your assumption is incorrect.
In my view the doc is a general introduction to kobjects and simplifies things. As shown below there are numerous examples in the kernel of both NULL and empty release methods. I just went with the empty method because of the reason mentioned above.
Quoted 7 lines
Looking at other users of kobject it seems they follow docs, their release method either frees memory directly either
kref_puton containing struct, it was just quick scan so I could overlooked sth.Quoted 3 lines
From my comments above, the trick to finding NULL or empty methods is to search for the following construct:
kobject_init_and_add(&xyz, ...)
If we do this we find the following:
NULL release method:
procfs_queue_type integrity_ktype cppc_ktype acpi_hotplug_profile_ktype rnbd_dev_ktype ioat_ktype ab8500_fg_ktype
Empty release method:
blk_ia_range_sysfs_nop_release()
I hope these examples should be sufficient to show that the release method can be both NULL or empty.
So I still haven't found any reason to make changes to the v2 patch which I have previously shown works correctly and without issues.
Thanks.
--
Ashutosh