Add support for GuC-based SLPC
Subsystems (2)
cover Add support for GuC-based SLPC
SLPC (Single Loop Power Controller) is a replacement for some host-based power management features. The SLPC implementation runs in GuC firmware. This series has been tested with SKL/APL/KBL GuC firmware v9 and v10 which are yet to be released on 01.org.
The graphics power management features in SLPC are called GTPERF, BALANCER, and DCC.
1. GTPERF is a combination of DFPS (Dynamic FPS) and Turbo. DFPS adjusts requested graphics frequency to maintain target framerate. Turbo adjusts requested graphics frequency to maintain target GT busyness.
2. BALANCER adjusts balance between power budgets for IA and GT in power limited scenarios.
3. DCC (Duty Cycle Control) adjusts requested graphics frequency and stalls guc-scheduler to maintain actual graphics frequency in efficient range.
This series activates GTPERF Turbo and BALANCER in GuC SLPC. Patch to enable SLPC by default on platforms having support is removed from this series as there are following new changes to be added in future before we enable GuC/SLPC by default:
1. Link waitboost with SLPC.
2. Handle CPG as part of SLPC.
3. IA p-state logic update with GuC submission.
In order to enable CI/PnP testing of SLPC and to avoid frequent rebase, this series should be safe for merge with feature in disabled state.
v2: Addressed review comments on v1. Removed patch to enable SLPC by
default.
v3: Addressed WARNING in igt@drv_module_reload_basic flagged by trybot BAT.
Added change for sanitizing GT PM during reset. Added separate patch for sysfs interface to know HW requested frequency. Also, earlier patches did not go as series hence were not correctly picked up by BAT.
v4: Changes to multiple patches. CI BAT is passing. Performance run on SKL
GT2 done and shows perf at parity with Host Turbo. For BXT, SLPC improves performance when GuC is enabled compared to Host Turbo. This series keeps only support of 9.18 firmware for better readability. If needed, other SLPC interfaces for different GuC version will be added later.
v5: This series incorporates feedback from code reviews on earlier series
and adds following new changes:
1. More changes for separation of RPS and RC6 handling for Gen9.
2. Tied up SLPC enabling with GuC load/GuC submission sequence.
3. SLPC structures are defined explicitly for event input/output.
4. Definition of SLPC parameter control and task control functions agnostic to the underlying param definitions as they might change with GuC versions and prepared helpers for common tasks.
5. Transition of i915 overrides done through host to guc events to shared data and single reset event.
6. Handling SLPC status post reset through shared memory.
7. Derived helpers for setting frequency limits.
8. Removed sysfs interface to know RPNSWREQ as it is available in debugfs interface i915_frequency_info.
9. Simple igt test to verify SLPC configuration by i915 in various driver scenarios is prepared.
v6: This series adds following new changes:
1. Updated intel_guc_send for SLPC to receive output data from GuC.
2. Added task overrides and min frequency overrides in intel_slpc_init. min frequency is set to Rpe.
3. New debugfs interface added to set/unset/read SLPC parameters other than tasks and frequencies. SLPC reset post parameter update added.
4. SLPC parameters persist as part of i915-GuC shared data hence not overriding frequency limits while re-enabling SLPC.
5. Other minor fixes to clear pm_rps_events, clflush the shared data.
v7: This series adds following new changes:
1. Reordered patches. SLPC communication interfaces (structures and functions) are pulled into patches earlier in the series.
2. Eliminated dependency on i915.enable_slpc at various functions where rps_enabled is available.
3. s/i915_ggtt_offset/guc_ggtt_offset and sanitization of parameter in intel_uc_sanitize_options.
v8: Activated Balancer. Changed prototype of SLPC functions to accept
struct intel_slpc as parameter instead of drm_i915_private.
v9: Separated RPS, RC6 and Ring frequency configuration for gen6+.
Added TDR specific handling of SLPC reset. Some more improvements for support of function pointers for rps busy, idle, boost functions. This series is based on GuC code restructuring and fixes series at
https://patchwork.freedesktop.org/series/30351/.
VIZ-6889, VIZ-6890
Sagar Arun Kamble (22):
drm/i915/debugfs: Create generic string tokenize function and update
CRC control parsing
drm/i915: Separate RPS and RC6 handling for gen6+ drm/i915: Separate RPS and RC6 handling for BDW
drm/i915: Separate RPS and RC6 handling for VLV
drm/i915: Separate RPS and RC6 handling for CHV
drm/i915: Name i915_runtime_pm structure in dev_priv as "rpm" drm/i915: Name structure in dev_priv that contains RPS/RC6 state as
"pm"
drm/i915: Rename intel_enable_rc6 to intel_rc6_enabled drm/i915: Create generic function to setup ring frequency table drm/i915: Create generic functions to control RC6, RPS drm/i915: Introduce separate status variable for RC6 and Ring
frequency setup
drm/i915: Define RPS idle, busy, boost function pointers drm/i915/slpc: Lay out SLPC init/enable/disable/cleanup helpers drm/i915/slpc: Add SLPC communication interfaces drm/i915/slpc: Allocate/Release/Initialize SLPC shared data drm/i915/slpc: Add parameter set/unset/get, task control/status
functions
drm/i915/slpc: Send RESET event to enable SLPC during Load/TDR drm/i915/slpc: Add support for min/max frequency control drm/i915/slpc: Add debugfs support to read/write/revert the parameters drm/i915/slpc: Add SLPC banner to RPS debugfs interfaces. drm/i915/slpc: Add Kabylake SLPC support
drm/i915/slpc: Add Geminilake SLPC support
Tom O'Rourke (9):
drm/i915/slpc: Add has_slpc capability flag drm/i915/slpc: Add enable_slpc module parameter drm/i915/slpc: Sanitize GuC version drm/i915/slpc: Enable SLPC in GuC if supported drm/i915/slpc: Send SHUTDOWN event drm/i915/slpc: Add enable/disable controls for SLPC tasks drm/i915/slpc: Add i915_slpc_info to debugfs drm/i915/slpc: Add SKL SLPC Support drm/i915/slpc: Add Broxton SLPC support
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 383 ++++++++--- drivers/gpu/drm/i915/i915_drv.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 44 +- drivers/gpu/drm/i915/i915_gem.c | 6 +- drivers/gpu/drm/i915/i915_gem_request.c | 4 +- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_guc_submission.c | 8 +- drivers/gpu/drm/i915/i915_irq.c | 101 +-- drivers/gpu/drm/i915/i915_params.c | 5 + drivers/gpu/drm/i915/i915_params.h | 1 + drivers/gpu/drm/i915/i915_pci.c | 4 + drivers/gpu/drm/i915/i915_sysfs.c | 104 +-- drivers/gpu/drm/i915/intel_cdclk.c | 40 +- drivers/gpu/drm/i915/intel_csr.c | 15 +- drivers/gpu/drm/i915/intel_display.c | 14 +- drivers/gpu/drm/i915/intel_drv.h | 15 +- drivers/gpu/drm/i915/intel_guc.c | 27 +- drivers/gpu/drm/i915/intel_guc.h | 6 + drivers/gpu/drm/i915/intel_guc_loader.c | 18 + drivers/gpu/drm/i915/intel_pipe_crc.c | 88 +-- drivers/gpu/drm/i915/intel_pm.c | 673 +++++++++++------- drivers/gpu/drm/i915/intel_runtime_pm.c | 26 +- drivers/gpu/drm/i915/intel_sideband.c | 6 +- drivers/gpu/drm/i915/intel_slpc.c | 1028 ++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 286 ++++++++ drivers/gpu/drm/i915/intel_uc.c | 37 + drivers/gpu/drm/i915/intel_uc_common.h | 2 + 28 files changed, 2419 insertions(+), 539 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_slpc.c create mode 100644 drivers/gpu/drm/i915/intel_slpc.h
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/31 drm/i915/debugfs: Create generic string tokenize function and update CRC control parsing
Input string parsing used in CRC control parameter parsing is generic and can be reused for other debugfs interfaces. Hence name it as buffer_tokenize instead of tieing to display_crc. Also fix the function desciption for CRC control parsing that was misplaced at tokenize function.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_pipe_crc.c | 88 +++++++++++++++++------------------ 2 files changed, 45 insertions(+), 44 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -3847,6 +3847,7 @@ u32 i915_gem_fence_alignment(struct drm_i915_private *dev_priv, u32 size,int i915_debugfs_register (struct drm_i915_private *dev_priv);int i915_debugfs_connector_add (struct drm_connector *connector);void intel_display_crc_init (struct drm_i915_private *dev_priv); +int buffer_tokenize (char *buf,char *words[],int max_words);#else static inline int i915_debugfs_register (struct drm_i915_private *dev_priv) {return 0 ;}static inline int i915_debugfs_connector_add (struct drm_connector *connector)
drivers/gpu/drm/i915/intel_pipe_crc.c +44 -44
106 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/31] drm/i915/debugfs: Create generic string tokenize function and update CRC control parsing
Quoted 108 lines · Sagar Arun Kamble
Input string parsing used in CRC control parameter parsing is generic and can be reused for other debugfs interfaces. Hence name it as
buffer_tokenizeinstead of tieing todisplay_crc. Also fix the function desciption for CRC control parsing that was misplaced at tokenize function.Cc Tomeu Vizoso <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_pipe_crc.c | 88 +++++++++++++++++------------------ 2 files changed, 45 insertions(+), 44 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -3847,6 +3847,7 @@ u32 i915_gem_fence_alignment(struct drm_i915_private *dev_priv, u32 size, int i915_debugfs_register(struct drm_i915_private *dev_priv);int i915_debugfs_connector_add (struct drm_connector *connector);void intel_display_crc_init (struct drm_i915_private *dev_priv); +int buffer_tokenize (char *buf,char *words[],int max_words);#else static inline int i915_debugfs_register(struct drm_i915_private
*dev_priv) {return 0;}
static inline int i915_debugfs_connector_add(structdrm_connector
*connector)drivers/gpu/drm/i915/intel_pipe_crc.c +0
-43@@ -710,49 +710,6 @@ static int pipe_crc_set_source(structdrm_i915_private *dev_priv, return ret; } -/* -* Parse pipe CRC command strings: -* command: wsp* object wsp+ name wsp+ source wsp* -* object: 'pipe' -* name: (A | B | C) -* source: (none | plane1 | plane2 | pf) -* wsp: (#0x20 | #0x9 | #0xA)+ -* -* eg.: -* "pipe A plane1" -> Start CRC computations on plane1 of pipe A -* "pipe A none" -> Stop CRC -*/ -static int display_crc_ctl_tokenize (char *buf,char *words[],int max_words) -{ -int n_words =0 ; - -while (*buf) { -char *end; - -/* skip leading white space */ - buf =skip_spaces (buf); -if (!*buf) -break ;/* end of buffer */ - -/* find end of word */ -for (end = buf; *end && !isspace (*end); end++) - ; - -if (n_words == max_words) { -DRM_DEBUG_DRIVER ("too many words, allowed <= %d\n" , - max_words); -return -EINVAL ;/* ran out of words[] before bytes */ - } - -if (*end) - *end++ ='\0' ; - words[n_words++] = buf; - buf = end; - } - -return n_words; -} -enum intel_pipe_crc_object {PIPE_CRC_OBJECT_PIPE ,};
drivers/gpu/drm/i915/intel_pipe_crc.c +20
-0@@ -806,6 +763,49 @@ static int display_crc_ctl_parse_pipe(const char *buf, enum pipe *pipe)return -EINVAL ; } +int buffer_tokenize (char *buf,char *words[],int max_words) +{ +int n_words =0 ; + +while (*buf) { +char *end; + +/* skip leading white space */ + buf =skip_spaces (buf); +if (!*buf) +break ;/* end of buffer */ + +/* find end of word */ +for (end = buf; *end && !isspace (*end); end++) + ; + +if (n_words == max_words) { +DRM_DEBUG_DRIVER ("too many words, allowed <= %d\n" , + max_words); +return -EINVAL ;/* ran out of words[] before bytes */
drivers/gpu/drm/i915/intel_pipe_crc.c static int display_crc_ctl_parse_pipe(const char · line 795
Quoted 10 lines
drivers/gpu/drm/i915/intel_pipe_crc.c +10
-0+ } + +if (*end) + *end++ ='\0' ; + words[n_words++] = buf; + buf = end; + } + +return n_words; +}
You should move this function to i915_debugfs.c
Quoted 17 lines
drivers/gpu/drm/i915/intel_pipe_crc.c +13
-0+ +/* +* Parse pipe CRC command strings: +* command: wsp* object wsp+ name wsp+ source wsp* +* object: 'pipe' +* name: (A | B | C) +* source: (none | plane1 | plane2 | pf) +* wsp: (#0x20 | #0x9 | #0xA)+ +* +* eg.: +* "pipe A plane1" -> Start CRC computations on plane1 of pipe A +* "pipe A none" -> Stop CRC +*/ static int display_crc_ctl_parse (struct drm_i915_private *dev_priv,char *buf,size_t len) {
drivers/gpu/drm/i915/intel_pipe_crc.c static int display_crc_ctl_parse(struct · line 822
Quoted 8 lines
drivers/gpu/drm/i915/intel_pipe_crc.c +1
-1@@ -816,7 +816,7 @@ static int display_crc_ctl_parse(structdrm_i915_private *dev_priv, enum intel_pipe_crc_object object;enum intel_pipe_crc_source source; - n_words =display_crc_ctl_tokenize (buf, words,N_WORDS ); + n_words =buffer_tokenize (buf, words,N_WORDS );if (n_words !=N_WORDS ) {DRM_DEBUG_DRIVER ("tokenize failed, a command is %d words\n" ,N_WORDS );
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/31] drm/i915/debugfs: Create generic string tokenize function and update CRC control parsing
Thanks for the review Michal. Will update as suggested.
Quoted 138 lines · Michal Wajdeczko
Quoted 106 lines · Sagar Arun Kamble
Input string parsing used in CRC control parameter parsing is generic and can be reused for other debugfs interfaces. Hence name it as
buffer_tokenizeinstead of tieing todisplay_crc. Also fix the function desciption for CRC control parsing that was misplaced at tokenize function.Cc Tomeu Vizoso <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/intel_pipe_crc.c | 88
+++++++++++++++++------------------2 files changed, 45 insertions(+), 44 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -3847,6 +3847,7 @@ u32 i915_gem_fence_alignment(struct drm_i915_private *dev_priv, u32 size, int i915_debugfs_register(struct drm_i915_private *dev_priv); int i915_debugfs_connector_add(struct drm_connector *connector); void intel_display_crc_init(struct drm_i915_private *dev_priv); +int buffer_tokenize (char *buf,char *words[],int max_words); #else static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) {return 0;}static inline int
i915_debugfs_connector_add(struct drm_connector *connector)drivers/gpu/drm/i915/intel_pipe_crc.c +0
-43@@ -710,49 +710,6 @@ static int pipe_crc_set_source(structdrm_i915_private *dev_priv, return ret; } -/* -* Parse pipe CRC command strings: -* command: wsp* object wsp+ name wsp+ source wsp* -* object: 'pipe' -* name: (A | B | C) -* source: (none | plane1 | plane2 | pf) -* wsp: (#0x20 | #0x9 | #0xA)+ -* -* eg.: -* "pipe A plane1" -> Start CRC computations on plane1 of pipe A -* "pipe A none" -> Stop CRC -*/ -static int display_crc_ctl_tokenize (char *buf,char *words[],int max_words) -{ - int n_words = 0; - - while (*buf) { - char *end; - - /* skip leading white space */ - buf = skip_spaces(buf); - if (!*buf) - break; /* end of buffer */ - - /* find end of word */ - for (end = buf; *end && !isspace(*end); end++) - ; - - if (n_words == max_words) { - DRM_DEBUG_DRIVER("too many words, allowed <= %d\n", - max_words); - return -EINVAL; /* ran out of words[] before bytes */ - } - - if (*end) - *end++ = '\0'; - words[n_words++] = buf; - buf = end; - } - - return n_words; -} - enum intel_pipe_crc_object { PIPE_CRC_OBJECT_PIPE,};
drivers/gpu/drm/i915/intel_pipe_crc.c +20
-0@@ -806,6 +763,49 @@ static int display_crc_ctl_parse_pipe(const char *buf, enum pipe *pipe) return -EINVAL; } +int buffer_tokenize (char *buf,char *words[],int max_words) +{ + int n_words = 0; + + while (*buf) { + char *end; + + /* skip leading white space */ + buf = skip_spaces(buf); + if (!*buf) + break; /* end of buffer */ + + /* find end of word */ + for (end = buf; *end && !isspace(*end); end++) + ; + + if (n_words == max_words) { + DRM_DEBUG_DRIVER("too many words, allowed <= %d\n", + max_words); + return -EINVAL; /* ran out of words[] before bytes */drivers/gpu/drm/i915/intel_pipe_crc.c static int display_crc_ctl_parse_pipe(const char · line 795
Quoted 10 lines
drivers/gpu/drm/i915/intel_pipe_crc.c +10
-0+ } + + if (*end) + *end++ = '\0'; + words[n_words++] = buf; + buf = end; + } + + return n_words; +}You should move this function to
i915_debugfs.cQuoted 17 lines
drivers/gpu/drm/i915/intel_pipe_crc.c +13
-0+ +/* +* Parse pipe CRC command strings: +* command: wsp* object wsp+ name wsp+ source wsp* +* object: 'pipe' +* name: (A | B | C) +* source: (none | plane1 | plane2 | pf) +* wsp: (#0x20 | #0x9 | #0xA)+ +* +* eg.: +* "pipe A plane1" -> Start CRC computations on plane1 of pipe A +* "pipe A none" -> Stop CRC +*/ static int display_crc_ctl_parse(struct drm_i915_private *dev_priv, char *buf, size_t len) {@@ -816,7 +816,7 @@ static int display_crc_ctl_parse(struct
Quoted 8 lines
drivers/gpu/drm/i915/intel_pipe_crc.c static int display_crc_ctl_parse(struct drm_i915_private *dev_priv, · line 822
Quoted 8 lines
drivers/gpu/drm/i915/intel_pipe_crc.c +1
-1drm_i915_private *dev_priv, enum intel_pipe_crc_object object; enum intel_pipe_crc_source source; - n_words = display_crc_ctl_tokenize(buf, words, N_WORDS); + n_words = buffer_tokenize(buf, words, N_WORDS); if (n_words != N_WORDS) { DRM_DEBUG_DRIVER("tokenize failed, a command is %d words\n", N_WORDS);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/31 drm/i915: Separate RPS and RC6 handling for gen6+
In reply to Sagar Arun KambleThis patch separates enable/disable of RC6 and RPS for gen6+ platforms prior to VLV.
--- drivers/gpu/drm/i915/i915_debugfs.c | 17 +++++++------- drivers/gpu/drm/i915/intel_pm.c | 44 +++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +8 -9
@@ -1136,6 +1136,13 @@ static int i915_frequency_info(struct seq_file *m, void *unused) pm_iir =I915_READ (GEN8_GT_IIR (2 )); pm_mask =I915_READ (GEN6_PMINTRMSK ); } +seq_printf (m,"Video Turbo Mode: %s\n" , +yesno (rpmodectl &GEN6_RP_MEDIA_TURBO )); +seq_printf (m,"HW control enabled: %s\n" , +yesno (rpmodectl &GEN6_RP_ENABLE )); +seq_printf (m,"SW control enabled: %s\n" , +yesno ((rpmodectl &GEN6_RP_MEDIA_MODE_MASK ) == +GEN6_RP_MEDIA_SW_MODE ));seq_printf (m,"PM IER=0x%08x IMR=0x%08x ISR=0x%08x IIR=0x%08x, MASK=0x%08x\n" , pm_ier, pm_imr, pm_isr, pm_iir, pm_mask); seq_printf(m, "pm_intrmsk_mbz: 0x%08x\n",
@@ -1479,7 +1486,7 @@ static int vlv_drpc_info(struct seq_file *m)static int gen6_drpc_info (struct seq_file *m) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); -u32 rpmodectl1, gt_core_status, rcctl1, rc6vids =0 ; +u32 gt_core_status, rcctl1, rc6vids =0 ;u32 gen9_powergate_enable =0 , gen9_powergate_status =0 ;unsigned forcewake_count;int count =0 ;
@@ -1498,7 +1505,6 @@ static int gen6_drpc_info(struct seq_file *m) gt_core_status =I915_READ_FW (GEN6_GT_CORE_STATUS );trace_i915_reg_rw (false,GEN6_GT_CORE_STATUS , gt_core_status,4 , true); - rpmodectl1 =I915_READ (GEN6_RP_CONTROL ); rcctl1 =I915_READ (GEN6_RC_CONTROL );if (INTEL_GEN (dev_priv) >=9 ) { gen9_powergate_enable =I915_READ (GEN9_PG_ENABLE );
@@ -1509,13 +1515,6 @@ static int gen6_drpc_info(struct seq_file *m)sandybridge_pcode_read (dev_priv,GEN6_PCODE_READ_RC6VIDS , &rc6vids);mutex_unlock (&dev_priv->rps.hw_lock); -seq_printf (m,"Video Turbo Mode: %s\n" , -yesno (rpmodectl1 &GEN6_RP_MEDIA_TURBO )); -seq_printf (m,"HW control enabled: %s\n" , -yesno (rpmodectl1 &GEN6_RP_ENABLE )); -seq_printf (m,"SW control enabled: %s\n" , -yesno ((rpmodectl1 &GEN6_RP_MEDIA_MODE_MASK ) == -GEN6_RP_MEDIA_SW_MODE ));seq_printf (m,"RC1e Enabled: %s\n" ,yesno (rcctl1 & GEN6_RC_CTL_RC1e_ENABLE)); seq_printf(m, "RC6 Enabled: %s\n",
drivers/gpu/drm/i915/intel_pm.c +30 -14
88 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 02/31] drm/i915: Separate RPS and RC6 handling for gen6+
Quoted 6 lines · Sagar Arun Kamble
This patch separates enable/disable of RC6 and RPS for gen6+ platforms prior to VLV.
Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/31 drm/i915: Separate RPS and RC6 handling for BDW
In reply to Sagar Arun KambleThis patch separates RC6 and RPS enabling for BDW. RC6/RPS Disabling are handled through gen6 functions.
--- drivers/gpu/drm/i915/intel_pm.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +15 -12
@@ -6613,7 +6613,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); } -static void gen8_enable_rps (struct drm_i915_private *dev_priv) +static void gen8_enable_rc6 (struct drm_i915_private *dev_priv) {struct intel_engine_cs *engine;enum intel_engine_id id;
@@ -6645,16 +6645,18 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) rc6_mask =GEN6_RC_CTL_RC6_ENABLE ;intel_print_rc6_info (dev_priv, rc6_mask); -if (IS_BROADWELL (dev_priv)) -I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | -GEN7_RC_CTL_TO_MODE | - rc6_mask); -else -I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | -GEN6_RC_CTL_EI_MODE (1 ) | - rc6_mask); +I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | +GEN7_RC_CTL_TO_MODE | + rc6_mask); -/* 4 Program defaults and thresholds for RPS*/ +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); +} + +static void gen8_enable_rps (struct drm_i915_private *dev_priv) +{ +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +/* 1 Program defaults and thresholds for RPS*/ I915_WRITE (GEN6_RPNSWREQ ,HSW_FREQUENCY (dev_priv->rps.rp1_freq)); I915_WRITE(GEN6_RC_VIDEO_FREQ,
@@ -6674,7 +6676,7 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RP_IDLE_HYSTERSIS ,10 ); -/* 5: Enable RPS */ +/* 2: Enable RPS */ I915_WRITE(GEN6_RP_CONTROL, GEN6_RP_MEDIA_TURBO | GEN6_RP_MEDIA_HW_NORMAL_MODE |
@@ -6683,7 +6685,7 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)GEN6_RP_UP_BUSY_AVG | GEN6_RP_DOWN_IDLE_AVG); -/* 6: Ring frequency + overclocking (our driver does this later */ +/* 3: Ring frequency + overclocking (our driver does this later */ reset_rps (dev_priv, gen6_set_rps);
@@ -7976,6 +7978,7 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv)if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv))gen6_update_ring_freq (dev_priv); }else if (IS_BROADWELL (dev_priv)) { +gen8_enable_rc6 (dev_priv);gen8_enable_rps (dev_priv);gen6_update_ring_freq (dev_priv); }else if (INTEL_GEN (dev_priv) >=6 ) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 03/31] drm/i915: Separate RPS and RC6 handling for BDW
Quoted 68 lines · Sagar Arun Kamble
This patch separates RC6 and RPS enabling for BDW. RC6/RPS Disabling are handled through gen6 functions.
Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/intel_pm.c | 27 +++++++++++++++------------1 file changed, 15 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -6613,7 +6613,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv) intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL); }drivers/gpu/drm/i915/intel_pm.c +1
-1-static void gen8_enable_rps (struct drm_i915_private *dev_priv) +static void gen8_enable_rc6 (struct drm_i915_private *dev_priv){
structintel_engine_cs*engine; enumintel_engine_idid;drivers/gpu/drm/i915/intel_pm.c +3
-8@@ -6645,16 +6645,18 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv) if (intel_enable_rc6() & INTEL_RC6_ENABLE) rc6_mask = GEN6_RC_CTL_RC6_ENABLE; intel_print_rc6_info(dev_priv, rc6_mask); -if (IS_BROADWELL (dev_priv)) -I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | -GEN7_RC_CTL_TO_MODE | - rc6_mask); -else -I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | -GEN6_RC_CTL_EI_MODE (1 ) | - rc6_mask); +I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | +GEN7_RC_CTL_TO_MODE | + rc6_mask);drivers/gpu/drm/i915/intel_pm.c +8
-1-/* 4 Program defaults and thresholds for RPS*/ +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); +} + +static void gen8_enable_rps (struct drm_i915_private *dev_priv) +{ +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +/* 1 Program defaults and thresholds for RPS*/
I915_WRITE(GEN6_RPNSWREQ, HSW_FREQUENCY(dev_priv->rps.rp1_freq)); I915_WRITE(GEN6_RC_VIDEO_FREQ,drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -6674,7 +6676,7 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)
I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);drivers/gpu/drm/i915/intel_pm.c +1
-1-/* 5: Enable RPS */ +/* 2: Enable RPS */ I915_WRITE(GEN6_RP_CONTROL,
GEN6_RP_MEDIA_TURBO|GEN6_RP_MEDIA_HW_NORMAL_MODE|drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -6683,7 +6685,7 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)GEN6_RP_UP_BUSY_AVG |
GEN6_RP_DOWN_IDLE_AVG);
drivers/gpu/drm/i915/intel_pm.c static void gen8_enable_rps(struct drm_i915_private *dev_priv) · line 6688
Quoted 2 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1-/* 6: Ring frequency + overclocking (our driver does this later */ +/* 3: Ring frequency + overclocking (our driver does this later */
This comment looks invalid (no overclocking done here). Also closing bracket missing and maybe one white line to be removed :)
-Radek
Quoted 11 lines
reset_rps(dev_priv, gen6_set_rps);drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -7976,6 +7978,7 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv) if (IS_GEN9_BC(dev_priv) || IS_CANNONLAKE(dev_priv)) gen6_update_ring_freq(dev_priv); } else if (IS_BROADWELL(dev_priv)) { +gen8_enable_rc6 (dev_priv); gen8_enable_rps(dev_priv); gen6_update_ring_freq(dev_priv);
Quoted 1 line
} else if (
INTEL_GEN(dev_priv)>= 6) {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 03/31] drm/i915: Separate RPS and RC6 handling for BDW
Quoted 76 lines · Radoslaw
Quoted 69 lines · Sagar Arun Kamble
This patch separates RC6 and RPS enabling for BDW. RC6/RPS Disabling are handled through gen6 functions.
Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/intel_pm.c | 27 +++++++++++++++------------1 file changed, 15 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -6613,7 +6613,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv) intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL); }drivers/gpu/drm/i915/intel_pm.c +1
-1-static void gen8_enable_rps (struct drm_i915_private *dev_priv) +static void gen8_enable_rc6 (struct drm_i915_private *dev_priv){
structintel_engine_cs*engine; enumintel_engine_idid;drivers/gpu/drm/i915/intel_pm.c +3
-8@@ -6645,16 +6645,18 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv) if (intel_enable_rc6() & INTEL_RC6_ENABLE) rc6_mask = GEN6_RC_CTL_RC6_ENABLE; intel_print_rc6_info(dev_priv, rc6_mask); -if (IS_BROADWELL (dev_priv)) -I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | -GEN7_RC_CTL_TO_MODE | - rc6_mask); -else -I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | -GEN6_RC_CTL_EI_MODE (1 ) | - rc6_mask); +I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | +GEN7_RC_CTL_TO_MODE | + rc6_mask);drivers/gpu/drm/i915/intel_pm.c +8
-1-/* 4 Program defaults and thresholds for RPS*/ +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); +} + +static void gen8_enable_rps (struct drm_i915_private *dev_priv) +{ +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +/* 1 Program defaults and thresholds for RPS*/
I915_WRITE(GEN6_RPNSWREQ, HSW_FREQUENCY(dev_priv->rps.rp1_freq)); I915_WRITE(GEN6_RC_VIDEO_FREQ,drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -6674,7 +6676,7 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)
I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);drivers/gpu/drm/i915/intel_pm.c +1
-1-/* 5: Enable RPS */ +/* 2: Enable RPS */ I915_WRITE(GEN6_RP_CONTROL,
GEN6_RP_MEDIA_TURBO|GEN6_RP_MEDIA_HW_NORMAL_MODE|drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -6683,7 +6685,7 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)GEN6_RP_UP_BUSY_AVG |
GEN6_RP_DOWN_IDLE_AVG);drivers/gpu/drm/i915/intel_pm.c static void gen8_enable_rps(struct drm_i915_private *dev_priv) · line 6688
Quoted 2 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1-/* 6: Ring frequency + overclocking (our driver does this later */ +/* 3: Ring frequency + overclocking (our driver does this later */ This comment looks invalid (no overclocking done here). Also closing bracket missing and maybe one white line to be removed :)
Quoted 1 line
-Radek
Forgot to mention - beside this comment all changes look good to me (you can have my r-b after this is fixed).
Quoted 9 lines
Quoted 9 lines
reset_rps(dev_priv, gen6_set_rps);drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -7976,6 +7978,7 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv) if (IS_GEN9_BC(dev_priv) || IS_CANNONLAKE(dev_priv)) gen6_update_ring_freq(dev_priv); } else if (IS_BROADWELL(dev_priv)) { +gen8_enable_rc6 (dev_priv);
Quoted 8 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0gen8_enable_rps(dev_priv); gen6_update_ring_freq(dev_priv);} else if (
INTEL_GEN(dev_priv)>= 6) {_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/31 drm/i915: Separate RPS and RC6 handling for VLV
In reply to Sagar Arun KambleThis patch separates enable/disable of RC6 and RPS for VLV.
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +------- drivers/gpu/drm/i915/intel_pm.c | 57 ++++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -11
@@ -1454,21 +1454,11 @@ static void print_rc6_res(struct seq_file *m,static int vlv_drpc_info (struct seq_file *m) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); -u32 rpmodectl1, rcctl1, pw_status; +u32 rcctl1, pw_status; pw_status =I915_READ (VLV_GTLC_PW_STATUS ); - rpmodectl1 =I915_READ (GEN6_RP_CONTROL ); rcctl1 =I915_READ (GEN6_RC_CONTROL ); -seq_printf (m,"Video Turbo Mode: %s\n" , -yesno (rpmodectl1 &GEN6_RP_MEDIA_TURBO )); -seq_printf (m,"Turbo enabled: %s\n" , -yesno (rpmodectl1 &GEN6_RP_ENABLE )); -seq_printf (m,"HW control enabled: %s\n" , -yesno (rpmodectl1 &GEN6_RP_ENABLE )); -seq_printf (m,"SW control enabled: %s\n" , -yesno ((rpmodectl1 &GEN6_RP_MEDIA_MODE_MASK ) == -GEN6_RP_MEDIA_SW_MODE ));seq_printf (m,"RC6 Enabled: %s\n" ,yesno (rcctl1 & (GEN7_RC_CTL_TO_MODE |GEN6_RC_CTL_EI_MODE (1 ))));
drivers/gpu/drm/i915/intel_pm.c +38 -19
102 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/31] drm/i915: Separate RPS and RC6 handling for VLV
Quoted 5 lines · Sagar Arun Kamble
This patch separates enable/disable of RC6 and RPS for VLV.
Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/31 drm/i915: Separate RPS and RC6 handling for CHV
In reply to Sagar Arun KambleThis patch separates enable/disable of RC6 and RPS for CHV.
--- drivers/gpu/drm/i915/intel_pm.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +24 -5
@@ -6337,11 +6337,16 @@ static void gen6_disable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RP_CONTROL ,0 ); } -static void cherryview_disable_rps (struct drm_i915_private *dev_priv) +static void cherryview_disable_rc6 (struct drm_i915_private *dev_priv) {I915_WRITE (GEN6_RC_CONTROL ,0 ); } +static void cherryview_disable_rps (struct drm_i915_private *dev_priv) +{ +I915_WRITE (GEN6_RP_CONTROL ,0 ); +} +static void valleyview_disable_rc6 (struct drm_i915_private *dev_priv) {/* we're doing forcewake before Disabling RC6,
@@ -7196,11 +7201,11 @@ static void valleyview_cleanup_gt_powersave(struct drm_i915_private *dev_priv)valleyview_cleanup_pctx (dev_priv); } -static void cherryview_enable_rps (struct drm_i915_private *dev_priv) +static void cherryview_enable_rc6 (struct drm_i915_private *dev_priv) {struct intel_engine_cs *engine;enum intel_engine_id id; -u32 gtfifodbg, val, rc6_mode =0 , pcbr; +u32 gtfifodbg, rc6_mode =0 , pcbr;WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock));
@@ -7249,7 +7254,19 @@ static void cherryview_enable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC_CONTROL , rc6_mode); -/* 4 Program defaults and thresholds for RPS*/ +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); +} + +static void cherryview_enable_rps (struct drm_i915_private *dev_priv) +{ +u32 val; + +WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); + + +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +/* 1: Program defaults and thresholds for RPS*/ I915_WRITE (GEN6_RP_DOWN_TIMEOUT ,1000000 );I915_WRITE (GEN6_RP_UP_THRESHOLD ,59400 );I915_WRITE (GEN6_RP_DOWN_THRESHOLD ,245000 );
@@ -7258,7 +7275,7 @@ static void cherryview_enable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RP_IDLE_HYSTERSIS ,10 ); -/* 5: Enable RPS */ +/* 2: Enable RPS */ I915_WRITE(GEN6_RP_CONTROL, GEN6_RP_MEDIA_HW_NORMAL_MODE | GEN6_RP_MEDIA_IS_GFX |
@@ -7957,6 +7974,7 @@ void intel_disable_gt_powersave(struct drm_i915_private *dev_priv)gen9_disable_rc6 (dev_priv);gen9_disable_rps (dev_priv); }else if (IS_CHERRYVIEW (dev_priv)) { +cherryview_disable_rc6 (dev_priv);cherryview_disable_rps (dev_priv); }else if (IS_VALLEYVIEW (dev_priv)) {valleyview_disable_rc6 (dev_priv);
@@ -7987,6 +8005,7 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv)mutex_lock (&dev_priv->rps.hw_lock);if (IS_CHERRYVIEW (dev_priv)) { +cherryview_enable_rc6 (dev_priv);cherryview_enable_rps (dev_priv); }else if (IS_VALLEYVIEW (dev_priv)) {valleyview_enable_rc6 (dev_priv);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/31] drm/i915: Separate RPS and RC6 handling for CHV
Quoted 5 lines · Sagar Arun Kamble
This patch separates enable/disable of RC6 and RPS for CHV.
Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/31 drm/i915: Name i915_runtime_pm structure in dev_priv as "rpm"
In reply to Sagar Arun KambleWill be using pm for state containing RPS/RC6 state in the next patch.
--- drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 4 ++-- drivers/gpu/drm/i915/i915_irq.c | 8 ++++---- drivers/gpu/drm/i915/intel_drv.h | 10 +++++----- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- drivers/gpu/drm/i915/intel_runtime_pm.c | 10 +++++----- 7 files changed, 23 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +4 -4
@@ -2533,12 +2533,12 @@ static int intel_runtime_suspend(struct device *kdev)intel_uncore_suspend (dev_priv);enable_rpm_wakeref_asserts (dev_priv); -WARN_ON_ONCE (atomic_read (&dev_priv->pm.wakeref_count)); +WARN_ON_ONCE (atomic_read (&dev_priv->rpm.wakeref_count));if (intel_uncore_arm_unclaimed_mmio_detection (dev_priv))DRM_ERROR ("Unclaimed access detected prior to suspending\n" ); - dev_priv->pm.suspended = true; + dev_priv->rpm.suspended = true;/* * FIXME: We really should find a document that references the arguments
@@ -2584,11 +2584,11 @@ static int intel_runtime_resume(struct device *kdev)DRM_DEBUG_KMS ("Resuming device\n" ); -WARN_ON_ONCE (atomic_read (&dev_priv->pm.wakeref_count)); +WARN_ON_ONCE (atomic_read (&dev_priv->rpm.wakeref_count));disable_rpm_wakeref_asserts (dev_priv);intel_opregion_notify_adapter (dev_priv,PCI_D0 ); - dev_priv->pm.suspended = false; + dev_priv->rpm.suspended = false;if (intel_uncore_unclaimed_mmio (dev_priv))DRM_DEBUG_DRIVER ("Unclaimed access during suspend, bios?\n" );
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2512,7 +2512,7 @@ struct drm_i915_private {bool distrust_bios_wm; } wm; -struct i915_runtime_pm pm; +struct i915_runtime_pm rpm;struct {bool initialized;
drivers/gpu/drm/i915/i915_gpu_error.c +2 -2
@@ -1665,8 +1665,8 @@ static void i915_capture_gen_state(struct drm_i915_private *dev_priv, struct i915_gpu_state *error) { error->awake = dev_priv->gt.awake; - error->wakelock =atomic_read (&dev_priv->pm.wakeref_count); - error->suspended = dev_priv->pm.suspended; + error->wakelock =atomic_read (&dev_priv->rpm.wakeref_count); + error->suspended = dev_priv->rpm.suspended; error->iommu =-1 ;#ifdef CONFIG_INTEL_IOMMU
drivers/gpu/drm/i915/i915_irq.c +4 -4
@@ -4118,7 +4118,7 @@ int intel_irq_install(struct drm_i915_private *dev_priv)* interrupts as enabled _before_ actually enabling them to avoid * special cases in our ordering checks. */ - dev_priv->pm.irqs_enabled = true; + dev_priv->rpm.irqs_enabled = true;return drm_irq_install (&dev_priv->drm, dev_priv->drm.pdev->irq); }
@@ -4134,7 +4134,7 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv) {drm_irq_uninstall (&dev_priv->drm);intel_hpd_cancel_work (dev_priv); - dev_priv->pm.irqs_enabled = false; + dev_priv->rpm.irqs_enabled = false; }/**
@@ -4147,7 +4147,7 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv)void intel_runtime_pm_disable_interrupts (struct drm_i915_private *dev_priv) { dev_priv->drm.driver->irq_uninstall (&dev_priv->drm); - dev_priv->pm.irqs_enabled = false; + dev_priv->rpm.irqs_enabled = false;synchronize_irq (dev_priv->drm.irq); }
@@ -4160,7 +4160,7 @@ void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv)*/ void intel_runtime_pm_enable_interrupts (struct drm_i915_private *dev_priv) { - dev_priv->pm.irqs_enabled = true; + dev_priv->rpm.irqs_enabled = true; dev_priv->drm.driver->irq_preinstall (&dev_priv->drm); dev_priv->drm.driver->irq_postinstall (&dev_priv->drm); }
drivers/gpu/drm/i915/intel_drv.h +5 -5
@@ -1252,7 +1252,7 @@ static inline bool intel_irqs_enabled(struct drm_i915_private *dev_priv)* We only use drm_irq_uninstall() at unload and VT switch, so * this is the only thing we need to check. */ -return dev_priv->pm.irqs_enabled; +return dev_priv->rpm.irqs_enabled; }int intel_get_crtc_scanline (struct intel_crtc *crtc);
@@ -1788,7 +1788,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,static inline void assert_rpm_device_not_suspended (struct drm_i915_private *dev_priv) { -WARN_ONCE (dev_priv->pm.suspended, +WARN_ONCE (dev_priv->rpm.suspended,"Device suspended during HW access\n" ); }
@@ -1796,7 +1796,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, assert_rpm_wakelock_held(struct drm_i915_private *dev_priv) {assert_rpm_device_not_suspended (dev_priv); -WARN_ONCE (!atomic_read (&dev_priv->pm.wakeref_count), +WARN_ONCE (!atomic_read (&dev_priv->rpm.wakeref_count),"RPM wakelock ref not held during HW access" ); }
@@ -1821,7 +1821,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,static inline void disable_rpm_wakeref_asserts (struct drm_i915_private *dev_priv) { -atomic_inc (&dev_priv->pm.wakeref_count); +atomic_inc (&dev_priv->rpm.wakeref_count); }/**
@@ -1838,7 +1838,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,static inline void enable_rpm_wakeref_asserts (struct drm_i915_private *dev_priv) { -atomic_dec (&dev_priv->pm.wakeref_count); +atomic_dec (&dev_priv->rpm.wakeref_count); }void intel_runtime_pm_get (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_pm.c +2 -2
@@ -9351,8 +9351,8 @@ void intel_pm_setup(struct drm_i915_private *dev_priv) __intel_autoenable_gt_powersave);atomic_set (&dev_priv->rps.num_waiters,0 ); - dev_priv->pm.suspended = false; -atomic_set (&dev_priv->pm.wakeref_count,0 ); + dev_priv->rpm.suspended = false; +atomic_set (&dev_priv->rpm.wakeref_count,0 ); } static u64 vlv_residency_raw(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_runtime_pm.c +5 -5
@@ -187,7 +187,7 @@ bool __intel_display_power_is_enabled(struct drm_i915_private *dev_priv,struct i915_power_well *power_well;bool is_enabled; -if (dev_priv->pm.suspended) +if (dev_priv->rpm.suspended)return false; is_enabled = true;
@@ -3124,7 +3124,7 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv) ret =pm_runtime_get_sync (kdev);WARN_ONCE (ret <0 ,"pm_runtime_get_sync() failed: %d\n" , ret); -atomic_inc (&dev_priv->pm.wakeref_count); +atomic_inc (&dev_priv->rpm.wakeref_count);assert_rpm_wakelock_held (dev_priv); }
@@ -3158,7 +3158,7 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)return false; } -atomic_inc (&dev_priv->pm.wakeref_count); +atomic_inc (&dev_priv->rpm.wakeref_count);assert_rpm_wakelock_held (dev_priv);return true;
@@ -3189,7 +3189,7 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)assert_rpm_wakelock_held (dev_priv);pm_runtime_get_noresume (kdev); -atomic_inc (&dev_priv->pm.wakeref_count); +atomic_inc (&dev_priv->rpm.wakeref_count); }/**
@@ -3206,7 +3206,7 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)struct device *kdev = &pdev->dev;assert_rpm_wakelock_held (dev_priv); -atomic_dec (&dev_priv->pm.wakeref_count); +atomic_dec (&dev_priv->rpm.wakeref_count);pm_runtime_mark_last_busy (kdev);pm_runtime_put_autosuspend (kdev);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 06/31] drm/i915: Name i915_runtime_pm structure in dev_priv as "rpm"
Quoted 5 lines · Sagar Arun Kamble
Will be using pm for state containing RPS/RC6 state in the next patch.
Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/31 drm/i915: Name structure in dev_priv that contains RPS/RC6 state as "pm"
In reply to Sagar Arun KamblePrepared substructure rps for RPS related state. autoenable_work and pcu_lock are used for RC6 hence they are defined outside rps structure. Renamed the RPS lock as pcu_lock.
--- drivers/gpu/drm/i915/i915_debugfs.c | 117 +++++----- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 12 +- drivers/gpu/drm/i915/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 8 +- drivers/gpu/drm/i915/i915_irq.c | 86 +++---- drivers/gpu/drm/i915/i915_sysfs.c | 70 +++--- drivers/gpu/drm/i915/intel_cdclk.c | 40 ++-- drivers/gpu/drm/i915/intel_display.c | 12 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 363 +++++++++++++++-------------- drivers/gpu/drm/i915/intel_runtime_pm.c | 16 +- drivers/gpu/drm/i915/intel_sideband.c | 6 +- 13 files changed, 379 insertions(+), 357 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +59 -58
@@ -1026,6 +1026,7 @@ static int i915_error_state_open(struct inode *inode, struct file *file)static int i915_frequency_info (struct seq_file *m,void *unused) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct intel_rps *rps = &dev_priv->pm.rps;int ret =0 ;intel_runtime_pm_get (dev_priv);
@@ -1043,7 +1044,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {u32 freq_sts; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); freq_sts =vlv_punit_read (dev_priv,PUNIT_REG_GPU_FREQ_STS );seq_printf (m,"PUNIT_REG_GPU_FREQ_STS: 0x%08x\n" , freq_sts);seq_printf (m,"DDR freq: %d MHz\n" , dev_priv->mem_freq);
@@ -1052,21 +1053,21 @@ static int i915_frequency_info(struct seq_file *m, void *unused) intel_gpu_freq(dev_priv, (freq_sts >> 8) & 0xff));seq_printf (m,"current GPU freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq)); +intel_gpu_freq (dev_priv, rps->cur_freq));seq_printf (m,"max GPU freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.max_freq)); +intel_gpu_freq (dev_priv, rps->max_freq));seq_printf (m,"min GPU freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.min_freq)); +intel_gpu_freq (dev_priv, rps->min_freq));seq_printf (m,"idle GPU freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.idle_freq)); +intel_gpu_freq (dev_priv, rps->idle_freq));seq_printf (m,"efficient (RPe) frequency: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq)); -mutex_unlock (&dev_priv->rps.hw_lock); +intel_gpu_freq (dev_priv, rps->efficient_freq)); +mutex_unlock (&dev_priv->pm.pcu_lock); }else if (INTEL_GEN (dev_priv) >=6 ) {u32 rp_state_limits;u32 gt_perf_status;
@@ -1146,7 +1147,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"PM IER=0x%08x IMR=0x%08x ISR=0x%08x IIR=0x%08x, MASK=0x%08x\n" , pm_ier, pm_imr, pm_isr, pm_iir, pm_mask);seq_printf (m,"pm_intrmsk_mbz: 0x%08x\n" , - dev_priv->rps.pm_intrmsk_mbz); + rps->pm_intrmsk_mbz);seq_printf (m,"GT_PERF_STATUS: 0x%08x\n" , gt_perf_status);seq_printf (m,"Render p-state ratio: %d\n" , (gt_perf_status & (INTEL_GEN (dev_priv) >=9 ?0x1ff00 :0xff00 )) >>8 );
@@ -1166,8 +1167,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) rpcurup, GT_PM_INTERVAL_TO_US(dev_priv, rpcurup));seq_printf (m,"RP PREV UP: %d (%dus)\n" , rpprevup,GT_PM_INTERVAL_TO_US (dev_priv, rpprevup)); -seq_printf (m,"Up threshold: %d%%\n" , - dev_priv->rps.up_threshold); +seq_printf (m,"Up threshold: %d%%\n" , rps->up_threshold);seq_printf (m,"RP CUR DOWN EI: %d (%dus)\n" , rpdownei,GT_PM_INTERVAL_TO_US (dev_priv, rpdownei));
@@ -1175,8 +1175,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) rpcurdown, GT_PM_INTERVAL_TO_US(dev_priv, rpcurdown));seq_printf (m,"RP PREV DOWN: %d (%dus)\n" , rpprevdown,GT_PM_INTERVAL_TO_US (dev_priv, rpprevdown)); -seq_printf (m,"Down threshold: %d%%\n" , - dev_priv->rps.down_threshold); +seq_printf (m,"Down threshold: %d%%\n" , rps->down_threshold); max_freq = (IS_GEN9_LP (dev_priv) ? rp_state_cap >>0 : rp_state_cap >>16 ) &0xff ;
@@ -1198,22 +1197,22 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"Max non-overclocked (RP0) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq));seq_printf (m,"Max overclocked frequency: %dMHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.max_freq)); +intel_gpu_freq (dev_priv, rps->max_freq));seq_printf (m,"Current freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq)); +intel_gpu_freq (dev_priv, rps->cur_freq));seq_printf (m,"Actual freq: %d MHz\n" , cagf);seq_printf (m,"Idle freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.idle_freq)); +intel_gpu_freq (dev_priv, rps->idle_freq));seq_printf (m,"Min freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.min_freq)); +intel_gpu_freq (dev_priv, rps->min_freq));seq_printf (m,"Boost freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.boost_freq)); +intel_gpu_freq (dev_priv, rps->boost_freq));seq_printf (m,"Max freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.max_freq)); +intel_gpu_freq (dev_priv, rps->max_freq));seq_printf (m,"efficient (RPe) frequency: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq)); +intel_gpu_freq (dev_priv, rps->efficient_freq)); }else {seq_puts (m,"no P-state info available\n" ); }
@@ -1501,9 +1500,9 @@ static int gen6_drpc_info(struct seq_file *m) gen9_powergate_status =I915_READ (GEN9_PWRGT_DOMAIN_STATUS ); } -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);sandybridge_pcode_read (dev_priv,GEN6_PCODE_READ_RC6VIDS , &rc6vids); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);seq_printf (m,"RC1e Enabled: %s\n" ,yesno (rcctl1 & GEN6_RC_CTL_RC1e_ENABLE));
@@ -1778,19 +1777,19 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv); - ret =mutex_lock_interruptible (&dev_priv->rps.hw_lock); + ret =mutex_lock_interruptible (&dev_priv->pm.pcu_lock);if (ret) goto out;if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv)) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = - dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ; + dev_priv->pm.rps.min_freq_softlimit /GEN9_FREQ_SCALER ; max_gpu_freq = - dev_priv->rps.max_freq_softlimit /GEN9_FREQ_SCALER ; + dev_priv->pm.rps.max_freq_softlimit /GEN9_FREQ_SCALER ; }else { - min_gpu_freq = dev_priv->rps.min_freq_softlimit; - max_gpu_freq = dev_priv->rps.max_freq_softlimit; + min_gpu_freq = dev_priv->pm.rps.min_freq_softlimit; + max_gpu_freq = dev_priv->pm.rps.max_freq_softlimit; }seq_puts (m,"GPU freq (MHz)\tEffective CPU freq (MHz)\tEffective Ring freq (MHz)\n" );
@@ -1809,7 +1808,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) ((ia_freq >> 8) & 0xff) * 100); } -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock); out:intel_runtime_pm_put (dev_priv);
@@ -2243,25 +2242,26 @@ static int i915_rps_boost_info(struct seq_file *m, void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct drm_device *dev = &dev_priv->drm; +struct intel_rps *rps = &dev_priv->pm.rps;struct drm_file *file; -seq_printf (m,"RPS enabled? %d\n" , dev_priv->rps.enabled); +seq_printf (m,"RPS enabled? %d\n" , rps->enabled);seq_printf (m,"GPU busy? %s [%d requests]\n" ,yesno (dev_priv->gt.awake), dev_priv->gt.active_requests);seq_printf (m,"CPU waiting? %d\n" ,count_irq_waiters (dev_priv));seq_printf (m,"Boosts outstanding? %d\n" , -atomic_read (&dev_priv->rps.num_waiters)); +atomic_read (&rps->num_waiters));seq_printf (m,"Frequency requested %d\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq)); +intel_gpu_freq (dev_priv, rps->cur_freq));seq_printf (m," min hard:%d, soft:%d; max soft:%d, hard:%d\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.min_freq), -intel_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit), -intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit), -intel_gpu_freq (dev_priv, dev_priv->rps.max_freq)); +intel_gpu_freq (dev_priv, rps->min_freq), +intel_gpu_freq (dev_priv, rps->min_freq_softlimit), +intel_gpu_freq (dev_priv, rps->max_freq_softlimit), +intel_gpu_freq (dev_priv, rps->max_freq));seq_printf (m," idle:%d, efficient:%d, boost:%d\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.idle_freq), -intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), -intel_gpu_freq (dev_priv, dev_priv->rps.boost_freq)); +intel_gpu_freq (dev_priv, rps->idle_freq), +intel_gpu_freq (dev_priv, rps->efficient_freq), +intel_gpu_freq (dev_priv, rps->boost_freq));mutex_lock (&dev->filelist_mutex);list_for_each_entry_reverse (file, &dev->filelist, lhead) {
@@ -2277,11 +2277,11 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)rcu_read_unlock (); }seq_printf (m,"Kernel (anonymous) boosts: %d\n" , -atomic_read (&dev_priv->rps.boosts)); +atomic_read (&rps->boosts));mutex_unlock (&dev->filelist_mutex);if (INTEL_GEN (dev_priv) >=6 && - dev_priv->rps.enabled && + rps->enabled && dev_priv->gt.active_requests) {u32 rpup, rpupei;u32 rpdown, rpdownei;
@@ -2294,13 +2294,13 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );seq_printf (m,"\nRPS Autotuning (current \"%s\" window):\n" , -rps_power_to_str (dev_priv->rps.power)); +rps_power_to_str (rps->power));seq_printf (m," Avg. up: %d%% [above threshold? %d%%]\n" , rpup && rpupei ?100 * rpup / rpupei :0 , - dev_priv->rps.up_threshold); + rps->up_threshold);seq_printf (m," Avg. down: %d%% [below threshold? %d%%]\n" , rpdown && rpdownei ?100 * rpdown / rpdownei :0 , - dev_priv->rps.down_threshold); + rps->down_threshold); }else {seq_puts (m,"\nRPS Autotuning inactive\n" ); }
@@ -4381,7 +4381,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,if (INTEL_GEN (dev_priv) <6 )return -ENODEV ; - *val =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit); + *val =intel_gpu_freq (dev_priv, dev_priv->pm.rps.max_freq_softlimit);return 0 ; }
@@ -4389,6 +4389,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf, i915_max_freq_set(void *data, u64 val) {struct drm_i915_private *dev_priv = data; +struct intel_rps *rps = &dev_priv->pm.rps;u32 hw_max, hw_min;int ret;
@@ -4397,7 +4398,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,DRM_DEBUG_DRIVER ("Manually setting max freq to %llu\n" , val); - ret =mutex_lock_interruptible (&dev_priv->rps.hw_lock); + ret =mutex_lock_interruptible (&dev_priv->pm.pcu_lock);if (ret)return ret;
@@ -4406,20 +4407,20 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,*/ val =intel_freq_opcode (dev_priv, val); - hw_max = dev_priv->rps.max_freq; - hw_min = dev_priv->rps.min_freq; + hw_max = rps->max_freq; + hw_min = rps->min_freq; -if (val < hw_min || val > hw_max || val < dev_priv->rps.min_freq_softlimit) { -mutex_unlock (&dev_priv->rps.hw_lock); +if (val < hw_min || val > hw_max || val < rps->min_freq_softlimit) { +mutex_unlock (&dev_priv->pm.pcu_lock);return -EINVAL ; } - dev_priv->rps.max_freq_softlimit = val; + rps->max_freq_softlimit = val;if (intel_set_rps (dev_priv, val))DRM_DEBUG_DRIVER ("failed to update RPS to new softlimit\n" ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);return 0 ; }
@@ -4436,7 +4437,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,if (INTEL_GEN (dev_priv) <6 )return -ENODEV ; - *val =intel_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit); + *val =intel_gpu_freq (dev_priv, dev_priv->pm.rps.min_freq_softlimit);return 0 ; }
@@ -4452,7 +4453,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,DRM_DEBUG_DRIVER ("Manually setting min freq to %llu\n" , val); - ret =mutex_lock_interruptible (&dev_priv->rps.hw_lock); + ret =mutex_lock_interruptible (&dev_priv->pm.pcu_lock);if (ret)return ret;
@@ -4461,21 +4462,21 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,*/ val =intel_freq_opcode (dev_priv, val); - hw_max = dev_priv->rps.max_freq; - hw_min = dev_priv->rps.min_freq; + hw_max = dev_priv->pm.rps.max_freq; + hw_min = dev_priv->pm.rps.min_freq;if (val < hw_min || - val > hw_max || val > dev_priv->rps.max_freq_softlimit) { -mutex_unlock (&dev_priv->rps.hw_lock); + val > hw_max || val > dev_priv->pm.rps.max_freq_softlimit) { +mutex_unlock (&dev_priv->pm.pcu_lock);return -EINVAL ; } - dev_priv->rps.min_freq_softlimit = val; + dev_priv->pm.rps.min_freq_softlimit = val;if (intel_set_rps (dev_priv, val))DRM_DEBUG_DRIVER ("failed to update RPS to new softlimit\n" ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);return 0 ; }
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -2486,7 +2486,7 @@ static int intel_runtime_suspend(struct device *kdev)struct drm_i915_private *dev_priv =to_i915 (dev);int ret; -if (WARN_ON_ONCE (!(dev_priv->rps.enabled &&intel_enable_rc6 ()))) +if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_enable_rc6 ())))return -ENODEV ;if (WARN_ON_ONCE (!HAS_RUNTIME_PM (dev_priv)))
drivers/gpu/drm/i915/i915_drv.h +8 -4
@@ -1304,7 +1304,7 @@ struct intel_rps_ei {u32 media_c0; }; -struct intel_gen6_power_mgmt { +struct intel_rps {/* * work, interrupts_enabled and pm_iir are protected by * dev_priv->irq_lock
@@ -1345,12 +1345,16 @@ struct intel_gen6_power_mgmt {enum {LOW_POWER ,BETWEEN ,HIGH_POWER } power;bool enabled; -struct delayed_work autoenable_work;atomic_t num_waiters;atomic_t boosts;/* manual wa residency calculations */ struct intel_rps_ei ei; +}; + +struct intel_gen6_power_mgmt { +struct intel_rps rps; +struct delayed_work autoenable_work;/* * Protects RPS/RC6 register access and PCU communication.
@@ -1358,7 +1362,7 @@ struct intel_gen6_power_mgmt {* this lock may be held for long periods of time when * talking to hw - so only take it when talking to hw! */ -struct mutex hw_lock; +struct mutex pcu_lock; };/* defined intel_pm.c */
@@ -2401,7 +2405,7 @@ struct drm_i915_private {u32 edram_cap;/* gen6+ rps state */ -struct intel_gen6_power_mgmt rps; +struct intel_gen6_power_mgmt pm;/* ilk-only ips/rps state. Everything in here is protected by the global * mchdev_lock in intel_pm.c */
drivers/gpu/drm/i915/i915_gem_request.c +1 -1
@@ -416,7 +416,7 @@ static void i915_gem_request_retire(struct drm_i915_gem_request *request)spin_lock_irq (&request->lock);if (request->waitboost) -atomic_dec (&request->i915->rps.num_waiters); +atomic_dec (&request->i915->pm.rps.num_waiters);dma_fence_signal_locked (&request->fence);spin_unlock_irq (&request->lock);
drivers/gpu/drm/i915/i915_guc_submission.c +4 -4
@@ -1099,8 +1099,8 @@ static void guc_interrupts_capture(struct drm_i915_private *dev_priv)* Here we CLEAR REDIRECT_TO_GUC bit in pm_intrmsk_mbz, which will * result in the register bit being left SET! */ - dev_priv->rps.pm_intrmsk_mbz |=ARAT_EXPIRED_INTRMSK ; - dev_priv->rps.pm_intrmsk_mbz &= ~GEN8_PMINTR_DISABLE_REDIRECT_TO_GUC ; + dev_priv->pm.rps.pm_intrmsk_mbz |=ARAT_EXPIRED_INTRMSK ; + dev_priv->pm.rps.pm_intrmsk_mbz &= ~GEN8_PMINTR_DISABLE_REDIRECT_TO_GUC ; }static void guc_interrupts_release (struct drm_i915_private *dev_priv)
@@ -1123,8 +1123,8 @@ static void guc_interrupts_release(struct drm_i915_private *dev_priv)I915_WRITE (GUC_VCS2_VCS1_IER ,0 );I915_WRITE (GUC_WD_VECS_IER ,0 ); - dev_priv->rps.pm_intrmsk_mbz |=GEN8_PMINTR_DISABLE_REDIRECT_TO_GUC ; - dev_priv->rps.pm_intrmsk_mbz &= ~ARAT_EXPIRED_INTRMSK ; + dev_priv->pm.rps.pm_intrmsk_mbz |=GEN8_PMINTR_DISABLE_REDIRECT_TO_GUC ; + dev_priv->pm.rps.pm_intrmsk_mbz &= ~ARAT_EXPIRED_INTRMSK ; }int i915_guc_submission_enable (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_irq.c +45 -41
223 lines not on this page · raw message
drivers/gpu/drm/i915/i915_sysfs.c +35 -35
171 lines not on this page · raw message
drivers/gpu/drm/i915/intel_cdclk.c +20 -20
@@ -503,7 +503,7 @@ static void vlv_set_cdclk(struct drm_i915_private *dev_priv,else cmd =0 ; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); val =vlv_punit_read (dev_priv,PUNIT_REG_DSPFREQ ); val &= ~DSPFREQGUAR_MASK ; val |= (cmd <<DSPFREQGUAR_SHIFT );
@@ -513,7 +513,7 @@ static void vlv_set_cdclk(struct drm_i915_private *dev_priv, 50)) {DRM_ERROR ("timed out waiting for CDclk change\n" ); } -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);mutex_lock (&dev_priv->sb_lock);
@@ -590,7 +590,7 @@ static void chv_set_cdclk(struct drm_i915_private *dev_priv,*/ cmd =DIV_ROUND_CLOSEST (dev_priv->hpll_freq <<1 , cdclk) -1 ; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); val =vlv_punit_read (dev_priv,PUNIT_REG_DSPFREQ ); val &= ~DSPFREQGUAR_MASK_CHV ; val |= (cmd <<DSPFREQGUAR_SHIFT_CHV );
@@ -600,7 +600,7 @@ static void chv_set_cdclk(struct drm_i915_private *dev_priv, 50)) {DRM_ERROR ("timed out waiting for CDclk change\n" ); } -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);intel_update_cdclk (dev_priv);
@@ -656,10 +656,10 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv, "trying to change cdclk frequency with cdclk not enabled\n")) return; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); ret =sandybridge_pcode_write (dev_priv,BDW_PCODE_DISPLAY_FREQ_CHANGE_REQ ,0x0 ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);if (ret) {DRM_ERROR ("failed to inform pcode about cdclk change\n" );return ;
@@ -712,9 +712,9 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv, LCPLL_CD_SOURCE_FCLK_DONE) == 0, 1))DRM_ERROR ("Switching back to LCPLL failed\n" ); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);sandybridge_pcode_write (dev_priv,HSW_PCODE_DE_WRITE_FREQ_REQ , data); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);I915_WRITE (CDCLK_FREQ ,DIV_ROUND_CLOSEST (cdclk,1000 ) -1 );
@@ -928,12 +928,12 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv,WARN_ON ((cdclk ==24000 ) != (vco ==0 )); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); ret =skl_pcode_request (dev_priv,SKL_PCODE_CDCLK_CONTROL ,SKL_CDCLK_PREPARE_FOR_CHANGE ,SKL_CDCLK_READY_FOR_CHANGE ,SKL_CDCLK_READY_FOR_CHANGE ,3 ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);if (ret) {DRM_ERROR ("Failed to inform PCU about cdclk change (%d)\n" , ret);
@@ -975,9 +975,9 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv,POSTING_READ (CDCLK_CTL );/* inform PCU of the change */ -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);sandybridge_pcode_write (dev_priv,SKL_PCODE_CDCLK_CONTROL , pcu_ack); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);intel_update_cdclk (dev_priv); }
@@ -1268,10 +1268,10 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, }/* Inform power controller of upcoming frequency change */ -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); ret =sandybridge_pcode_write (dev_priv,HSW_PCODE_DE_WRITE_FREQ_REQ ,0x80000000 ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);if (ret) { DRM_ERROR("PCode CDCLK freq change notify failed (err %d, freq %d)\n",
@@ -1300,10 +1300,10 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, val |=BXT_CDCLK_SSA_PRECHARGE_ENABLE ;I915_WRITE (CDCLK_CTL , val); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); ret =sandybridge_pcode_write (dev_priv,HSW_PCODE_DE_WRITE_FREQ_REQ ,DIV_ROUND_UP (cdclk,25000 )); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);if (ret) { DRM_ERROR("PCode CDCLK freq set failed, (err %d, freq %d)\n",
@@ -1518,12 +1518,12 @@ static void cnl_set_cdclk(struct drm_i915_private *dev_priv,u32 val, divider, pcu_ack;int ret; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); ret =skl_pcode_request (dev_priv,SKL_PCODE_CDCLK_CONTROL ,SKL_CDCLK_PREPARE_FOR_CHANGE ,SKL_CDCLK_READY_FOR_CHANGE ,SKL_CDCLK_READY_FOR_CHANGE ,3 ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);if (ret) {DRM_ERROR ("Failed to inform PCU about cdclk change (%d)\n" , ret);
@@ -1575,9 +1575,9 @@ static void cnl_set_cdclk(struct drm_i915_private *dev_priv,I915_WRITE (CDCLK_CTL , val);/* inform PCU of the change */ -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);sandybridge_pcode_write (dev_priv,SKL_PCODE_CDCLK_CONTROL , pcu_ack); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);intel_update_cdclk (dev_priv); }
drivers/gpu/drm/i915/intel_display.c +6 -6
@@ -4955,10 +4955,10 @@ void hsw_enable_ips(struct intel_crtc *crtc)assert_plane_enabled (dev_priv, crtc->plane);if (IS_BROADWELL (dev_priv)) { -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);WARN_ON (sandybridge_pcode_write (dev_priv,DISPLAY_IPS_CONTROL ,IPS_ENABLE |IPS_PCODE_CONTROL )); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);/* Quoting Art Runyan: "its not safe to expect any particular * value in IPS_CTL bit 31 after enabling IPS through the * mailbox." Moreover, the mailbox may return a bogus state,
@@ -4988,9 +4988,9 @@ void hsw_disable_ips(struct intel_crtc *crtc)assert_plane_enabled (dev_priv, crtc->plane);if (IS_BROADWELL (dev_priv)) { -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);WARN_ON (sandybridge_pcode_write (dev_priv,DISPLAY_IPS_CONTROL ,0 )); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);/* wait for pcode to finish disabling IPS, which may take up to 42ms */ if (intel_wait_for_register(dev_priv, IPS_CTL, IPS_ENABLE, 0,
@@ -8846,11 +8846,11 @@ static uint32_t hsw_read_dcomp(struct drm_i915_private *dev_priv)static void hsw_write_dcomp (struct drm_i915_private *dev_priv,uint32_t val) {if (IS_HASWELL (dev_priv)) { -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);if (sandybridge_pcode_write (dev_priv,GEN6_PCODE_WRITE_D_COMP , val))DRM_DEBUG_KMS ("Failed to write to D_COMP\n" ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock); }else {I915_WRITE (D_COMP_BDW , val);POSTING_READ (D_COMP_BDW );
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1241,7 +1241,7 @@ void intel_pch_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,static inline u32 gen6_sanitize_rps_pm_mask (const struct drm_i915_private *i915,u32 mask) { -return mask & ~i915->rps.pm_intrmsk_mbz; +return mask & ~i915->pm.rps.pm_intrmsk_mbz; }void intel_runtime_pm_disable_interrupts (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_pm.c +188 -175
882 lines not on this page · raw message
drivers/gpu/drm/i915/intel_runtime_pm.c +8 -8
@@ -785,7 +785,7 @@ static void vlv_set_power_well(struct drm_i915_private *dev_priv, state = enable ?PUNIT_PWRGT_PWR_ON (power_well_id) :PUNIT_PWRGT_PWR_GATE (power_well_id); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);#define COND \ ((vlv_punit_read(dev_priv, PUNIT_REG_PWRGT_STATUS) & mask) == state)
@@ -806,7 +806,7 @@ static void vlv_set_power_well(struct drm_i915_private *dev_priv,#undef COND out: -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock); } static void vlv_power_well_enable(struct drm_i915_private *dev_priv,
@@ -833,7 +833,7 @@ static bool vlv_power_well_enabled(struct drm_i915_private *dev_priv, mask =PUNIT_PWRGT_MASK (power_well_id); ctrl =PUNIT_PWRGT_PWR_ON (power_well_id); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); state =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_STATUS ) & mask;/*
@@ -852,7 +852,7 @@ static bool vlv_power_well_enabled(struct drm_i915_private *dev_priv, ctrl =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_CTRL ) & mask;WARN_ON (ctrl != state); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);return enabled; }
@@ -1364,7 +1364,7 @@ static bool chv_pipe_power_well_enabled(struct drm_i915_private *dev_priv,bool enabled;u32 state, ctrl; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); state =vlv_punit_read (dev_priv,PUNIT_REG_DSPFREQ ) &DP_SSS_MASK (pipe);/*
@@ -1381,7 +1381,7 @@ static bool chv_pipe_power_well_enabled(struct drm_i915_private *dev_priv, ctrl =vlv_punit_read (dev_priv,PUNIT_REG_DSPFREQ ) &DP_SSC_MASK (pipe);WARN_ON (ctrl <<16 != state); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);return enabled; }
@@ -1396,7 +1396,7 @@ static void chv_set_pipe_power_well(struct drm_i915_private *dev_priv, state = enable ?DP_SSS_PWR_ON (pipe) :DP_SSS_PWR_GATE (pipe); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);#define COND \ ((vlv_punit_read(dev_priv, PUNIT_REG_DSPFREQ) & DP_SSS_MASK(pipe)) == state)
@@ -1417,7 +1417,7 @@ static void chv_set_pipe_power_well(struct drm_i915_private *dev_priv,#undef COND out: -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock); } static void chv_pipe_power_well_enable(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_sideband.c +3 -3
@@ -81,7 +81,7 @@ u32 vlv_punit_read(struct drm_i915_private *dev_priv, u32 addr) {u32 val =0 ; -WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); +WARN_ON (!mutex_is_locked (&dev_priv->pm.pcu_lock));mutex_lock (&dev_priv->sb_lock); vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_PUNIT,
@@ -95,7 +95,7 @@ int vlv_punit_write(struct drm_i915_private *dev_priv, u32 addr, u32 val) {int err; -WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); +WARN_ON (!mutex_is_locked (&dev_priv->pm.pcu_lock));mutex_lock (&dev_priv->sb_lock); err = vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_PUNIT,
@@ -125,7 +125,7 @@ u32 vlv_nc_read(struct drm_i915_private *dev_priv, u8 addr) {u32 val =0 ; -WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); +WARN_ON (!mutex_is_locked (&dev_priv->pm.pcu_lock));mutex_lock (&dev_priv->sb_lock); vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_NC,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/31] drm/i915: Name structure in dev_priv that contains RPS/RC6 state as "pm"
Quoted 7 lines · Sagar Arun Kamble
Prepared substructure rps for RPS related state.
autoenable_workandpcu_lockare used for RC6 hence they are defined outside rps structure. Renamed the RPS lock aspcu_lock.Cc Chris Wilson <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/31 drm/i915: Rename intel_enable_rc6 to intel_rc6_enabled
In reply to Sagar Arun KambleThis function gives the status of RC6, whether disabled or if enabled then which state. intel_enable_rc6 will be used for enabling RC6 in the next patch.
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_sysfs.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_guc.c | 3 ++- drivers/gpu/drm/i915/intel_pm.c | 12 ++++++------ 5 files changed, 11 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -2486,7 +2486,7 @@ static int intel_runtime_suspend(struct device *kdev)struct drm_i915_private *dev_priv =to_i915 (dev);int ret; -if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_enable_rc6 ()))) +if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_rc6_enabled ())))return -ENODEV ;if (WARN_ON_ONCE (!HAS_RUNTIME_PM (dev_priv)))
drivers/gpu/drm/i915/i915_sysfs.c +1 -1
@@ -49,7 +49,7 @@ static u32 calc_residency(struct drm_i915_private *dev_priv,static ssize_t show_rc6_mask (struct device *kdev,struct device_attribute *attr,char *buf) { -return snprintf (buf,PAGE_SIZE ,"%x\n" ,intel_enable_rc6 ()); +return snprintf (buf,PAGE_SIZE ,"%x\n" ,intel_rc6_enabled ()); } static ssize_t
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1900,7 +1900,7 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc, struct intel_crtc_state *cstate);void intel_init_ipc (struct drm_i915_private *dev_priv);void intel_enable_ipc (struct drm_i915_private *dev_priv); -static inline int intel_enable_rc6 (void ) +static inline int intel_rc6_enabled (void ) {return i915.enable_rc6; }
drivers/gpu/drm/i915/intel_guc.c +2 -1
@@ -128,7 +128,8 @@ int intel_guc_sample_forcewake(struct intel_guc *guc) action[0 ] =INTEL_GUC_ACTION_SAMPLE_FORCEWAKE ;/* WaRsDisableCoarsePowerGating:skl,bxt */ -if (!intel_enable_rc6 () ||NEEDS_WaRsDisableCoarsePowerGating (dev_priv)) +if (!intel_rc6_enabled () || +NEEDS_WaRsDisableCoarsePowerGating (dev_priv)) action[1 ] =0 ;else /* bit 0 and 1 are for Render and Media domain separately */
drivers/gpu/drm/i915/intel_pm.c +6 -6
@@ -6606,7 +6606,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN9_RENDER_PG_IDLE_HYSTERESIS ,25 );/* 3a: Enable RC6 */ -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mask =GEN6_RC_CTL_RC6_ENABLE ;DRM_INFO ("RC6 %s\n" ,onoff (rc6_mask &GEN6_RC_CTL_RC6_ENABLE ));I915_WRITE (GEN6_RC6_THRESHOLD ,37500 );/* 37.5/125ms per EI */
@@ -6655,7 +6655,7 @@ static void gen8_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC6_THRESHOLD ,50000 );/* 50/125ms per EI */ /* 3: Enable RC6 */ -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mask =GEN6_RC_CTL_RC6_ENABLE ;intel_print_rc6_info (dev_priv, rc6_mask); I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
@@ -6749,7 +6749,7 @@ static void gen6_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC6pp_THRESHOLD,64000 );/* unused */ /* Check if we are enabling RC6 */ - rc6_mode =intel_enable_rc6 (); + rc6_mode =intel_rc6_enabled ();if (rc6_mode &INTEL_RC6_ENABLE ) rc6_mask |=GEN6_RC_CTL_RC6_ENABLE ;
@@ -7251,7 +7251,7 @@ static void cherryview_enable_rc6(struct drm_i915_private *dev_priv) pcbr =I915_READ (VLV_PCBR );/* 3: Enable RC6 */ -if ((intel_enable_rc6 () &INTEL_RC6_ENABLE ) && +if ((intel_rc6_enabled () &INTEL_RC6_ENABLE ) && (pcbr >>VLV_PCBR_ADDR_SHIFT )) rc6_mode =GEN7_RC_CTL_TO_MODE ;
@@ -7345,7 +7345,7 @@ static void valleyview_enable_rc6(struct drm_i915_private *dev_priv)VLV_MEDIA_RC6_COUNT_EN | VLV_RENDER_RC6_COUNT_EN)); -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mode =GEN7_RC_CTL_TO_MODE |VLV_RC_CTL_CTX_RST_PARALLEL ;intel_print_rc6_info (dev_priv, rc6_mode);
@@ -9418,7 +9418,7 @@ u64 intel_rc6_residency_us(struct drm_i915_private *dev_priv, {u64 time_hw, units, div; -if (!intel_enable_rc6 ()) +if (!intel_rc6_enabled ())return 0 ;intel_runtime_pm_get (dev_priv);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/31] drm/i915: Rename intel_enable_rc6 to intel_rc6_enabled
Quoted 7 lines · Sagar Arun Kamble
This function gives the status of RC6, whether disabled or if enabled then which state.
intel_enable_rc6will be used for enabling RC6 in the next patch.Cc Chris Wilson <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/31] drm/i915: Rename intel_enable_rc6 to intel_rc6_enabled
In reply to Sagar Arun KambleQuoted 7 lines · Sagar Arun Kamble
This function gives the status of RC6, whether disabled or if enabled then which state.
intel_enable_rc6will be used for enabling RC6 in the next patch.Cc Chris Wilson <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>
- Ewelina
Quoted 126 lines
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_sysfs.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_guc.c | 3 ++- drivers/gpu/drm/i915/intel_pm.c | 12 ++++++------ 5 files changed, 11 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/i915_drv.c +1
-1@@ -2486,7 +2486,7 @@ static int intel_runtime_suspend(struct device *kdev)struct drm_i915_private *dev_priv =to_i915 (dev);int ret; -if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_enable_rc6 ()))) +if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_rc6_enabled ())))return -ENODEV ;if (WARN_ON_ONCE (!HAS_RUNTIME_PM (dev_priv)))drivers/gpu/drm/i915/i915_sysfs.c +1
-1@@ -49,7 +49,7 @@ static u32 calc_residency(struct drm_i915_private *dev_priv,static ssize_t show_rc6_mask (struct device *kdev,struct device_attribute *attr,char *buf) { -return snprintf (buf,PAGE_SIZE ,"%x\n" ,intel_enable_rc6 ()); +return snprintf (buf,PAGE_SIZE ,"%x\n" ,intel_rc6_enabled ()); } static ssize_tdrivers/gpu/drm/i915/intel_drv.h +1
-1@@ -1900,7 +1900,7 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc, struct intel_crtc_state *cstate);void intel_init_ipc (struct drm_i915_private *dev_priv);void intel_enable_ipc (struct drm_i915_private *dev_priv); -static inline int intel_enable_rc6 (void ) +static inline int intel_rc6_enabled (void ) {return i915.enable_rc6; }drivers/gpu/drm/i915/intel_guc.c +2
-1@@ -128,7 +128,8 @@ int intel_guc_sample_forcewake(struct intel_guc *guc) action[0 ] =INTEL_GUC_ACTION_SAMPLE_FORCEWAKE ;/* WaRsDisableCoarsePowerGating:skl,bxt */ -if (!intel_enable_rc6 () ||NEEDS_WaRsDisableCoarsePowerGating (dev_priv)) +if (!intel_rc6_enabled () || +NEEDS_WaRsDisableCoarsePowerGating (dev_priv)) action[1 ] =0 ;else /* bit 0 and 1 are for Render and Media domain separately */ drivers/gpu/drm/i915/intel_pm.c +6
-6@@ -6606,7 +6606,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN9_RENDER_PG_IDLE_HYSTERESIS ,25 );/* 3a: Enable RC6 */ -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mask =GEN6_RC_CTL_RC6_ENABLE ;DRM_INFO ("RC6 %s\n" ,onoff (rc6_mask &GEN6_RC_CTL_RC6_ENABLE ));I915_WRITE (GEN6_RC6_THRESHOLD ,37500 );/* 37.5/125ms per EI */ @@ -6655,7 +6655,7 @@ static void gen8_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC6_THRESHOLD ,50000 );/* 50/125ms per EI */ /* 3: Enable RC6 */ -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mask =GEN6_RC_CTL_RC6_ENABLE ;intel_print_rc6_info (dev_priv, rc6_mask); I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |@@ -6749,7 +6749,7 @@ static void gen6_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC6pp_THRESHOLD,64000 );/* unused */ /* Check if we are enabling RC6 */ - rc6_mode =intel_enable_rc6 (); + rc6_mode =intel_rc6_enabled ();if (rc6_mode &INTEL_RC6_ENABLE ) rc6_mask |=GEN6_RC_CTL_RC6_ENABLE ;@@ -7251,7 +7251,7 @@ static void cherryview_enable_rc6(struct drm_i915_private *dev_priv) pcbr =I915_READ (VLV_PCBR );/* 3: Enable RC6 */ -if ((intel_enable_rc6 () &INTEL_RC6_ENABLE ) && +if ((intel_rc6_enabled () &INTEL_RC6_ENABLE ) && (pcbr >>VLV_PCBR_ADDR_SHIFT )) rc6_mode =GEN7_RC_CTL_TO_MODE ;@@ -7345,7 +7345,7 @@ static void valleyview_enable_rc6(struct drm_i915_private *dev_priv)VLV_MEDIA_RC6_COUNT_EN | VLV_RENDER_RC6_COUNT_EN)); -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mode =GEN7_RC_CTL_TO_MODE |VLV_RC_CTL_CTX_RST_PARALLEL ;intel_print_rc6_info (dev_priv, rc6_mode);@@ -9418,7 +9418,7 @@ u64 intel_rc6_residency_us(struct drm_i915_private *dev_priv, {u64 time_hw, units, div; -if (!intel_enable_rc6 ()) +if (!intel_rc6_enabled ())return 0 ;intel_runtime_pm_get (dev_priv);Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/31] drm/i915: Rename intel_enable_rc6 to intel_rc6_enabled
Thank you Radek, Ewelina for the reviews.
Quoted 129 lines · Ewelina Musial
Quoted 7 lines · Sagar Arun Kamble
This function gives the status of RC6, whether disabled or if enabled then which state.
intel_enable_rc6will be used for enabling RC6 in the next patch.Cc Chris Wilson <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>Reviewed-by Ewelina Musial <[email protected]>- Ewelina
Quoted 118 lines
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_sysfs.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_guc.c | 3 ++- drivers/gpu/drm/i915/intel_pm.c | 12 ++++++------ 5 files changed, 11 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/i915_drv.c +1
-1@@ -2486,7 +2486,7 @@ static int intel_runtime_suspend(struct device *kdev)struct drm_i915_private *dev_priv =to_i915 (dev);int ret; -if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_enable_rc6 ()))) +if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_rc6_enabled ())))return -ENODEV ;if (WARN_ON_ONCE (!HAS_RUNTIME_PM (dev_priv)))drivers/gpu/drm/i915/i915_sysfs.c +1
-1@@ -49,7 +49,7 @@ static u32 calc_residency(struct drm_i915_private *dev_priv,static ssize_t show_rc6_mask (struct device *kdev,struct device_attribute *attr,char *buf) { -return snprintf (buf,PAGE_SIZE ,"%x\n" ,intel_enable_rc6 ()); +return snprintf (buf,PAGE_SIZE ,"%x\n" ,intel_rc6_enabled ()); } static ssize_tdrivers/gpu/drm/i915/intel_drv.h +1
-1@@ -1900,7 +1900,7 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc, struct intel_crtc_state *cstate);void intel_init_ipc (struct drm_i915_private *dev_priv);void intel_enable_ipc (struct drm_i915_private *dev_priv); -static inline int intel_enable_rc6 (void ) +static inline int intel_rc6_enabled (void ) {return i915.enable_rc6; }drivers/gpu/drm/i915/intel_guc.c +2
-1@@ -128,7 +128,8 @@ int intel_guc_sample_forcewake(struct intel_guc *guc) action[0 ] =INTEL_GUC_ACTION_SAMPLE_FORCEWAKE ;/* WaRsDisableCoarsePowerGating:skl,bxt */ -if (!intel_enable_rc6 () ||NEEDS_WaRsDisableCoarsePowerGating (dev_priv)) +if (!intel_rc6_enabled () || +NEEDS_WaRsDisableCoarsePowerGating (dev_priv)) action[1 ] =0 ;else /* bit 0 and 1 are for Render and Media domain separately */ drivers/gpu/drm/i915/intel_pm.c +6
-6@@ -6606,7 +6606,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN9_RENDER_PG_IDLE_HYSTERESIS ,25 );/* 3a: Enable RC6 */ -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mask =GEN6_RC_CTL_RC6_ENABLE ;DRM_INFO ("RC6 %s\n" ,onoff (rc6_mask &GEN6_RC_CTL_RC6_ENABLE ));I915_WRITE (GEN6_RC6_THRESHOLD ,37500 );/* 37.5/125ms per EI */ @@ -6655,7 +6655,7 @@ static void gen8_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC6_THRESHOLD ,50000 );/* 50/125ms per EI */ /* 3: Enable RC6 */ -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mask =GEN6_RC_CTL_RC6_ENABLE ;intel_print_rc6_info (dev_priv, rc6_mask); I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |@@ -6749,7 +6749,7 @@ static void gen6_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC6pp_THRESHOLD,64000 );/* unused */ /* Check if we are enabling RC6 */ - rc6_mode =intel_enable_rc6 (); + rc6_mode =intel_rc6_enabled ();if (rc6_mode &INTEL_RC6_ENABLE ) rc6_mask |=GEN6_RC_CTL_RC6_ENABLE ;@@ -7251,7 +7251,7 @@ static void cherryview_enable_rc6(struct drm_i915_private *dev_priv) pcbr =I915_READ (VLV_PCBR );/* 3: Enable RC6 */ -if ((intel_enable_rc6 () &INTEL_RC6_ENABLE ) && +if ((intel_rc6_enabled () &INTEL_RC6_ENABLE ) && (pcbr >>VLV_PCBR_ADDR_SHIFT )) rc6_mode =GEN7_RC_CTL_TO_MODE ;@@ -7345,7 +7345,7 @@ static void valleyview_enable_rc6(struct drm_i915_private *dev_priv)VLV_MEDIA_RC6_COUNT_EN | VLV_RENDER_RC6_COUNT_EN)); -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mode =GEN7_RC_CTL_TO_MODE |VLV_RC_CTL_CTX_RST_PARALLEL ;intel_print_rc6_info (dev_priv, rc6_mode);@@ -9418,7 +9418,7 @@ u64 intel_rc6_residency_us(struct drm_i915_private *dev_priv, {u64 time_hw, units, div; -if (!intel_enable_rc6 ()) +if (!intel_rc6_enabled ())return 0 ;
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0intel_runtime_pm_get (dev_priv);Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/31 drm/i915: Create generic function to setup ring frequency table
In reply to Sagar Arun KamblePrepared intel_update_ring_freq function to setup ring frequency for applicable platforms determined by macro - NEEDS_RING_FREQ_UPDATE
--- drivers/gpu/drm/i915/intel_pm.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +15 -4
@@ -7872,6 +7872,19 @@ static void intel_init_emon(struct drm_i915_private *dev_priv) dev_priv->ips.corr = (lcfuse &LCFUSE_HIV_MASK ); } +#define NEEDS_RING_FREQ_UPDATE (i915) \ + (((INTEL_GEN(i915) >= 9) && \ + (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915))) || \ + (IS_BROADWELL(i915)) || \ + ((INTEL_GEN(i915) >= 6) && \ + (!IS_CHERRYVIEW(i915) && !IS_VALLEYVIEW(i915)))) + +static inline void intel_update_ring_freq (struct drm_i915_private *i915) +{ +if (NEEDS_RING_FREQ_UPDATE (i915)) +gen6_update_ring_freq (i915); +} +void intel_init_gt_powersave (struct drm_i915_private *dev_priv) {struct intel_rps *rps = &dev_priv->pm.rps;
@@ -8018,21 +8031,19 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv) }else if (INTEL_GEN (dev_priv) >=9 ) {gen9_enable_rc6 (dev_priv);gen9_enable_rps (dev_priv); -if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv)) -gen6_update_ring_freq (dev_priv); }else if (IS_BROADWELL (dev_priv)) {gen8_enable_rc6 (dev_priv);gen8_enable_rps (dev_priv); -gen6_update_ring_freq (dev_priv); }else if (INTEL_GEN (dev_priv) >=6 ) {gen6_enable_rc6 (dev_priv);gen6_enable_rps (dev_priv); -gen6_update_ring_freq (dev_priv); }else if (IS_IRONLAKE_M (dev_priv)) {ironlake_enable_drps (dev_priv);intel_init_emon (dev_priv); } +intel_update_ring_freq (dev_priv); +WARN_ON (dev_priv->pm.rps.max_freq < dev_priv->pm.rps.min_freq);WARN_ON (dev_priv->pm.rps.idle_freq > dev_priv->pm.rps.max_freq);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/31 drm/i915: Create generic functions to control RC6, RPS
In reply to Sagar Arun KamblePrepared generic functions intel_enable_rc6, intel_disable_rc6, intel_enable_rps and intel_disable_rps functions to setup RC6/RPS based on platforms.
--- drivers/gpu/drm/i915/intel_pm.c | 95 ++++++++++++++++++++++++++--------------- 1 file changed, 61 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +61 -34
@@ -7981,74 +7981,101 @@ void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv)gen6_reset_rps_interrupts (dev_priv); } -void intel_disable_gt_powersave (struct drm_i915_private *dev_priv) +void intel_disable_rc6 (struct drm_i915_private *dev_priv) { -if (!READ_ONCE (dev_priv->pm.rps.enabled)) -return ; - -mutex_lock (&dev_priv->pm.pcu_lock); - -if (INTEL_GEN (dev_priv) >=9 ) { +if (INTEL_GEN (dev_priv) >=9 )gen9_disable_rc6 (dev_priv); -gen9_disable_rps (dev_priv); - }else if (IS_CHERRYVIEW (dev_priv)) { +else if (IS_CHERRYVIEW (dev_priv))cherryview_disable_rc6 (dev_priv); -cherryview_disable_rps (dev_priv); - }else if (IS_VALLEYVIEW (dev_priv)) { +else if (IS_VALLEYVIEW (dev_priv))valleyview_disable_rc6 (dev_priv); -valleyview_disable_rps (dev_priv); - }else if (INTEL_GEN (dev_priv) >=6 ) { +else if (INTEL_GEN (dev_priv) >=6 )gen6_disable_rc6 (dev_priv); +} + +void intel_disable_rps (struct drm_i915_private *dev_priv) +{ +if (INTEL_GEN (dev_priv) >=9 ) +gen9_disable_rps (dev_priv); +else if (IS_CHERRYVIEW (dev_priv)) +cherryview_disable_rps (dev_priv); +else if (IS_VALLEYVIEW (dev_priv)) +valleyview_disable_rps (dev_priv); +else if (INTEL_GEN (dev_priv) >=6 )gen6_disable_rps (dev_priv); - }else if (IS_IRONLAKE_M (dev_priv)) { +else if (IS_IRONLAKE_M (dev_priv))ironlake_disable_drps (dev_priv); - } - - dev_priv->pm.rps.enabled = false; -mutex_unlock (&dev_priv->pm.pcu_lock); } -void intel_enable_gt_powersave (struct drm_i915_private *dev_priv) +void intel_disable_gt_powersave (struct drm_i915_private *dev_priv) { -/* We shouldn't be disabling as we submit, so this should be less -* racy than it appears! -*/ -if (READ_ONCE (dev_priv->pm.rps.enabled)) -return ; - -/* Powersaving is controlled by the host when inside a VM */ -if (intel_vgpu_active (dev_priv)) +if (!READ_ONCE (dev_priv->pm.rps.enabled))return ;mutex_lock (&dev_priv->pm.pcu_lock); -if (IS_CHERRYVIEW (dev_priv)) { +intel_disable_rc6 (dev_priv); +intel_disable_rps (dev_priv); + + dev_priv->pm.rps.enabled = false; +mutex_unlock (&dev_priv->pm.pcu_lock); +} + +void intel_enable_rc6 (struct drm_i915_private *dev_priv) +{ +if (IS_CHERRYVIEW (dev_priv))cherryview_enable_rc6 (dev_priv); +else if (IS_VALLEYVIEW (dev_priv)) +valleyview_enable_rc6 (dev_priv); +else if (INTEL_GEN (dev_priv) >=9 ) +gen9_enable_rc6 (dev_priv); +else if (IS_BROADWELL (dev_priv)) +gen8_enable_rc6 (dev_priv); +else if (INTEL_GEN (dev_priv) >=6 ) +gen6_enable_rc6 (dev_priv); +} + +void intel_enable_rps (struct drm_i915_private *dev_priv) +{ +if (IS_CHERRYVIEW (dev_priv)) {cherryview_enable_rps (dev_priv); }else if (IS_VALLEYVIEW (dev_priv)) { -valleyview_enable_rc6 (dev_priv);valleyview_enable_rps (dev_priv); }else if (INTEL_GEN (dev_priv) >=9 ) { -gen9_enable_rc6 (dev_priv);gen9_enable_rps (dev_priv); }else if (IS_BROADWELL (dev_priv)) { -gen8_enable_rc6 (dev_priv);gen8_enable_rps (dev_priv); }else if (INTEL_GEN (dev_priv) >=6 ) { -gen6_enable_rc6 (dev_priv);gen6_enable_rps (dev_priv); }else if (IS_IRONLAKE_M (dev_priv)) {ironlake_enable_drps (dev_priv);intel_init_emon (dev_priv); } -intel_update_ring_freq (dev_priv); -WARN_ON (dev_priv->pm.rps.max_freq < dev_priv->pm.rps.min_freq);WARN_ON (dev_priv->pm.rps.idle_freq > dev_priv->pm.rps.max_freq);WARN_ON (dev_priv->pm.rps.efficient_freq < dev_priv->pm.rps.min_freq);WARN_ON (dev_priv->pm.rps.efficient_freq > dev_priv->pm.rps.max_freq); +} + +void intel_enable_gt_powersave (struct drm_i915_private *dev_priv) +{ +/* We shouldn't be disabling as we submit, so this should be less +* racy than it appears! +*/ +if (READ_ONCE (dev_priv->pm.rps.enabled)) +return ; + +/* Powersaving is controlled by the host when inside a VM */ +if (intel_vgpu_active (dev_priv)) +return ; + +mutex_lock (&dev_priv->pm.pcu_lock); + +intel_enable_rc6 (dev_priv); +intel_enable_rps (dev_priv); +intel_update_ring_freq (dev_priv); dev_priv->pm.rps.enabled = true;mutex_unlock (&dev_priv->pm.pcu_lock);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/31 drm/i915: Introduce separate status variable for RC6 and Ring frequency setup
In reply to Sagar Arun KambleDefined new struct intel_rc6 to hold RC6 specific state and intel_ring_pstate to hold ring specific state.
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 10 +++++++ drivers/gpu/drm/i915/intel_pm.c | 58 ++++++++++++++++++++++++++++++----------- 3 files changed, 54 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -2486,7 +2486,7 @@ static int intel_runtime_suspend(struct device *kdev)struct drm_i915_private *dev_priv =to_i915 (dev);int ret; -if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_rc6_enabled ()))) +if (WARN_ON_ONCE (!(dev_priv->pm.rc6.enabled &&intel_rc6_enabled ())))return -ENODEV ;if (WARN_ON_ONCE (!HAS_RUNTIME_PM (dev_priv)))
drivers/gpu/drm/i915/i915_drv.h +10 -0
@@ -1352,8 +1352,18 @@ struct intel_rps {struct intel_rps_ei ei; }; +struct intel_rc6 { +bool enabled; +}; + +struct intel_ring_pstate { +bool configured; +}; +struct intel_gen6_power_mgmt {struct intel_rps rps; +struct intel_rc6 rc6; +struct intel_ring_pstate ring_pstate;struct delayed_work autoenable_work;/*
drivers/gpu/drm/i915/intel_pm.c +43 -15
145 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/31 drm/i915: Define RPS idle, busy, boost function pointers
In reply to Sagar Arun KambleThese will allow to define nop functions when SLPC is in use. Initialized with gen6_rps_idle, gen6_rps_busy and gen6_rps_boost during intel_enable_rps.
--- drivers/gpu/drm/i915/i915_drv.h | 5 +++++ drivers/gpu/drm/i915/i915_gem.c | 6 +++--- drivers/gpu/drm/i915/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 24 ++++++++++++++++++++++++ 5 files changed, 34 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -1350,6 +1350,11 @@ struct intel_rps {/* manual wa residency calculations */ struct intel_rps_ei ei; + +void (*idle)(struct drm_i915_private *dev_priv); +void (*busy)(struct drm_i915_private *dev_priv); +void (*boost)(struct drm_i915_gem_request *rq, +struct intel_rps_client *rps); };struct intel_rc6 {
drivers/gpu/drm/i915/i915_gem.c +3 -3
@@ -388,7 +388,7 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj)*/ if (rps) {if (INTEL_GEN (rq->i915) >=6 ) -gen6_rps_boost (rq, rps); + rq->i915->pm.rps.boost (rq, rps);else rps =NULL ; }
@@ -2991,7 +2991,7 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)intel_sanitize_gt_powersave (dev_priv);intel_enable_gt_powersave (dev_priv);if (INTEL_GEN (dev_priv) >=6 ) -gen6_rps_busy (dev_priv); + dev_priv->pm.rps.busy (dev_priv); } }
@@ -3199,7 +3199,7 @@ bool i915_gem_unset_wedged(struct drm_i915_private *i915) rearm_hangcheck = false;if (INTEL_GEN (dev_priv) >=6 ) -gen6_rps_idle (dev_priv); + dev_priv->pm.rps.idle (dev_priv);intel_runtime_pm_put (dev_priv); out_unlock:mutex_unlock (&dev->struct_mutex);
drivers/gpu/drm/i915/i915_gem_request.c +1 -1
@@ -257,7 +257,7 @@ static void mark_busy(struct drm_i915_private *i915)intel_enable_gt_powersave (i915);i915_update_gfx_val (i915);if (INTEL_GEN (i915) >=6 ) -gen6_rps_busy (i915); + i915->pm.rps.busy (i915); queue_delayed_work(i915->wq, &i915->gt.retire_work,
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -12607,7 +12607,7 @@ static int do_rps_boost(struct wait_queue_entry *_wait,struct wait_rps_boost *wait =container_of (_wait,typeof (*wait), wait);struct drm_i915_gem_request *rq = wait->request; -gen6_rps_boost (rq,NULL ); + rq->i915->pm.rps.boost (rq,NULL );i915_gem_request_put (rq);drm_crtc_vblank_put (wait->crtc);
drivers/gpu/drm/i915/intel_pm.c +24 -0
@@ -7889,6 +7889,22 @@ static inline void intel_update_ring_freq(struct drm_i915_private *i915) } } +static void rps_idle_nop (struct drm_i915_private *dev_priv) +{ +DRM_DEBUG_DRIVER ("\n" ); +} + +static void rps_busy_nop (struct drm_i915_private *dev_priv) +{ +DRM_DEBUG_DRIVER ("\n" ); +} + +static void rps_boost_nop (struct drm_i915_gem_request *rq, +struct intel_rps_client *rps) +{ +DRM_DEBUG_DRIVER ("\n" ); +} +void intel_init_gt_powersave (struct drm_i915_private *dev_priv) {struct intel_rps *rps = &dev_priv->pm.rps;
@@ -7943,6 +7959,10 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv)/* Finally allow us to boost to max by default */ rps->boost_freq = rps->max_freq; + dev_priv->pm.rps.idle = rps_idle_nop; + dev_priv->pm.rps.busy = rps_busy_nop; + dev_priv->pm.rps.boost = rps_boost_nop; +mutex_unlock (&dev_priv->pm.pcu_lock);mutex_unlock (&dev_priv->drm.struct_mutex);
@@ -8064,6 +8084,10 @@ void intel_enable_rps(struct drm_i915_private *dev_priv)if (READ_ONCE (dev_priv->pm.rps.enabled))return ; + dev_priv->pm.rps.idle = gen6_rps_idle; + dev_priv->pm.rps.busy = gen6_rps_busy; + dev_priv->pm.rps.boost = gen6_rps_boost; +if (IS_CHERRYVIEW (dev_priv)) {cherryview_enable_rps (dev_priv); }else if (IS_VALLEYVIEW (dev_priv)) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 13/31 drm/i915/slpc: Add has_slpc capability flag
In reply to Sagar Arun KambleFrom: Tom O'Rourke <Tom.O'[email protected]>
Add has_slpc capablity flag to indicate GuC firmware supports single loop power control (SLPC). SLPC is a replacement for some host-based power management features.
v1: fix whitespace (Sagar)
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -791,6 +791,7 @@ struct intel_csr {func (has_rc6p); \func (has_resource_streamer); \func (has_runtime_pm); \ +func (has_slpc); \func (has_snoop); \func (unfenced_needs_alignment); \func (cursor_needs_physical); \
@@ -3162,6 +3163,7 @@ static inline unsigned int i915_sg_segment_size(void)#define HAS_GUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_GUC_SCHED (dev_priv) (HAS_GUC(dev_priv))#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv)) +#define HAS_SLPC (dev_priv) ((dev_priv)->info.has_slpc)#define HAS_RESOURCE_STREAMER (dev_priv) ((dev_priv)->info.has_resource_streamer)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 14/31 drm/i915/slpc: Add enable_slpc module parameter
In reply to Sagar Arun KambleFrom: Tom O'Rourke <Tom.O'[email protected]>
i915.enable_slpc is used to override the default for slpc usage. The expected values are -1=auto, 0=disabled [default], 1=enabled.
Sanitize i915.enable_slpc to either 0 or 1 based on HAS_SLPC() and GuC load and submission options.
v1: Add early call to sanitize enable_slpc in intel_guc_ucode_init
Remove sanitize enable_slpc call before firmware version check is performed. (ChrisW)
Version check is added in next patch and that will be done as part of slpc_enable_sanitize function in the next patch. (Sagar) Updated slpc option sanitize function call for platforms without GuC support. This was caught by CI BAT.
v2: Changed parameter to dev_priv for HAS_SLPC macro. (David)
Code indentation based on checkpatch.
v3: Rebase.
v4: Moved sanitization of SLPC option post GuC load.
v5: Removed function intel_slpc_enabled. Planning to rely only on
kernel parameter. Moved sanitization prior to GuC load to use the parameter during SLPC state setup during to GuC load. (Sagar)
v6: Commit message update. Rebase.
v7: Moved SLPC option sanitization to intel_uc_sanitize_options.
v8: Clearing SLPC option on GuC load failure. Change moved from later patch. (Sagar)
--- drivers/gpu/drm/i915/i915_params.c | 5 +++++ drivers/gpu/drm/i915/i915_params.h | 1 + drivers/gpu/drm/i915/intel_uc.c | 15 +++++++++++++++ 3 files changed, 21 insertions(+)
drivers/gpu/drm/i915/i915_params.c +5 -0
@@ -43,6 +43,7 @@ struct i915_params i915 __read_mostly = { .enable_dc = -1, .enable_fbc = -1, .enable_execlists = -1, + .enable_slpc = 0, .enable_hangcheck = true, .enable_ppgtt = -1, .enable_psr = -1,
@@ -139,6 +140,10 @@ struct i915_params i915 __read_mostly = {"Override execlists usage. " "(-1=auto [default], 0=disabled, 1=enabled)"); +i915_param_named_unsafe (enable_slpc, int,0400 , +"Override single-loop-power-controller (slpc) usage. " +"(-1=auto, 0=disabled [default], 1=enabled)" ); +i915_param_named_unsafe (enable_psr, int,0600 ,"Enable PSR " "(0=disabled, 1=enabled - link mode chosen per-platform, 2=force link-standby mode, 3=force link-off mode) "
drivers/gpu/drm/i915/i915_params.h +1 -0
@@ -41,6 +41,7 @@func (int, enable_ppgtt); \func (int, enable_execlists); \func (int, enable_psr); \ +func (int, enable_slpc); \func (int, disable_power_well); \func (int, enable_ips); \func (int, invert_brightness); \
drivers/gpu/drm/i915/intel_uc.c +15 -0
@@ -69,6 +69,7 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv) i915.enable_guc_loading =0 ; i915.enable_guc_submission =0 ; + i915.enable_slpc =0 ;return ; }
@@ -92,6 +93,18 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)/* A negative value means "use platform default" */ if (i915.enable_guc_submission <0 ) i915.enable_guc_submission =HAS_GUC_SCHED (dev_priv); + +/* slpc requires hardware support and compatible firmware */ +if (!HAS_SLPC (dev_priv)) + i915.enable_slpc =0 ; + +/* slpc requires guc loaded */ +if (!i915.enable_guc_loading) + i915.enable_slpc =0 ; + +/* slpc requires guc submission */ +if (!i915.enable_guc_submission) + i915.enable_slpc =0 ; }void intel_uc_init_early (struct drm_i915_private *dev_priv)
@@ -400,6 +413,8 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) i915.enable_guc_loading =0 ;DRM_NOTE ("GuC firmware loading disabled\n" ); + i915.enable_slpc =0 ; +return ret; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 15/31 drm/i915/slpc: Sanitize GuC version
In reply to Sagar Arun KambleFrom: Tom O'Rourke <Tom.O'[email protected]>
The SLPC interface is dependent on GuC version. Only GuC versions known to be compatible are supported here.
SLPC with GuC firmware v9 is supported with this series.
v1: Updated with modified sanitize_slpc_option in earlier patch.
v2-v3: Rebase.
v4: Updated support for GuC firmware v9.
v5: Commit subject updated.
v6: Commit subject and message update. Add support condition as >=v9.
v7: Sanitizing GuC version in intel_uc_init_fw for SLPC compatibility.
Added info. print for needed version and pointer to 01.org.
v8: s/FIRMWARE_URL/I915_FIRMWARE_URL, Macro added for SLPC required GuC
Major version and rearrangement for sanitization. (MichalW, Joonas)
v9: Checking major_ver_found to sanitize SLPC option enable_slpc post
fetching the firmware as with Custom firmware loaded through guc_firmware_path parameter, major_ver_wanted are cleared. (Lukasz)
v10: Moved the I915_FIRMWARE_URL macro to intel_uc_common.h.
--- drivers/gpu/drm/i915/intel_csr.c | 15 ++++++--------- drivers/gpu/drm/i915/intel_guc.h | 1 + drivers/gpu/drm/i915/intel_guc_loader.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 1 + drivers/gpu/drm/i915/intel_uc_common.h | 2 ++ 5 files changed, 25 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +6 -9
@@ -52,11 +52,6 @@MODULE_FIRMWARE (I915_CSR_BXT );#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7) -#define FIRMWARE_URL "https://01.org/linuxgraphics/downloads/firmware" - - - -#define CSR_MAX_FW_SIZE 0x2FFF#define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF
@@ -309,11 +304,12 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,if (csr->version != required_version) {DRM_INFO ("Refusing to load DMC firmware v%u.%u," -" please use v%u.%u [" FIRMWARE_URL "].\n" , +" please use v%u.%u [%s].\n" ,CSR_VERSION_MAJOR (csr->version),CSR_VERSION_MINOR (csr->version),CSR_VERSION_MAJOR (required_version), -CSR_VERSION_MINOR (required_version)); +CSR_VERSION_MINOR (required_version), +I915_FIRMWARE_URL );return NULL ; }
@@ -420,8 +416,9 @@ static void csr_load_work_fn(struct work_struct *work) }else {dev_notice (dev_priv->drm.dev,"Failed to load DMC firmware" -" [" FIRMWARE_URL "]," -" disabling runtime power management.\n" ); +" [%s]," +" disabling runtime power management.\n" , +I915_FIRMWARE_URL ); }release_firmware (fw);
drivers/gpu/drm/i915/intel_guc.h +1 -0
@@ -159,6 +159,7 @@ static inline void intel_guc_init_early(struct intel_guc *guc)int intel_guc_select_fw (struct intel_guc *guc);int intel_guc_init_hw (struct intel_guc *guc);u32 intel_guc_wopcm_size (struct intel_guc *guc); +void intel_guc_fetch_sanitize_options (struct intel_guc *guc);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_guc_loader.c +15 -0
@@ -64,6 +64,8 @@#define GLK_FW_MAJOR 10#define GLK_FW_MINOR 56 +#define I915_SLPC_REQUIRED_GUC_MAJOR 9 +#define GUC_FW_PATH (platform, major, minor) \ "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin"
@@ -418,3 +420,16 @@ int intel_guc_select_fw(struct intel_guc *guc)return 0 ; } + +void intel_guc_fetch_sanitize_options (struct intel_guc *guc) +{ +if (guc->fw.major_ver_found < +I915_SLPC_REQUIRED_GUC_MAJOR ) { +DRM_INFO ("SLPC not supported with GuC firmware" +" v%u, please use v%u+ [%s].\n" , + guc->fw.major_ver_found, +I915_SLPC_REQUIRED_GUC_MAJOR , +I915_FIRMWARE_URL ); + i915.enable_slpc =0 ; + } +}
drivers/gpu/drm/i915/intel_uc.c +1 -0
@@ -194,6 +194,7 @@ static void fetch_uc_fw(struct drm_i915_private *dev_priv, } uc_fw->major_ver_found = css->guc.sw_version >>16 ; uc_fw->minor_ver_found = css->guc.sw_version &0xFFFF ; +intel_guc_fetch_sanitize_options (&dev_priv->guc);break ;case INTEL_UC_FW_TYPE_HUC :
drivers/gpu/drm/i915/intel_uc_common.h +2 -0
@@ -27,6 +27,8 @@#include "intel_ringbuffer.h" #include "i915_vma.h" +#define I915_FIRMWARE_URL "https://01.org/linuxgraphics/intel-linux-graphics-firmwares" +enum intel_uc_fw_status {INTEL_UC_FIRMWARE_FAIL =-1 ,INTEL_UC_FIRMWARE_NONE =0 ,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 15/31] drm/i915/slpc: Sanitize GuC version
Quoted 55 lines · Sagar Arun Kamble
From: Tom O'Rourke <Tom.O'[email protected]>
The SLPC interface is dependent on GuC version. Only GuC versions known to be compatible are supported here.
SLPC with GuC firmware v9 is supported with this series.
v1: Updated with modified
sanitize_slpc_optionin earlier patch.v2-v3: Rebase.
v4: Updated support for GuC firmware v9.
v5: Commit subject updated.
v6: Commit subject and message update. Add support condition as >=v9.
v7: Sanitizing GuC version in
intel_uc_init_fwfor SLPC compatibility.
Added info. print for needed version and pointer to 01.org.v8: s/FIRMWARE_URL/I915_FIRMWARE_URL, Macro added for SLPC required GuC
Major version and rearrangement for sanitization. (MichalW, Joonas)v9: Checking
major_ver_foundto sanitize SLPC optionenable_slpcpost
fetching the firmware as with Custom firmware loaded throughguc_firmware_pathparameter,major_ver_wantedare cleared. (Lukasz)v10: Moved the
I915_FIRMWARE_URLmacro tointel_uc_common.h.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/intel_csr.c | 15 ++++++--------- drivers/gpu/drm/i915/intel_guc.h | 1 + drivers/gpu/drm/i915/intel_guc_loader.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 1 + drivers/gpu/drm/i915/intel_uc_common.h | 2 ++ 5 files changed, 25 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_csr.c +0
-5@@ -52,11 +52,6 @@MODULE_FIRMWARE (I915_CSR_BXT );#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7) -#define FIRMWARE_URL "https://01.org/linuxgraphics/downloads/firmware" - - - -#define CSR_MAX_FW_SIZE 0x2FFF#define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF@@ -309,11 +304,12 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_csr.c static uint32_t *parse_csr_fw(struct · line 312
Quoted 10 lines
drivers/gpu/drm/i915/intel_csr.c +3
-2if (csr->version != required_version) {DRM_INFO ("Refusing to load DMC firmware v%u.%u," -" please use v%u.%u [" FIRMWARE_URL "].\n" , +" please use v%u.%u [%s].\n" ,CSR_VERSION_MAJOR (csr->version),CSR_VERSION_MINOR (csr->version),CSR_VERSION_MAJOR (required_version), -CSR_VERSION_MINOR (required_version)); +CSR_VERSION_MINOR (required_version), +I915_FIRMWARE_URL );
Hmm, I'm not sure that including URL here is useful. URL will be repeated in csr_load_work_fn() where we can explain its purpose ;)
drivers/gpu/drm/i915/intel_csr.c static void csr_load_work_fn(struct work_struct · line 422
Quoted 12 lines
drivers/gpu/drm/i915/intel_csr.c +3
-2return NULL ; }@@ -420,8 +416,9 @@ static void csr_load_work_fn(struct work_struct *work) }else {dev_notice (dev_priv->drm.dev,"Failed to load DMC firmware" -" [" FIRMWARE_URL "]," -" disabling runtime power management.\n" ); +" [%s]," +" disabling runtime power management.\n" , +I915_FIRMWARE_URL );
Maybe more user friendly message should looks like:
"Failed to load DMC firmware, disabling runtime power management."
"DMC firmware can be downloaded from https://01.org/linuxgraphics/downloads/firmware"
Quoted 27 lines
drivers/gpu/drm/i915/intel_csr.c +0
-0}release_firmware (fw);drivers/gpu/drm/i915/intel_guc.h +1
-0@@ -159,6 +159,7 @@ static inline void intel_guc_init_early(struct intel_guc *guc)int intel_guc_select_fw (struct intel_guc *guc);int intel_guc_init_hw (struct intel_guc *guc);u32 intel_guc_wopcm_size (struct intel_guc *guc); +void intel_guc_fetch_sanitize_options (struct intel_guc *guc);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_guc_loader.c +2
-0@@ -64,6 +64,8 @@#define GLK_FW_MAJOR 10#define GLK_FW_MINOR 56 +#define I915_SLPC_REQUIRED_GUC_MAJOR 9 +#define GUC_FW_PATH (platform, major, minor) \ "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_"
__stringify(minor)".bin"
drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_select_fw(struct intel_guc *guc) · line 426
Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_loader.c +5
-0@@ -418,3 +420,16 @@ int intel_guc_select_fw(struct intel_guc *guc)return 0 ; } + +void intel_guc_fetch_sanitize_options (struct intel_guc *guc) +{ +if (guc->fw.major_ver_found < +I915_SLPC_REQUIRED_GUC_MAJOR ) {
Generally we do not allow Guc fw major "found" to be different than "wanted" so this check could be also done against "wanted".
drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_select_fw(struct intel_guc *guc) · line 432
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +5
-0+DRM_INFO ("SLPC not supported with GuC firmware" +" v%u, please use v%u+ [%s].\n" , + guc->fw.major_ver_found, +I915_SLPC_REQUIRED_GUC_MAJOR , +I915_FIRMWARE_URL );
Not sure that URL in this message is helpful.
drivers/gpu/drm/i915/intel_uc.c static void fetch_uc_fw(struct drm_i915_private · line 198
Quoted 13 lines
drivers/gpu/drm/i915/intel_guc_loader.c +3
-0+ i915.enable_slpc =0 ; + } +}drivers/gpu/drm/i915/intel_uc.c +1
-0@@ -194,6 +194,7 @@ static void fetch_uc_fw(struct drm_i915_private *dev_priv, } uc_fw->major_ver_found = css->guc.sw_version >>16 ; uc_fw->minor_ver_found = css->guc.sw_version &0xFFFF ; +intel_guc_fetch_sanitize_options (&dev_priv->guc);
This should be done as part of intel_uc_sanitize_options()
drivers/gpu/drm/i915/intel_uc_common.h line 28
Quoted 9 lines
drivers/gpu/drm/i915/intel_uc.c +0
-0break ;case INTEL_UC_FW_TYPE_HUC :drivers/gpu/drm/i915/intel_uc_common.h +0
-0@@ -27,6 +27,8 @@#include "intel_ringbuffer.h" #include "i915_vma.h"
Add separation line
drivers/gpu/drm/i915/intel_uc_common.h line 34
Quoted 6 lines
drivers/gpu/drm/i915/intel_uc_common.h +1
-0+#define I915_FIRMWARE_URL "https://01.org/linuxgraphics/intel-linux-graphics-firmwares"
drivers/gpu/drm/i915/intel_uc_common.h +1
-0+enum intel_uc_fw_status {INTEL_UC_FIRMWARE_FAIL =-1 ,INTEL_UC_FIRMWARE_NONE =0 ,
Michal
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 15/31] drm/i915/slpc: Sanitize GuC version
Quoted 63 lines · Michal Wajdeczko
Quoted 61 lines · Sagar Arun Kamble
From: Tom O'Rourke <Tom.O'[email protected]>
The SLPC interface is dependent on GuC version. Only GuC versions known to be compatible are supported here.
SLPC with GuC firmware v9 is supported with this series.
v1: Updated with modified
sanitize_slpc_optionin earlier patch.v2-v3: Rebase.
v4: Updated support for GuC firmware v9.
v5: Commit subject updated.
v6: Commit subject and message update. Add support condition as >=v9.
v7: Sanitizing GuC version in
intel_uc_init_fwfor SLPC compatibility. Added info. print for needed version and pointer to 01.org.v8: s/FIRMWARE_URL/I915_FIRMWARE_URL, Macro added for SLPC required GuC Major version and rearrangement for sanitization. (MichalW, Joonas)
v9: Checking
major_ver_foundto sanitize SLPC optionenable_slpcpost fetching the firmware as with Custom firmware loaded throughguc_firmware_pathparameter,major_ver_wantedare cleared. (Lukasz)v10: Moved the
I915_FIRMWARE_URLmacro tointel_uc_common.h.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/intel_csr.c | 15 ++++++--------- drivers/gpu/drm/i915/intel_guc.h | 1 +drivers/gpu/drm/i915/intel_guc_loader.c| 15 +++++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 1 + drivers/gpu/drm/i915/intel_uc_common.h | 2 ++5 files changed, 25 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_csr.c +0
-5@@ -52,11 +52,6 @@ MODULE_FIRMWARE(I915_CSR_BXT); #define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7) -#define FIRMWARE_URL "https://01.org/linuxgraphics/downloads/firmware" - - - - #define CSR_MAX_FW_SIZE 0x2FFF #define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF@@ -309,11 +304,12 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, if (csr->version != required_version) {DRM_INFO("Refusing to load DMC firmware v%u.%u," - " please use v%u.%u ["
FIRMWARE_URL"].\n", + " please use v%u.%u [%s].\n",CSR_VERSION_MAJOR(csr->version),CSR_VERSION_MINOR(csr->version),
Quoted 8 lines
Quoted 4 lines
CSR_VERSION_MAJOR(required_version), -CSR_VERSION_MINOR(required_version)); +CSR_VERSION_MINOR(required_version), +I915_FIRMWARE_URL);Hmm, I'm not sure that including URL here is useful. URL will be repeated in
csr_load_work_fn()where we can explain its purpose ;)
Sure. Will remove from here.
Quoted 17 lines
Quoted 8 lines
return NULL;
}drivers/gpu/drm/i915/intel_csr.c +0
-0@@ -420,8 +416,9 @@ static void csr_load_work_fn(struct work_struct *work) } else { dev_notice(dev_priv->drm.dev,Quoted 6 lines
"Failed to load DMC firmware"
- " ["FIRMWARE_URL"],"
- " disabling runtime power management.\n"); + " [%s],"
+ " disabling runtime power management.\n", +I915_FIRMWARE_URL);Maybe more user friendly message should looks like:
Quoted 2 lines
"Failed to load DMC firmware, disabling runtime power management."
"DMC firmware can be downloaded from https://01.org/linuxgraphics/downloads/firmware"
Yes. Will update like this.
Quoted 29 lines
Quoted 29 lines
}
release_firmware(fw);drivers/gpu/drm/i915/intel_guc.h +1
-0@@ -159,6 +159,7 @@ static inline void intel_guc_init_early(struct intel_guc *guc) int intel_guc_select_fw(struct intel_guc *guc); int intel_guc_init_hw(struct intel_guc *guc); u32 intel_guc_wopcm_size(struct intel_guc *guc); +void intel_guc_fetch_sanitize_options (struct intel_guc *guc);/* i915_guc_submission.c */ int i915_guc_submission_init(struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_guc_loader.c +2
-0@@ -64,6 +64,8 @@ #define GLK_FW_MAJOR 10 #define GLK_FW_MINOR 56 +#define I915_SLPC_REQUIRED_GUC_MAJOR 9 + #define GUC_FW_PATH(platform, major, minor) \"i915/"
__stringify(platform)"_guc_ver"__stringify(major)"_"__stringify(minor)".bin"drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -418,3 +420,16 @@ int intel_guc_select_fw(struct intel_guc *guc) return 0; }
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_select_fw(struct intel_guc *guc) · line 427
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +5
-0+ +void intel_guc_fetch_sanitize_options (struct intel_guc *guc) +{ + if (guc->fw.major_ver_found < + I915_SLPC_REQUIRED_GUC_MAJOR) {Generally we do not allow Guc fw major "found" to be different than "wanted" so this check could be also done against "wanted".
With Custom firmware loaded through guc_firmware_path parameter, major_ver_wanted is cleared. And then check fails. Lukasz verified this.
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_select_fw(struct intel_guc *guc) · line 432
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_loader.c +5
-0+ DRM_INFO("SLPC not supported with GuC firmware" + " v%u, please use v%u+ [%s].\n", + guc->fw.major_ver_found, + I915_SLPC_REQUIRED_GUC_MAJOR, + I915_FIRMWARE_URL);Not sure that URL in this message is helpful.
Will reword the message like for DMC.
Quoted 16 lines
Quoted 9 lines
drivers/gpu/drm/i915/intel_guc_loader.c +3
-0+ i915.enable_slpc = 0; + } +}drivers/gpu/drm/i915/intel_uc.c +0
-0drivers/gpu/drm/i915/intel_uc.c static void fetch_uc_fw(struct drm_i915_private · line 198
Quoted 5 lines
drivers/gpu/drm/i915/intel_uc.c +1
-0@@ -194,6 +194,7 @@ static void fetch_uc_fw(struct drm_i915_private *dev_priv, } uc_fw->major_ver_found = css->guc.sw_version >> 16; uc_fw->minor_ver_found = css->guc.sw_version & 0xFFFF; +intel_guc_fetch_sanitize_options (&dev_priv->guc);This should be done as part of
intel_uc_sanitize_options()
During fetch we know what is found hence doing check there helps for case when GuC firmware is supplied through guc_firmware_path parameter.
Quoted 12 lines
drivers/gpu/drm/i915/intel_uc_common.h line 28
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +0
-0break;case
INTEL_UC_FW_TYPE_HUC:drivers/gpu/drm/i915/intel_uc_common.h +0
-0@@ -27,6 +27,8 @@ #include "intel_ringbuffer.h" #include "i915_vma.h"Add separation line
Ok. Will update.
Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_uc_common.h +1
-0+#define I915_FIRMWARE_URL "https://01.org/linuxgraphics/intel-linux-graphics-firmwares" +
enumintel_uc_fw_status{
INTEL_UC_FIRMWARE_FAIL= -1,INTEL_UC_FIRMWARE_NONE= 0,Michal
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 16/31 drm/i915/slpc: Lay out SLPC init/enable/disable/cleanup helpers
In reply to Sagar Arun KambleSLPC operates based on parameters setup in shared data between i915 and GuC SLPC. This is to be created/initialized in intel_slpc_init. From there onwards i915 can control the SLPC operations by Enabling, Disabling complete SLPC or changing SLPC parameters. During cleanup SLPC shared data has to be freed.
With this patch on platforms with SLPC support we call intel_slpc_*() functions from GuC setup functions and do not use Host rps functions. With SLPC, intel_enable_gt_powersave will only handle RC6. In the later patch intel_init_gt_powersave will check if SLPC has started running through shared data and update initial state that i915 needs like frequency limits if needed.
v1: Return void instead of ignored error code (Paulo)
enable/disable RC6 in SLPC flows (Sagar)
replace HAS_SLPC() use with intel_slpc_enabled()
or intel_slpc_active() (Paulo)
Fix for renaming gen9_disable_rps to gen9_disable_rc6 in "drm/i915/bxt: Explicitly clear the Turbo control register" Defer RC6 and SLPC enabling to intel_gen6_powersave_work. (Sagar) Performance drop with SLPC was happening as ring frequency table was not programmed when SLPC was enabled. This patch programs ring frequency table with SLPC. Initial reset of SLPC is based on kernel parameter as planning to add slpc state in intel_slpc_active. Cleanup is also based on kernel parameter as SLPC gets disabled in disable/suspend.(Sagar)
v2: Usage of INTEL_GEN instead of INTEL_INFO->gen (David)
Checkpatch update.
v3: Rebase
v4: Removed reset functions to comply with *_gt_powersave routines.
(Sagar)
v5: Removed intel_slpc_active. Relying on slpc.active for control flows
that are based on SLPC active status in GuC. State setup/cleanup needed for SLPC is handled using kernel parameter i915.enable_slpc. Moved SLPC init and enabling to GuC enable path as SLPC in GuC can start doing the setup post GuC init. Commit message update. (Sagar)
v6: Rearranged function definitions.
v7: Makefile rearrangement. Reducing usage of i915.enable_slpc and relying
mostly on rps.rps_enabled to bypass Host RPS flows. Commit message update.
v8: Changed parameters for SLPC functions to struct intel_slpc*.
v9: Reinstated intel_slpc_active and intel_slpc_enabled as they are more
meaningful.
v10: Rebase changes due to creation of intel_guc.h. Updates in
intel_guc_cleanup w.r.t slpc cleanup.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 12 ++++++++++ drivers/gpu/drm/i915/intel_guc.c | 3 +++ drivers/gpu/drm/i915/intel_guc.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 19 +++++++++++----- drivers/gpu/drm/i915/intel_slpc.c | 42 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 47 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 20 +++++++++++++++++ 8 files changed, 142 insertions(+), 5 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_slpc.c create mode 100644 drivers/gpu/drm/i915/intel_slpc.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -64,6 +64,7 @@ i915-y += intel_uc.o \ intel_guc_log.o \ intel_guc_loader.o \ intel_huc.o \ + intel_slpc.o \ i915_guc_submission.o # autogenerated null render state
drivers/gpu/drm/i915/i915_drv.h +12 -0
@@ -2748,6 +2748,18 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) return container_of(guc, struct drm_i915_private, guc); } +static inline struct intel_guc *slpc_to_guc (struct intel_slpc *slpc) +{ + return container_of(slpc, struct intel_guc, slpc); +} + +static inline struct drm_i915_private *slpc_to_i915 (struct intel_slpc *slpc) +{ +struct intel_guc *guc =slpc_to_guc (slpc); + +return guc_to_i915 (guc); +} +static inline struct drm_i915_private *huc_to_i915 (struct intel_huc *huc) { return container_of(huc, struct drm_i915_private, huc);
drivers/gpu/drm/i915/intel_guc.c +3 -0
@@ -226,6 +226,9 @@ void intel_guc_cleanup(struct intel_guc *guc)if (i915.enable_guc_submission)i915_guc_submission_cleanup (dev_priv); + +if (intel_slpc_enabled ()) +intel_slpc_cleanup (&guc->slpc); }/**
drivers/gpu/drm/i915/intel_guc.h +3 -0
@@ -28,6 +28,7 @@#include "intel_guc_fwif.h" #include "i915_guc_reg.h" #include "intel_guc_ct.h" +#include "intel_slpc.h" /* * This structure primarily describes the GEM object shared with the GuC.
@@ -115,6 +116,8 @@ struct intel_guc {enum forcewake_domains fw_domains; } send_regs; +struct intel_slpc slpc; +/* To serialize the intel_guc_send actions */ struct mutex send_mutex;
drivers/gpu/drm/i915/intel_pm.c +14 -5
@@ -7995,6 +7995,12 @@ void intel_suspend_gt_powersave(struct drm_i915_private *dev_priv)intel_runtime_pm_put (dev_priv);/* gen6_rps_idle() will be called later to disable interrupts */ + +if (intel_slpc_active (&dev_priv->guc.slpc)) { +intel_runtime_pm_get (dev_priv); +intel_slpc_disable (&dev_priv->guc.slpc); +intel_runtime_pm_put (dev_priv); + } }void intel_sanitize_gt_powersave (struct drm_i915_private *dev_priv)
@@ -8121,7 +8127,8 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv)mutex_lock (&dev_priv->pm.pcu_lock);intel_enable_rc6 (dev_priv); -intel_enable_rps (dev_priv); +if (!intel_slpc_active (&dev_priv->guc.slpc)) +intel_enable_rps (dev_priv);intel_update_ring_freq (dev_priv);mutex_unlock (&dev_priv->pm.pcu_lock);
@@ -8134,8 +8141,9 @@ static void __intel_autoenable_gt_powersave(struct work_struct *work)struct intel_engine_cs *rcs;struct drm_i915_gem_request *req; -if (READ_ONCE (dev_priv->pm.rps.enabled) && -READ_ONCE (dev_priv->pm.rc6.enabled) && +if (READ_ONCE (dev_priv->pm.rc6.enabled) && + !(!(intel_slpc_active (&dev_priv->guc.slpc)) ^ +READ_ONCE (dev_priv->pm.rps.enabled)) && !(NEEDS_RING_FREQ_UPDATE (dev_priv) ^READ_ONCE (dev_priv->pm.ring_pstate.configured))) goto out;
@@ -8167,8 +8175,9 @@ static void __intel_autoenable_gt_powersave(struct work_struct *work)void intel_autoenable_gt_powersave (struct drm_i915_private *dev_priv) { -if (READ_ONCE (dev_priv->pm.rps.enabled) && -READ_ONCE (dev_priv->pm.rc6.enabled) && +if (READ_ONCE (dev_priv->pm.rc6.enabled) && + !(!(intel_slpc_active (&dev_priv->guc.slpc)) ^ +READ_ONCE (dev_priv->pm.rps.enabled)) && !(NEEDS_RING_FREQ_UPDATE (dev_priv) ^READ_ONCE (dev_priv->pm.ring_pstate.configured)))return ;
drivers/gpu/drm/i915/intel_slpc.c new file +42 -0
42 lines not on this page · raw message
drivers/gpu/drm/i915/intel_slpc.h new file +47 -0
47 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.c +20 -0
@@ -328,6 +328,9 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) ret =i915_guc_submission_init (dev_priv);if (ret) goto err_guc; + +if (intel_slpc_enabled ()) +intel_slpc_init (&dev_priv->guc.slpc); }/* init WOPCM */
@@ -369,6 +372,17 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) goto err_log_capture;intel_huc_auth (&dev_priv->huc); + +/* +* SLPC is enabled by setting up the shared data structure and +* sending reset event to GuC SLPC. Initial data is setup in +* intel_slpc_init. Here we send the reset event. SLPC enabling +* in GuC can happen in parallel in GuC with other initialization +* being done in i915. +*/ +if (intel_slpc_enabled ()) +intel_slpc_enable (&dev_priv->guc.slpc); +if (i915.enable_guc_submission) {if (i915.guc_log_level >=0 )gen9_enable_guc_interrupts (dev_priv);
@@ -398,6 +412,12 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)if (i915.enable_guc_submission)i915_guc_submission_cleanup (dev_priv); err_guc: +if (intel_slpc_enabled ()) { +if (intel_slpc_active (&dev_priv->guc.slpc)) +intel_slpc_disable (&dev_priv->guc.slpc); +intel_slpc_cleanup (&dev_priv->guc.slpc); + } +i915_ggtt_disable_guc (dev_priv);DRM_ERROR ("GuC init failed\n" );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 16/31] drm/i915/slpc: Lay out SLPC init/enable/disable/cleanup helpers
Quoted 57 lines · Sagar Arun Kamble
SLPC operates based on parameters setup in shared data between i915 and GuC SLPC. This is to be created/initialized in
intel_slpc_init. From there onwards i915 can control the SLPC operations by Enabling, Disabling complete SLPC or changing SLPC parameters. During cleanup SLPC shared data has to be freed.
With this patch on platforms with SLPC support we call intel_slpc_*() functions from GuC setup functions and do not use Host rps functions. With SLPC,intel_enable_gt_powersavewill only handle RC6. In the later patchintel_init_gt_powersavewill check if SLPC has started running through shared data and update initial state that i915 needs like frequency limits if needed.v1: Return void instead of ignored error code (Paulo)
enable/disable RC6 in SLPC flows (Sagar)
replaceHAS_SLPC()use withintel_slpc_enabled()
orintel_slpc_active()(Paulo)
Fix for renaminggen9_disable_rpstogen9_disable_rc6in "drm/i915/bxt: Explicitly clear the Turbo control register" Defer RC6 and SLPC enabling tointel_gen6_powersave_work. (Sagar) Performance drop with SLPC was happening as ring frequency table was not programmed when SLPC was enabled. This patch programs ring frequency table with SLPC. Initial reset of SLPC is based on kernel parameter as planning to add slpc state inintel_slpc_active. Cleanup is also based on kernel parameter as SLPC gets disabled in disable/suspend.(Sagar)v2: Usage of
INTEL_GENinstead ofINTEL_INFO->gen(David)
Checkpatch update.v3: Rebase
v4: Removed reset functions to comply with
*_gt_powersaveroutines.(Sagar)v5: Removed
intel_slpc_active. Relying on slpc.active for control flows
that are based on SLPC active status in GuC. State setup/cleanup
needed
for SLPC is handled using kernel parameter i915.enable_slpc. Moved
SLPC
init and enabling to GuC enable path as SLPC in GuC can start doing
the
setup post GuC init. Commit message update. (Sagar)v6: Rearranged function definitions.
v7:
Makefilerearrangement. Reducing usage of i915.enable_slpc and relying
mostly on rps.rps_enabled to bypass Host RPS flows. Commit message update.v8: Changed parameters for SLPC functions to struct intel_slpc*.
v9: Reinstated
intel_slpc_activeandintel_slpc_enabledas they are more
meaningful.v10: Rebase changes due to creation of
intel_guc.h. Updates in
intel_guc_cleanupw.r.t slpc cleanup.
Quoted 7 lines
Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 12 ++++++++++ drivers/gpu/drm/i915/intel_guc.c | 3 +++ drivers/gpu/drm/i915/intel_guc.h | 3 +++
Hmm, this looks like cross dependency on other pending series
Quoted 2 lines
drivers/gpu/drm/i915/intel_pm.c | 19 +++++++++++----- drivers/gpu/drm/i915/intel_slpc.c | 42
It looks that SLPC is tight with Guc so maybe better names would be:
intel_guc_slpc.c and struct intel_guc_slpc
ie. the same pattern as with Guc log.
Quoted 69 lines
++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_slpc.h | 47 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 20 +++++++++++++++++ 8 files changed, 142 insertions(+), 5 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_slpc.c create mode 100644 drivers/gpu/drm/i915/intel_slpc.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -64,6 +64,7 @@ i915-y += intel_uc.o \ intel_guc_log.o \ intel_guc_loader.o \ intel_huc.o \ + intel_slpc.o \ i915_guc_submission.o # autogenerated null render statedrivers/gpu/drm/i915/i915_drv.h +12
-0@@ -2748,6 +2748,18 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) return container_of(guc, struct drm_i915_private, guc); } +static inline struct intel_guc *slpc_to_guc (struct intel_slpc *slpc) +{ + return container_of(slpc, struct intel_guc, slpc); +} + +static inline struct drm_i915_private *slpc_to_i915 (struct intel_slpc *slpc) +{ +struct intel_guc *guc =slpc_to_guc (slpc); + +return guc_to_i915 (guc); +} +static inline struct drm_i915_private *huc_to_i915 (struct intel_huc *huc){
drivers/gpu/drm/i915/i915_drv.h +0
-0return container_of(huc, struct drm_i915_private, huc);drivers/gpu/drm/i915/intel_guc.c +3
-0@@ -226,6 +226,9 @@ void intel_guc_cleanup(struct intel_guc *guc)if (i915.enable_guc_submission)i915_guc_submission_cleanup (dev_priv); + +if (intel_slpc_enabled ()) +intel_slpc_cleanup (&guc->slpc); }/** drivers/gpu/drm/i915/intel_guc.h +1
-0@@ -28,6 +28,7 @@#include "intel_guc_fwif.h" #include "i915_guc_reg.h" #include "intel_guc_ct.h" +#include "intel_slpc.h" /* * This structure primarily describes the GEM object shared with the GuC.
drivers/gpu/drm/i915/intel_guc.h struct intel_guc { · line 119
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc.h +2
-0@@ -115,6 +116,8 @@ struct intel_guc {enum forcewake_domains fw_domains; } send_regs; +struct intel_slpc slpc; +
Pick better place - now you're inside 'send' related members.
Quoted 211 lines
drivers/gpu/drm/i915/intel_guc.h +0
-0/* To serialize the intel_guc_send actions */ struct mutex send_mutex;drivers/gpu/drm/i915/intel_pm.c +14
-5@@ -7995,6 +7995,12 @@ void intel_suspend_gt_powersave(struct drm_i915_private *dev_priv)intel_runtime_pm_put (dev_priv );/* gen6_rps_idle() will be called later to disable interrupts */ + +if (intel_slpc_active (&dev_priv->guc.slpc)) { +intel_runtime_pm_get (dev_priv); +intel_slpc_disable (&dev_priv->guc.slpc); +intel_runtime_pm_put (dev_priv); + } }void intel_sanitize_gt_powersave (struct drm_i915_private *dev_priv)@@ -8121,7 +8127,8 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv) mutex_lock(&dev_priv->pm.pcu_lock);intel_enable_rc6 (dev_priv); -intel_enable_rps (dev_priv); +if (!intel_slpc_active (&dev_priv->guc.slpc)) +intel_enable_rps (dev_priv);intel_update_ring_freq (dev_priv);mutex_unlock (&dev_priv->pm.pcu_lock);@@ -8134,8 +8141,9 @@ static void __intel_autoenable_gt_powersave(struct work_struct *work)struct intel_engine_cs *rcs;struct drm_i915_gem_request *req; -if (READ_ONCE (dev_priv->pm.rps.enabled) && -READ_ONCE (dev_priv->pm.rc6.enabled) && +if (READ_ONCE (dev_priv->pm.rc6.enabled) && + !(!(intel_slpc_active (&dev_priv->guc.slpc)) ^ +READ_ONCE (dev_priv->pm.rps.enabled)) && !(NEEDS_RING_FREQ_UPDATE (dev_priv) ^READ_ONCE (dev_priv->pm.ring_pstate.configured))) goto out;@@ -8167,8 +8175,9 @@ static void __intel_autoenable_gt_powersave(struct work_struct *work)void intel_autoenable_gt_powersave (struct drm_i915_private *dev_priv) { -if (READ_ONCE (dev_priv->pm.rps.enabled) && -READ_ONCE (dev_priv->pm.rc6.enabled) && +if (READ_ONCE (dev_priv->pm.rc6.enabled) && + !(!(intel_slpc_active (&dev_priv->guc.slpc)) ^ +READ_ONCE (dev_priv->pm.rps.enabled)) && !(NEEDS_RING_FREQ_UPDATE (dev_priv) ^READ_ONCE (dev_priv->pm.ring_pstate.configured)))return ;drivers/gpu/drm/i915/intel_slpc.c new file +4
-0@@ -0,0 +1,42 @@ +/* +* Copyright © 2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */drivers/gpu/drm/i915/intel_slpc.c new file +19
-0+#include <linux/firmware.h> +#include "i915_drv.h" +#include "intel_uc.h" + +void intel_slpc_init (struct intel_slpc *slpc) +{ +} + +void intel_slpc_cleanup (struct intel_slpc *slpc) +{ +} + +void intel_slpc_enable (struct intel_slpc *slpc) +{ +} + +void intel_slpc_disable (struct intel_slpc *slpc) +{ +}drivers/gpu/drm/i915/intel_slpc.h new file +4
-0@@ -0,0 +1,47 @@ +/* +* Copyright © 2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */drivers/gpu/drm/i915/intel_slpc.h new file +24
-0+#ifndef _INTEL_SLPC_H_ +#define _INTEL_SLPC_H_ + +struct intel_slpc { +bool active; +}; + +static inline int intel_slpc_enabled (void ) +{ +return i915.enable_slpc; +} + +static inline bool intel_slpc_active (struct intel_slpc *slpc) +{ +return slpc->active; +} + +/* intel_slpc.c */ +void intel_slpc_init (struct intel_slpc *slpc); +void intel_slpc_cleanup (struct intel_slpc *slpc); +void intel_slpc_enable (struct intel_slpc *slpc); +void intel_slpc_disable (struct intel_slpc *slpc); + +#endif drivers/gpu/drm/i915/intel_uc.c +14
-0@@ -328,6 +328,9 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) ret =i915_guc_submission_init (dev_priv);if (ret) goto err_guc; + +if (intel_slpc_enabled ()) +intel_slpc_init (&dev_priv->guc.slpc); }/* init WOPCM */ @@ -369,6 +372,17 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) goto err_log_capture;intel_huc_auth (&dev_priv->huc); + +/* +* SLPC is enabled by setting up the shared data structure and +* sending reset event to GuC SLPC. Initial data is setup in +* intel_slpc_init. Here we send the reset event. SLPC enabling +* in GuC can happen in parallel in GuC with other initialization +* being done in i915. +*/ +if (intel_slpc_enabled ()) +intel_slpc_enable (&dev_priv->guc.slpc); +if (i915.enable_guc_submission) {if (i915.guc_log_level >=0 )gen9_enable_guc_interrupts (dev_priv);@@ -398,6 +412,12 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)if (i915.enable_guc_submission)
drivers/gpu/drm/i915/intel_uc.c int intel_uc_init_hw(struct drm_i915_private · line 423
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +6
-0i915_guc_submission_cleanup (dev_priv); err_guc: +if (intel_slpc_enabled ()) { +if (intel_slpc_active (&dev_priv->guc.slpc)) +intel_slpc_disable (&dev_priv->guc.slpc); +intel_slpc_cleanup (&dev_priv->guc.slpc); + } +i915_ggtt_disable_guc (dev_priv);DRM_ERROR ("GuC init failed\n" );
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 16/31] drm/i915/slpc: Lay out SLPC init/enable/disable/cleanup helpers
Quoted 64 lines · Michal Wajdeczko
Quoted 54 lines · Sagar Arun Kamble
SLPC operates based on parameters setup in shared data between i915 and GuC SLPC. This is to be created/initialized in
intel_slpc_init. From there onwards i915 can control the SLPC operations by Enabling, Disabling complete SLPC or changing SLPC parameters. During cleanup SLPC shared data has to be freed.
With this patch on platforms with SLPC support we call intel_slpc_*() functions from GuC setup functions and do not use Host rps functions. With SLPC,intel_enable_gt_powersavewill only handle RC6. In the later patchintel_init_gt_powersavewill check if SLPC has started running through shared data and update initial state that i915 needs like frequency limits if needed.v1: Return void instead of ignored error code (Paulo) enable/disable RC6 in SLPC flows (Sagar)
replaceHAS_SLPC()use withintel_slpc_enabled()
orintel_slpc_active()(Paulo)
Fix for renaminggen9_disable_rpstogen9_disable_rc6in "drm/i915/bxt: Explicitly clear the Turbo control register" Defer RC6 and SLPC enabling tointel_gen6_powersave_work. (Sagar) Performance drop with SLPC was happening as ring frequency table was not programmed when SLPC was enabled. This patch programs ring frequency table with SLPC. Initial reset of SLPC is based on kernel parameter as planning to add slpc state inintel_slpc_active. Cleanup is also based on kernel parameter as SLPC gets disabled in disable/suspend.(Sagar)v2: Usage of
INTEL_GENinstead ofINTEL_INFO->gen(David) Checkpatch update.v3: Rebase
v4: Removed reset functions to comply with
*_gt_powersaveroutines. (Sagar)v5: Removed
intel_slpc_active. Relying on slpc.active for control flows that are based on SLPC active status in GuC. State setup/cleanup needed for SLPC is handled using kernel parameter i915.enable_slpc. Moved SLPC init and enabling to GuC enable path as SLPC in GuC can start doing the setup post GuC init. Commit message update. (Sagar)v6: Rearranged function definitions.
v7:
Makefilerearrangement. Reducing usage of i915.enable_slpc and relying mostly on rps.rps_enabled to bypass Host RPS flows. Commit message update.v8: Changed parameters for SLPC functions to struct intel_slpc*.
v9: Reinstated
intel_slpc_activeandintel_slpc_enabledas they are more meaningful.v10: Rebase changes due to creation of
intel_guc.h. Updates inintel_guc_cleanupw.r.t slpc cleanup.Quoted 7 lines
Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 12 ++++++++++ drivers/gpu/drm/i915/intel_guc.c | 3 +++ drivers/gpu/drm/i915/intel_guc.h | 3 +++
Quoted 1 line
Hmm, this looks like cross dependency on other pending series
Yes. Will make this independent series.
Quoted 9 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c | 19 +++++++++++-----
drivers/gpu/drm/i915/intel_slpc.c| 42It looks that SLPC is tight with Guc so maybe better names would be:
intel_guc_slpc.c and struct
intel_guc_slpcie. the same pattern as with Guc log.
Sure. Will update.
Quoted 67 lines
Quoted 67 lines
++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_slpc.h | 47
+++++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_uc.c | 20 +++++++++++++++++8 files changed, 142 insertions(+), 5 deletions(-)create mode 100644
drivers/gpu/drm/i915/intel_slpc.ccreate mode 100644drivers/gpu/drm/i915/intel_slpc.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -64,6 +64,7 @@ i915-y += intel_uc.o \ intel_guc_log.o \ intel_guc_loader.o \ intel_huc.o \ + intel_slpc.o \i915_guc_submission.o
# autogenerated null render statedrivers/gpu/drm/i915/i915_drv.h +12
-0@@ -2748,6 +2748,18 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) return container_of(guc, struct drm_i915_private, guc); } +static inline struct intel_guc *slpc_to_guc (struct intel_slpc *slpc) +{ + return container_of(slpc, struct intel_guc, slpc); +} + +static inline struct drm_i915_private *slpc_to_i915 (struct intel_slpc *slpc) +{ + struct intel_guc *guc = slpc_to_guc(slpc); + + return guc_to_i915(guc); +} + static inline struct drm_i915_private *huc_to_i915(struct intel_huc *huc) {return
container_of(huc, struct drm_i915_private, huc);drivers/gpu/drm/i915/intel_guc.c +3
-0@@ -226,6 +226,9 @@ void intel_guc_cleanup(struct intel_guc *guc) if (i915.enable_guc_submission) i915_guc_submission_cleanup(dev_priv); + + if (intel_slpc_enabled()) + intel_slpc_cleanup(&guc->slpc); }/** drivers/gpu/drm/i915/intel_guc.h +1
-0@@ -28,6 +28,7 @@ #include "intel_guc_fwif.h" #include "i915_guc_reg.h" #include "intel_guc_ct.h" +#include "intel_slpc.h" /*
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc.h struct intel_guc { · line 119
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc.h +2
-0* This structure primarily describes the GEM object shared with the GuC.@@ -115,6 +116,8 @@ struct intel_guc { enum forcewake_domains fw_domains; } send_regs; + struct intel_slpc slpc; +Pick better place - now you're inside 'send' related members.
Ok. Will update.
Quoted 216 lines
Quoted 216 lines
drivers/gpu/drm/i915/intel_guc.h +0
-0/* To serialize the intel_guc_send actions */ struct mutex send_mutex;drivers/gpu/drm/i915/intel_pm.c +11
-3@@ -7995,6 +7995,12 @@ void intel_suspend_gt_powersave(struct drm_i915_private *dev_priv) intel_runtime_pm_put(dev_priv); /* gen6_rps_idle() will be called later to disable interrupts */ + + if (intel_slpc_active(&dev_priv->guc.slpc)) { + intel_runtime_pm_get(dev_priv); + intel_slpc_disable(&dev_priv->guc.slpc); + intel_runtime_pm_put(dev_priv); + } }void intel_sanitize_gt_powersave (struct drm_i915_private *dev_priv)@@ -8121,7 +8127,8 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv) mutex_lock(&dev_priv->pm.pcu_lock); intel_enable_rc6(dev_priv); - intel_enable_rps(dev_priv); + if (!intel_slpc_active(&dev_priv->guc.slpc)) + intel_enable_rps(dev_priv); intel_update_ring_freq(dev_priv); mutex_unlock(&dev_priv->pm.pcu_lock);@@ -8134,8 +8141,9 @@ static void __intel_autoenable_gt_powersave(struct work_struct *work) struct intel_engine_cs *rcs; struct drm_i915_gem_request *req; - if (READ_ONCE(dev_priv->pm.rps.enabled) && - READ_ONCE(dev_priv->pm.rc6.enabled) && + if (READ_ONCE(dev_priv->pm.rc6.enabled) && + !(!(intel_slpc_active(&dev_priv->guc.slpc)) ^ + READ_ONCE(dev_priv->pm.rps.enabled)) &&!(NEEDS_RING_FREQ_UPDATE(dev_priv) ^
READ_ONCE(dev_priv->pm.ring_pstate.configured))) goto out;drivers/gpu/drm/i915/intel_pm.c +3
-2@@ -8167,8 +8175,9 @@ static void __intel_autoenable_gt_powersave(struct work_struct *work) void intel_autoenable_gt_powersave(struct drm_i915_private *dev_priv) { - if (READ_ONCE(dev_priv->pm.rps.enabled) && - READ_ONCE(dev_priv->pm.rc6.enabled) && + if (READ_ONCE(dev_priv->pm.rc6.enabled) && + !(!(intel_slpc_active(&dev_priv->guc.slpc)) ^ + READ_ONCE(dev_priv->pm.rps.enabled)) &&!(NEEDS_RING_FREQ_UPDATE(dev_priv) ^
READ_ONCE(dev_priv->pm.ring_pstate.configured))) return;drivers/gpu/drm/i915/intel_slpc.c new file +4
-0@@ -0,0 +1,42 @@ +/* +* Copyright © 2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */drivers/gpu/drm/i915/intel_slpc.c new file +19
-0+#include <linux/firmware.h> +#include "i915_drv.h" +#include "intel_uc.h" + +void intel_slpc_init (struct intel_slpc *slpc) +{ +} + +void intel_slpc_cleanup (struct intel_slpc *slpc) +{ +} + +void intel_slpc_enable (struct intel_slpc *slpc) +{ +} + +void intel_slpc_disable (struct intel_slpc *slpc) +{ +}drivers/gpu/drm/i915/intel_slpc.h new file +4
-0@@ -0,0 +1,47 @@ +/* +* Copyright © 2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */drivers/gpu/drm/i915/intel_slpc.h new file +24
-0+#ifndef _INTEL_SLPC_H_ +#define _INTEL_SLPC_H_ + +struct intel_slpc { + bool active; +}; + +static inline int intel_slpc_enabled (void ) +{ + return i915.enable_slpc; +} + +static inline bool intel_slpc_active (struct intel_slpc *slpc) +{ + return slpc->active; +} + +/* intel_slpc.c */ +void intel_slpc_init (struct intel_slpc *slpc); +void intel_slpc_cleanup (struct intel_slpc *slpc); +void intel_slpc_enable (struct intel_slpc *slpc); +void intel_slpc_disable (struct intel_slpc *slpc); + +#endif drivers/gpu/drm/i915/intel_uc.c +14
-0@@ -328,6 +328,9 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) ret = i915_guc_submission_init(dev_priv); if (ret) goto err_guc; + + if (intel_slpc_enabled()) + intel_slpc_init(&dev_priv->guc.slpc); } /* init WOPCM */@@ -369,6 +372,17 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) goto err_log_capture; intel_huc_auth(&dev_priv->huc); + + /* + * SLPC is enabled by setting up the shared data structure and + * sending reset event to GuC SLPC. Initial data is setup in + * intel_slpc_init. Here we send the reset event. SLPC enabling + * in GuC can happen in parallel in GuC with other initialization + * being done in i915. + */ + if (intel_slpc_enabled()) + intel_slpc_enable(&dev_priv->guc.slpc); + if (i915.enable_guc_submission) { if (i915.guc_log_level >= 0) gen9_enable_guc_interrupts(dev_priv);@@ -398,6 +412,12 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) if (i915.enable_guc_submission) i915_guc_submission_cleanup(dev_priv);err_guc:
Quoted 8 lines
Quoted 8 lines
+ if (
intel_slpc_enabled()) {
+ if (intel_slpc_active(&dev_priv->guc.slpc)) +intel_slpc_disable(&dev_priv->guc.slpc); +intel_slpc_cleanup(&dev_priv->guc.slpc); + }
+
i915_ggtt_disable_guc(dev_priv);DRM_ERROR("GuC init failed\n");
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 17/31 drm/i915/slpc: Enable SLPC in GuC if supported
In reply to Sagar Arun KambleFrom: Tom O'Rourke <Tom.O'[email protected]>
If slpc enabled, then add enable SLPC flag to guc
control parameter during guc load.
v1: Use intel_slpc_enabled() (Paulo)
v2-v4: Rebase.
v5: Changed intel_slpc_enabled() to i915.enable_slpc. (Sagar)
v6: Changed i915.enable_slpc to intel_slpc_enabled(). (Sagar)
--- drivers/gpu/drm/i915/intel_guc_loader.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +3 -0
@@ -131,6 +131,9 @@ static void guc_params_init(struct drm_i915_private *dev_priv) params[GUC_CTL_FEATURE ] |=GUC_CTL_DISABLE_SCHEDULER |GUC_CTL_VCS2_ENABLED ; +if (intel_slpc_enabled ()) + params[GUC_CTL_FEATURE ] |=GUC_CTL_ENABLE_SLPC ; + params[GUC_CTL_LOG_PARAMS ] = guc->log.flags;if (i915.guc_log_level >=0 ) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 18/31 drm/i915/slpc: Add SLPC communication interfaces
In reply to Sagar Arun KambleCommunication with SLPC is via Host to GuC interrupt through shared data and parameters. This patch defines the structure of shared data, parameters, data structure to be passed as input and received as output from SLPC. This patch also defines the events to be sent as input and status values output by GuC on processing SLPC events. SLPC shared data has details of SKU type, Slice count, IA Perf MSR values, SLPC state, Power source/plan, SLPC tasks status. Parameters allow overriding task control, frequency range etc.
v1: fix whitespace (Sagar)
v2-v3: Rebase.
v4: Updated with GuC firmware v9.
v5: Added definition of input and output data structures for SLPC events. Updated commit message.
v6: Removed definition of host2guc_slpc. Will be added in the next patch that uses it. Commit subject update. Rebase.
v7: Added definition of SLPC_RESET_FLAG_TDR_OCCURRED to be sent throgh SLPC reset in case of engine reset. Moved all Host/SLPC interfaces from later patches to this patch. Commit message update.
v8: Updated value of SLPC_RESET_FLAG_TDR_OCCURRED.
--- drivers/gpu/drm/i915/intel_slpc.c | 39 +++++++ drivers/gpu/drm/i915/intel_slpc.h | 207 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 246 insertions(+)
drivers/gpu/drm/i915/intel_slpc.c +39 -0
@@ -25,6 +25,45 @@#include "i915_drv.h" #include "intel_uc.h" +struct slpc_param slpc_paramlist[SLPC_MAX_PARAM ] = { + {SLPC_PARAM_TASK_ENABLE_GTPERF ,"Enable task GTPERF" }, + {SLPC_PARAM_TASK_DISABLE_GTPERF ,"Disable task GTPERF" }, + {SLPC_PARAM_TASK_ENABLE_BALANCER ,"Enable task BALANCER" }, + {SLPC_PARAM_TASK_DISABLE_BALANCER ,"Disable task BALANCER" }, + {SLPC_PARAM_TASK_ENABLE_DCC ,"Enable task DCC" }, + {SLPC_PARAM_TASK_DISABLE_DCC ,"Disable task DCC" }, + {SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ , +"Minimum GT frequency request for unslice" }, + {SLPC_PARAM_GLOBAL_MAX_GT_UNSLICE_FREQ_MHZ , +"Maximum GT frequency request for unslice" }, + {SLPC_PARAM_GLOBAL_MIN_GT_SLICE_FREQ_MHZ , +"Minimum GT frequency request for slice" }, + {SLPC_PARAM_GLOBAL_MAX_GT_SLICE_FREQ_MHZ , +"Maximum GT frequency request for slice" }, + {SLPC_PARAM_GTPERF_THRESHOLD_MAX_FPS , +"If non-zero, algorithm will slow down " +"frame-based applications to this frame-rate" }, + {SLPC_PARAM_GLOBAL_DISABLE_GT_FREQ_MANAGEMENT , +"Lock GT frequency request to RPe" }, + {SLPC_PARAM_GTPERF_ENABLE_FRAMERATE_STALLING , +"Set to TRUE to enable slowing framerate" }, + {SLPC_PARAM_GLOBAL_DISABLE_RC6_MODE_CHANGE , +"Prevent from changing the RC mode" }, + {SLPC_PARAM_GLOBAL_OC_UNSLICE_FREQ_MHZ , +"Override fused value of unslice RP0" }, + {SLPC_PARAM_GLOBAL_OC_SLICE_FREQ_MHZ , +"Override fused value of slice RP0" }, + {SLPC_PARAM_GLOBAL_ENABLE_IA_GT_BALANCING , +"TRUE means enable Intelligent Bias Control" }, + {SLPC_PARAM_GLOBAL_ENABLE_ADAPTIVE_BURST_TURBO , +"TRUE = enable eval mode when transitioning " +"from idle to active." }, + {SLPC_PARAM_GLOBAL_ENABLE_EVAL_MODE , +"FALSE = disable eval mode completely" }, + {SLPC_PARAM_GLOBAL_ENABLE_BALANCER_IN_NON_GAMING_MODE , +"Enable IBC when non-Gaming Mode is enabled" } +}; +void intel_slpc_init (struct intel_slpc *slpc) { }
drivers/gpu/drm/i915/intel_slpc.h +207 -0
213 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 18/31] drm/i915/slpc: Add SLPC communication interfaces
Quoted 107 lines · Sagar Arun Kamble
Communication with SLPC is via Host to GuC interrupt through shared data and parameters. This patch defines the structure of shared data, parameters, data structure to be passed as input and received as output from SLPC. This patch also defines the events to be sent as input and status values output by GuC on processing SLPC events. SLPC shared data has details of SKU type, Slice count, IA Perf MSR values, SLPC state, Power source/plan, SLPC tasks status. Parameters allow overriding task control, frequency range etc.
v1: fix whitespace (Sagar)
v2-v3: Rebase.
v4: Updated with GuC firmware v9.
v5: Added definition of input and output data structures for SLPC events. Updated commit message.
v6: Removed definition of
host2guc_slpc. Will be added in the next patch that uses it. Commit subject update. Rebase.v7: Added definition of
SLPC_RESET_FLAG_TDR_OCCURREDto be sent throgh SLPC reset in case of engine reset. Moved all Host/SLPC interfaces from later patches to this patch. Commit message update.v8: Updated value of
SLPC_RESET_FLAG_TDR_OCCURRED.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/intel_slpc.c | 39 +++++++ drivers/gpu/drm/i915/intel_slpc.h | 207 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 246 insertions(+)drivers/gpu/drm/i915/intel_slpc.c +39
-0@@ -25,6 +25,45 @@#include "i915_drv.h" #include "intel_uc.h" +struct slpc_param slpc_paramlist[SLPC_MAX_PARAM ] = { + {SLPC_PARAM_TASK_ENABLE_GTPERF ,"Enable task GTPERF" }, + {SLPC_PARAM_TASK_DISABLE_GTPERF ,"Disable task GTPERF" }, + {SLPC_PARAM_TASK_ENABLE_BALANCER ,"Enable task BALANCER" }, + {SLPC_PARAM_TASK_DISABLE_BALANCER ,"Disable task BALANCER" }, + {SLPC_PARAM_TASK_ENABLE_DCC ,"Enable task DCC" }, + {SLPC_PARAM_TASK_DISABLE_DCC ,"Disable task DCC" }, + {SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ , +"Minimum GT frequency request for unslice" }, + {SLPC_PARAM_GLOBAL_MAX_GT_UNSLICE_FREQ_MHZ , +"Maximum GT frequency request for unslice" }, + {SLPC_PARAM_GLOBAL_MIN_GT_SLICE_FREQ_MHZ , +"Minimum GT frequency request for slice" }, + {SLPC_PARAM_GLOBAL_MAX_GT_SLICE_FREQ_MHZ , +"Maximum GT frequency request for slice" }, + {SLPC_PARAM_GTPERF_THRESHOLD_MAX_FPS , +"If non-zero, algorithm will slow down " +"frame-based applications to this frame-rate" }, + {SLPC_PARAM_GLOBAL_DISABLE_GT_FREQ_MANAGEMENT , +"Lock GT frequency request to RPe" }, + {SLPC_PARAM_GTPERF_ENABLE_FRAMERATE_STALLING , +"Set to TRUE to enable slowing framerate" }, + {SLPC_PARAM_GLOBAL_DISABLE_RC6_MODE_CHANGE , +"Prevent from changing the RC mode" }, + {SLPC_PARAM_GLOBAL_OC_UNSLICE_FREQ_MHZ , +"Override fused value of unslice RP0" }, + {SLPC_PARAM_GLOBAL_OC_SLICE_FREQ_MHZ , +"Override fused value of slice RP0" }, + {SLPC_PARAM_GLOBAL_ENABLE_IA_GT_BALANCING , +"TRUE means enable Intelligent Bias Control" }, + {SLPC_PARAM_GLOBAL_ENABLE_ADAPTIVE_BURST_TURBO , +"TRUE = enable eval mode when transitioning " +"from idle to active." }, + {SLPC_PARAM_GLOBAL_ENABLE_EVAL_MODE , +"FALSE = disable eval mode completely" }, + {SLPC_PARAM_GLOBAL_ENABLE_BALANCER_IN_NON_GAMING_MODE , +"Enable IBC when non-Gaming Mode is enabled" } +}; +void intel_slpc_init (struct intel_slpc *slpc) { }drivers/gpu/drm/i915/intel_slpc.h +15
-0@@ -38,6 +38,213 @@ static inline bool intel_slpc_active(struct intel_slpc *slpc)return slpc->active; } +enum slpc_status { +SLPC_STATUS_OK =0 , +SLPC_STATUS_ERROR =1 , +SLPC_STATUS_ILLEGAL_COMMAND =2 , +SLPC_STATUS_INVALID_ARGS =3 , +SLPC_STATUS_INVALID_PARAMS =4 , +SLPC_STATUS_INVALID_DATA =5 , +SLPC_STATUS_OUT_OF_RANGE =6 , +SLPC_STATUS_NOT_SUPPORTED =7 , +SLPC_STATUS_NOT_IMPLEMENTED =8 , +SLPC_STATUS_NO_DATA =9 , +SLPC_STATUS_EVENT_NOT_REGISTERED =10 , +SLPC_STATUS_REGISTER_LOCKED =11 , +SLPC_STATUS_TEMPORARILY_UNAVAILABLE =12 , +SLPC_STATUS_VALUE_ALREADY_SET =13 ,
drivers/gpu/drm/i915/intel_slpc.h static inline bool intel_slpc_active(struct · line 65
Quoted 10 lines
drivers/gpu/drm/i915/intel_slpc.h +10
-0+SLPC_STATUS_VALUE_ALREADY_UNSET =14 , +SLPC_STATUS_VALUE_NOT_CHANGED =15 , +SLPC_STATUS_MEMIO_ERROR =16 , +SLPC_STATUS_EVENT_QUEUED_REQ_DPC =17 , +SLPC_STATUS_EVENT_QUEUED_NOREQ_DPC =18 , +SLPC_STATUS_NO_EVENT_QUEUED =19 , +SLPC_STATUS_OUT_OF_SPACE =20 , +SLPC_STATUS_TIMEOUT =21 , + SLPC_STATUS_NO_LOCK = 22, +};
I'm always wondering why everyone wants to design its own errno codes ... But seriously, do we need to define and use all of them ?
Quoted 164 lines
drivers/gpu/drm/i915/intel_slpc.h +163
-0+ +enum slpc_event_id { +SLPC_EVENT_RESET =0 , +SLPC_EVENT_SHUTDOWN =1 , +SLPC_EVENT_PLATFORM_INFO_CHANGE =2 , +SLPC_EVENT_DISPLAY_MODE_CHANGE =3 , +SLPC_EVENT_FLIP_COMPLETE =4 , +SLPC_EVENT_QUERY_TASK_STATE =5 , +SLPC_EVENT_PARAMETER_SET =6 , +SLPC_EVENT_PARAMETER_UNSET =7 , +}; + +enum slpc_param_id { +SLPC_PARAM_TASK_ENABLE_GTPERF =0 , +SLPC_PARAM_TASK_DISABLE_GTPERF =1 , +SLPC_PARAM_TASK_ENABLE_BALANCER =2 , +SLPC_PARAM_TASK_DISABLE_BALANCER =3 , +SLPC_PARAM_TASK_ENABLE_DCC =4 , +SLPC_PARAM_TASK_DISABLE_DCC =5 , +SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ =6 , +SLPC_PARAM_GLOBAL_MAX_GT_UNSLICE_FREQ_MHZ =7 , +SLPC_PARAM_GLOBAL_MIN_GT_SLICE_FREQ_MHZ =8 , +SLPC_PARAM_GLOBAL_MAX_GT_SLICE_FREQ_MHZ =9 , +SLPC_PARAM_GTPERF_THRESHOLD_MAX_FPS =10 , +SLPC_PARAM_GLOBAL_DISABLE_GT_FREQ_MANAGEMENT =11 , +SLPC_PARAM_GTPERF_ENABLE_FRAMERATE_STALLING =12 , +SLPC_PARAM_GLOBAL_DISABLE_RC6_MODE_CHANGE =13 , +SLPC_PARAM_GLOBAL_OC_UNSLICE_FREQ_MHZ =14 , +SLPC_PARAM_GLOBAL_OC_SLICE_FREQ_MHZ =15 , +SLPC_PARAM_GLOBAL_ENABLE_IA_GT_BALANCING =16 , +SLPC_PARAM_GLOBAL_ENABLE_ADAPTIVE_BURST_TURBO =17 , +SLPC_PARAM_GLOBAL_ENABLE_EVAL_MODE =18 , +SLPC_PARAM_GLOBAL_ENABLE_BALANCER_IN_NON_GAMING_MODE =19 , +SLPC_MAX_PARAM , +SLPC_KMD_MAX_PARAM =32 , +}; + +enum slpc_platform_sku { +SLPC_PLATFORM_SKU_UNDEFINED =0 , +SLPC_PLATFORM_SKU_ULX =1 , +SLPC_PLATFORM_SKU_ULT =2 , +SLPC_PLATFORM_SKU_T =3 , +SLPC_PLATFORM_SKU_MOBL =4 , +SLPC_PLATFORM_SKU_DT =5 , +SLPC_PLATFORM_SKU_UNKNOWN =6 , +}; + +enum slpc_power_source { +SLPC_POWER_SOURCE_UNDEFINED =0 , +SLPC_POWER_SOURCE_AC =1 , +SLPC_POWER_SOURCE_DC =2 , +SLPC_POWER_SOURCE_UNKNOWN =3 , +}; + +enum slpc_power_plan { +SLPC_POWER_PLAN_UNDEFINED =0 , +SLPC_POWER_PLAN_BATTERY_SAVER =1 , +SLPC_POWER_PLAN_BALANCED =2 , +SLPC_POWER_PLAN_PERFORMANCE =3 , +SLPC_POWER_PLAN_UNKNOWN =4 , +}; + +struct slpc_platform_info { +u8 platform_sku; +u8 slice_count; +u8 reserved; +u8 power_plan_source; +u8 P0_freq; +u8 P1_freq; +u8 Pe_freq; +u8 Pn_freq; +u32 reserved1; +u32 reserved2; +} __packed; + +enum slpc_global_state { +SLPC_GLOBAL_STATE_NOT_RUNNING =0 , +SLPC_GLOBAL_STATE_INITIALIZING =1 , +SLPC_GLOBAL_STATE_RESETTING =2 , +SLPC_GLOBAL_STATE_RUNNING =3 , +SLPC_GLOBAL_STATE_SHUTTING_DOWN =4 , +SLPC_GLOBAL_STATE_ERROR =5 +}; + +struct slpc_task_state_data { +union { +u32 bitfield1; +struct { +u32 gtperf_task_active:1 ; +u32 gtperf_stall_possible:1 ; +u32 gtperf_gaming_mode:1 ; +u32 gtperf_target_fps:8 ; +u32 dcc_task_active:1 ; +u32 in_dcc:1 ; +u32 in_dct:1 ; +u32 freq_switch_active:1 ; +u32 ibc_enabled:1 ; +u32 ibc_active:1 ; +u32 pg1_enabled:1 ; +u32 pg1_active:1 ; +u32 reserved:13 ; + }; + }; +union { +u32 bitfield2; +struct { +u32 max_unslice_freq:8 ; +u32 min_unslice_freq:8 ; +u32 max_slice_freq:8 ; +u32 min_slice_freq:8 ; + }; + }; +} __packed; + +#define SLPC_MAX_OVERRIDE_PARAMETERS 192 +#define SLPC_OVERRIDE_BITFIELD_SIZE ((SLPC_MAX_OVERRIDE_PARAMETERS + 31) / 32) + +struct slpc_shared_data { +u32 reserved; +u32 shared_data_size; +u32 global_state; +struct slpc_platform_info platform_info; +struct slpc_task_state_data task_state_data; +u32 override_parameters_set_bits[SLPC_OVERRIDE_BITFIELD_SIZE ]; +u32 override_parameters_values[SLPC_MAX_OVERRIDE_PARAMETERS ]; +} __packed; + +enum slpc_reset_flags { +SLPC_RESET_FLAG_TDR_OCCURRED = (1 <<0 ) +}; + +#define SLPC_EVENT_MAX_INPUT_ARGS 7 +#define SLPC_EVENT_MAX_OUTPUT_ARGS 1 + +union slpc_event_input_header { +u32 value; +struct { +u32 num_args:8 ; +u32 event_id:8 ; + }; +}; + +struct slpc_event_input { +u32 h2g_action_id; +union slpc_event_input_header header; +u32 args[SLPC_EVENT_MAX_INPUT_ARGS ]; +} __packed; + +union slpc_event_output_header { +u32 value; +struct { +u32 num_args:8 ; +u32 event_id:8 ; +u32 status:16 ; + }; +}; + +struct slpc_event_output { +u32 reserved; +union slpc_event_output_header header; +u32 args[SLPC_EVENT_MAX_OUTPUT_ARGS ]; +} __packed; +
drivers/gpu/drm/i915/intel_slpc.h static inline bool intel_slpc_active(struct intel_slpc *slpc) · line 238
Quoted 10 lines
drivers/gpu/drm/i915/intel_slpc.h +10
-0+#define SLPC_EVENT (id, argc) ((u32) (id) << 8 | (argc)) +#define SLPC_POWER_PLAN_SOURCE (plan, source) ((plan) | ((source) << 6)) +#define SLPC_POWER_PLAN (plan_source) ((plan_source) & 0x3F) +#define SLPC_POWER_SOURCE (plan_source) ((plan_source) >> 6) + +/* Structures for exposing parameter details to user. */ +#define MAX_PARAM_DESCRIPTION_SIZE 160 +struct slpc_param { +enum slpc_param_id id; +char description[MAX_PARAM_DESCRIPTION_SIZE ];
Hmm, 160 bytes for description is big.
As "id" starts from 0 maybe we can use simpler variant (in .c file)
static struct slpc_param_names {
const char *description;
} params[] = { ... };Quoted 11 lines
drivers/gpu/drm/i915/intel_slpc.h +9
-0+}; + +extern struct slpc_param slpc_paramlist[]; + +#define SLPC_PARAM_TASK_DEFAULT 0 +#define SLPC_PARAM_TASK_ENABLED 1 +#define SLPC_PARAM_TASK_DISABLED 2 +#define SLPC_PARAM_TASK_UNKNOWN 3 +/* intel_slpc.c */ void intel_slpc_init (struct intel_slpc *slpc);
Quoted 1 line
void
intel_slpc_cleanup(struct intel_slpc *slpc);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 18/31] drm/i915/slpc: Add SLPC communication interfaces
Quoted 114 lines · Michal Wajdeczko
Quoted 112 lines · Sagar Arun Kamble
Communication with SLPC is via Host to GuC interrupt through shared data and parameters. This patch defines the structure of shared data, parameters, data structure to be passed as input and received as output from SLPC. This patch also defines the events to be sent as input and status values output by GuC on processing SLPC events. SLPC shared data has details of SKU type, Slice count, IA Perf MSR values, SLPC state, Power source/plan, SLPC tasks status. Parameters allow overriding task control, frequency range etc.
v1: fix whitespace (Sagar)
v2-v3: Rebase.
v4: Updated with GuC firmware v9.
v5: Added definition of input and output data structures for SLPC events. Updated commit message.
v6: Removed definition of
host2guc_slpc. Will be added in the next patch that uses it. Commit subject update. Rebase.v7: Added definition of
SLPC_RESET_FLAG_TDR_OCCURREDto be sent throgh SLPC reset in case of engine reset. Moved all Host/SLPC interfaces from later patches to this patch. Commit message update.v8: Updated value of
SLPC_RESET_FLAG_TDR_OCCURRED.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/intel_slpc.c | 39 +++++++
drivers/gpu/drm/i915/intel_slpc.h | 207
++++++++++++++++++++++++++++++++++++++2 files changed, 246 insertions(+)drivers/gpu/drm/i915/intel_slpc.c +39
-0@@ -25,6 +25,45 @@ #include "i915_drv.h" #include "intel_uc.h" +struct slpc_param slpc_paramlist[SLPC_MAX_PARAM ] = { + {SLPC_PARAM_TASK_ENABLE_GTPERF, "Enable task GTPERF"}, + {SLPC_PARAM_TASK_DISABLE_GTPERF, "Disable task GTPERF"}, + {SLPC_PARAM_TASK_ENABLE_BALANCER, "Enable task BALANCER"}, + {SLPC_PARAM_TASK_DISABLE_BALANCER, "Disable task BALANCER"}, + {SLPC_PARAM_TASK_ENABLE_DCC, "Enable task DCC"}, + {SLPC_PARAM_TASK_DISABLE_DCC, "Disable task DCC"}, + {SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ, + "Minimum GT frequency request for unslice"}, + {SLPC_PARAM_GLOBAL_MAX_GT_UNSLICE_FREQ_MHZ, + "Maximum GT frequency request for unslice"}, + {SLPC_PARAM_GLOBAL_MIN_GT_SLICE_FREQ_MHZ, + "Minimum GT frequency request for slice"}, + {SLPC_PARAM_GLOBAL_MAX_GT_SLICE_FREQ_MHZ, + "Maximum GT frequency request for slice"}, + {SLPC_PARAM_GTPERF_THRESHOLD_MAX_FPS, + "If non-zero, algorithm will slow down " + "frame-based applications to this frame-rate"}, + {SLPC_PARAM_GLOBAL_DISABLE_GT_FREQ_MANAGEMENT, + "Lock GT frequency request to RPe"}, + {SLPC_PARAM_GTPERF_ENABLE_FRAMERATE_STALLING, + "Set to TRUE to enable slowing framerate"}, + {SLPC_PARAM_GLOBAL_DISABLE_RC6_MODE_CHANGE, + "Prevent from changing the RC mode"}, + {SLPC_PARAM_GLOBAL_OC_UNSLICE_FREQ_MHZ, + "Override fused value of unslice RP0"}, + {SLPC_PARAM_GLOBAL_OC_SLICE_FREQ_MHZ, + "Override fused value of slice RP0"}, + {SLPC_PARAM_GLOBAL_ENABLE_IA_GT_BALANCING, + "TRUE means enable Intelligent Bias Control"}, + {SLPC_PARAM_GLOBAL_ENABLE_ADAPTIVE_BURST_TURBO, + "TRUE = enable eval mode when transitioning " + "from idle to active."}, + {SLPC_PARAM_GLOBAL_ENABLE_EVAL_MODE, + "FALSE = disable eval mode completely"}, + {SLPC_PARAM_GLOBAL_ENABLE_BALANCER_IN_NON_GAMING_MODE, + "Enable IBC when non-Gaming Mode is enabled"} +}; + void intel_slpc_init(struct intel_slpc *slpc) { }drivers/gpu/drm/i915/intel_slpc.h +20
-0@@ -38,6 +38,213 @@ static inline bool intel_slpc_active(struct intel_slpc *slpc) return slpc->active; } +enum slpc_status { + SLPC_STATUS_OK = 0, + SLPC_STATUS_ERROR = 1, + SLPC_STATUS_ILLEGAL_COMMAND = 2, + SLPC_STATUS_INVALID_ARGS = 3, + SLPC_STATUS_INVALID_PARAMS = 4, + SLPC_STATUS_INVALID_DATA = 5, + SLPC_STATUS_OUT_OF_RANGE = 6, + SLPC_STATUS_NOT_SUPPORTED = 7, + SLPC_STATUS_NOT_IMPLEMENTED = 8, + SLPC_STATUS_NO_DATA = 9, + SLPC_STATUS_EVENT_NOT_REGISTERED = 10, + SLPC_STATUS_REGISTER_LOCKED = 11, + SLPC_STATUS_TEMPORARILY_UNAVAILABLE = 12, + SLPC_STATUS_VALUE_ALREADY_SET = 13, + SLPC_STATUS_VALUE_ALREADY_UNSET = 14, + SLPC_STATUS_VALUE_NOT_CHANGED = 15, + SLPC_STATUS_MEMIO_ERROR = 16, + SLPC_STATUS_EVENT_QUEUED_REQ_DPC = 17, + SLPC_STATUS_EVENT_QUEUED_NOREQ_DPC = 18,
Quoted 8 lines
drivers/gpu/drm/i915/intel_slpc.h static inline bool intel_slpc_active(struct intel_slpc *slpc) · line 65
Quoted 5 lines
drivers/gpu/drm/i915/intel_slpc.h +5
-0+ SLPC_STATUS_NO_EVENT_QUEUED = 19, + SLPC_STATUS_OUT_OF_SPACE = 20, + SLPC_STATUS_TIMEOUT = 21, + SLPC_STATUS_NO_LOCK = 22, +};I'm always wondering why everyone wants to design its own errno codes ... But seriously, do we need to define and use all of them ?
It will be needed to decode the SLPC error state. In my series I haven't used these all.
But I think it would be good to describe the error based on these enums so that user knows what was the error like in parameter description. Or should we remove these error codes all together and refer the GuC-KMD interface header separately to know what happened?
Quoted 178 lines
Quoted 165 lines
drivers/gpu/drm/i915/intel_slpc.h +163
-0+ +enum slpc_event_id { + SLPC_EVENT_RESET = 0, + SLPC_EVENT_SHUTDOWN = 1, + SLPC_EVENT_PLATFORM_INFO_CHANGE = 2, + SLPC_EVENT_DISPLAY_MODE_CHANGE = 3, + SLPC_EVENT_FLIP_COMPLETE = 4, + SLPC_EVENT_QUERY_TASK_STATE = 5, + SLPC_EVENT_PARAMETER_SET = 6, + SLPC_EVENT_PARAMETER_UNSET = 7, +}; + +enum slpc_param_id { + SLPC_PARAM_TASK_ENABLE_GTPERF = 0, + SLPC_PARAM_TASK_DISABLE_GTPERF = 1, + SLPC_PARAM_TASK_ENABLE_BALANCER = 2, + SLPC_PARAM_TASK_DISABLE_BALANCER = 3, + SLPC_PARAM_TASK_ENABLE_DCC = 4, + SLPC_PARAM_TASK_DISABLE_DCC = 5, + SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ = 6, + SLPC_PARAM_GLOBAL_MAX_GT_UNSLICE_FREQ_MHZ = 7, + SLPC_PARAM_GLOBAL_MIN_GT_SLICE_FREQ_MHZ = 8, + SLPC_PARAM_GLOBAL_MAX_GT_SLICE_FREQ_MHZ = 9, + SLPC_PARAM_GTPERF_THRESHOLD_MAX_FPS = 10, + SLPC_PARAM_GLOBAL_DISABLE_GT_FREQ_MANAGEMENT = 11, + SLPC_PARAM_GTPERF_ENABLE_FRAMERATE_STALLING = 12, + SLPC_PARAM_GLOBAL_DISABLE_RC6_MODE_CHANGE = 13, + SLPC_PARAM_GLOBAL_OC_UNSLICE_FREQ_MHZ = 14, + SLPC_PARAM_GLOBAL_OC_SLICE_FREQ_MHZ = 15, + SLPC_PARAM_GLOBAL_ENABLE_IA_GT_BALANCING = 16, + SLPC_PARAM_GLOBAL_ENABLE_ADAPTIVE_BURST_TURBO = 17, + SLPC_PARAM_GLOBAL_ENABLE_EVAL_MODE = 18, + SLPC_PARAM_GLOBAL_ENABLE_BALANCER_IN_NON_GAMING_MODE = 19, + SLPC_MAX_PARAM, + SLPC_KMD_MAX_PARAM = 32, +}; + +enum slpc_platform_sku { + SLPC_PLATFORM_SKU_UNDEFINED = 0, + SLPC_PLATFORM_SKU_ULX = 1, + SLPC_PLATFORM_SKU_ULT = 2, + SLPC_PLATFORM_SKU_T = 3, + SLPC_PLATFORM_SKU_MOBL = 4, + SLPC_PLATFORM_SKU_DT = 5, + SLPC_PLATFORM_SKU_UNKNOWN = 6, +}; + +enum slpc_power_source { + SLPC_POWER_SOURCE_UNDEFINED = 0, + SLPC_POWER_SOURCE_AC = 1, + SLPC_POWER_SOURCE_DC = 2, + SLPC_POWER_SOURCE_UNKNOWN = 3, +}; + +enum slpc_power_plan { + SLPC_POWER_PLAN_UNDEFINED = 0, + SLPC_POWER_PLAN_BATTERY_SAVER = 1, + SLPC_POWER_PLAN_BALANCED = 2, + SLPC_POWER_PLAN_PERFORMANCE = 3, + SLPC_POWER_PLAN_UNKNOWN = 4, +}; + +struct slpc_platform_info { + u8 platform_sku; + u8 slice_count; + u8 reserved; + u8 power_plan_source; + u8 P0_freq; + u8 P1_freq; + u8 Pe_freq; + u8 Pn_freq; + u32 reserved1; + u32 reserved2; +} __packed; + +enum slpc_global_state { + SLPC_GLOBAL_STATE_NOT_RUNNING = 0, + SLPC_GLOBAL_STATE_INITIALIZING = 1, + SLPC_GLOBAL_STATE_RESETTING = 2, + SLPC_GLOBAL_STATE_RUNNING = 3, + SLPC_GLOBAL_STATE_SHUTTING_DOWN = 4, + SLPC_GLOBAL_STATE_ERROR = 5 +}; + +struct slpc_task_state_data { + union { + u32 bitfield1; + struct { + u32 gtperf_task_active:1; + u32 gtperf_stall_possible:1; + u32 gtperf_gaming_mode:1; + u32 gtperf_target_fps:8; + u32 dcc_task_active:1; + u32 in_dcc:1; + u32 in_dct:1; + u32 freq_switch_active:1; + u32 ibc_enabled:1; + u32 ibc_active:1; + u32 pg1_enabled:1; + u32 pg1_active:1; + u32 reserved:13; + }; + }; + union { + u32 bitfield2; + struct { + u32 max_unslice_freq:8; + u32 min_unslice_freq:8; + u32 max_slice_freq:8; + u32 min_slice_freq:8; + }; + }; +} __packed; + +#define SLPC_MAX_OVERRIDE_PARAMETERS 192 +#define SLPC_OVERRIDE_BITFIELD_SIZE ((SLPC_MAX_OVERRIDE_PARAMETERS + 31) / 32) + +struct slpc_shared_data { + u32 reserved; + u32 shared_data_size; + u32 global_state; + struct slpc_platform_info platform_info; + struct slpc_task_state_data task_state_data; + u32 override_parameters_set_bits[SLPC_OVERRIDE_BITFIELD_SIZE]; + u32 override_parameters_values[SLPC_MAX_OVERRIDE_PARAMETERS]; +} __packed; + +enum slpc_reset_flags { + SLPC_RESET_FLAG_TDR_OCCURRED = (1 << 0) +}; + +#define SLPC_EVENT_MAX_INPUT_ARGS 7 +#define SLPC_EVENT_MAX_OUTPUT_ARGS 1 + +union slpc_event_input_header { + u32 value; + struct { + u32 num_args:8; + u32 event_id:8; + }; +}; + +struct slpc_event_input { + u32 h2g_action_id; + union slpc_event_input_header header; + u32 args[SLPC_EVENT_MAX_INPUT_ARGS]; +} __packed; + +union slpc_event_output_header { + u32 value; + struct { + u32 num_args:8; + u32 event_id:8; + u32 status:16; + }; +}; + +struct slpc_event_output { + u32 reserved; + union slpc_event_output_header header; + u32 args[SLPC_EVENT_MAX_OUTPUT_ARGS]; +} __packed; +drivers/gpu/drm/i915/intel_slpc.h static inline bool intel_slpc_active(struct intel_slpc *slpc) · line 238
Quoted 10 lines
drivers/gpu/drm/i915/intel_slpc.h +10
-0+#define SLPC_EVENT (id, argc) ((u32) (id) << 8 | (argc)) +#define SLPC_POWER_PLAN_SOURCE (plan, source) ((plan) | ((source) << 6)) +#define SLPC_POWER_PLAN (plan_source) ((plan_source) & 0x3F) +#define SLPC_POWER_SOURCE (plan_source) ((plan_source) >> 6) + +/* Structures for exposing parameter details to user. */ +#define MAX_PARAM_DESCRIPTION_SIZE 160 +struct slpc_param { + enum slpc_param_id id; + char description[MAX_PARAM_DESCRIPTION_SIZE];Hmm, 160 bytes for description is big.
Quoted 5 lines
As "id" starts from 0 maybe we can use simpler variant (in .c file)
static struct
slpc_param_names{
const char *description;
} params[] = { ... };
Sure. Will update.
Quoted 13 lines
Quoted 12 lines
drivers/gpu/drm/i915/intel_slpc.h +9
-0+}; + +extern struct slpc_param slpc_paramlist[]; + +#define SLPC_PARAM_TASK_DEFAULT 0 +#define SLPC_PARAM_TASK_ENABLED 1 +#define SLPC_PARAM_TASK_DISABLED 2 +#define SLPC_PARAM_TASK_UNKNOWN 3 + /* intel_slpc.c */ void intel_slpc_init(struct intel_slpc *slpc);Quoted 1 line
void
intel_slpc_cleanup(struct intel_slpc *slpc);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 19/31 drm/i915/slpc: Allocate/Release/Initialize SLPC shared data
In reply to Sagar Arun KamblePopulate SLPC shared data with required default values for Slice count, Power source/plan, IA Perf MSRs.
v1: Update for SLPC interface version 2015.2.4
intel_slpc_active() returns 1 if slpc initialized (Paulo) change default host_os to "Windows"
Spelling fixes (Sagar Kamble and Nick Hoath)
Added WARN for checking if upper 32bits of GTT offset of shared object are zero. (ChrisW)
Changed function call from gem_allocate/release_guc_obj to i915_guc_allocate/release_gem_obj. (Sagar)
Updated commit message and moved POWER_PLAN and POWER_SOURCE definition from later patch. (Akash)
Add struct_mutex locking while allocating/releasing slpc shared object. This was caught by CI BAT. Adding SLPC state variable to determine if it is active as it not just dependent on shared data setup.
Rebase with guc_allocate_vma related changes.
v2: WARN_ON for platform_sku validity and space changes.(David)
Checkpatch update.
v3: Fixing WARNING in igt@drv_module_reload_basic found in trybot BAT
with SLPC Enabled.
v4: Updated support for GuC v9. s/slice_total/hweight8(slice_mask)/(Dave).
v5: SLPC vma mapping changes and removed explicit type conversions.(Chris).
s/freq_unslice_max|min/unslice__max|min_freq.
v6: Commit message update. s/msr_value/val for reuse later.
v7: Set default values for tasks and min frequency parameters.
Moved initialization with allocation of data so that post GuC load earlier parameters persist.
v8: Added check for SLPC status during cleanup of shared data. SLPC
disabling is asynchronous and should complete within 10us.
v9: Enabling Balancer task in SLPC.
--- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_slpc.c | 167 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 1 + 4 files changed, 170 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1876,6 +1876,7 @@ bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,void gen6_rps_idle (struct drm_i915_private *dev_priv);void gen6_rps_boost (struct drm_i915_gem_request *rq,struct intel_rps_client *rps); +void gen6_init_rps_frequencies (struct drm_i915_private *dev_priv);void g4x_wm_get_hw_state (struct drm_device *dev);void vlv_wm_get_hw_state (struct drm_device *dev);void ilk_wm_get_hw_state (struct drm_device *dev);
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -6486,7 +6486,7 @@ int sanitize_rc6_option(struct drm_i915_private *dev_priv, int enable_rc6)return INTEL_RC6_ENABLE ; } -static void gen6_init_rps_frequencies (struct drm_i915_private *dev_priv) +void gen6_init_rps_frequencies (struct drm_i915_private *dev_priv) {/* All of these values are in units of 50MHz */
drivers/gpu/drm/i915/intel_slpc.c +167 -0
185 lines not on this page · raw message
drivers/gpu/drm/i915/intel_slpc.h +1 -0
@@ -26,6 +26,7 @@struct intel_slpc {bool active; +struct i915_vma *vma; };static inline int intel_slpc_enabled (void )
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 20/31 drm/i915/slpc: Add parameter set/unset/get, task control/status functions
In reply to Sagar Arun KambleSLPC behavior can be changed through set of parameters. These parameters can be updated and queried from i915 though Host to GuC SLPC events. This patch adds parameter update events for setting/unsetting/getting parameters. SLPC has various tasks for controlling different controls. This patch adds functions to control and query the task status.
v1: Use host2guc_slpc
update slcp_param_id enum values for SLPC 2015.2.4 return void instead of ignored error code (Paulo)
v2: Checkpatch update.
v3: Rebase.
v4: Updated with GuC firmware v9.
v5: Updated input structure to host2guc_slpc. Added functions
to update only parameters in the SLPC shared memory. This will allow to setup shared data with all parameters and send single event to SLPC take them into effect. Commit message update. (Sagar)
v6: Rearranged helpers to use them in slpc_shared_data_init.
Added definition of SLPC_KMD_MAX_PARAM.
v7: Added definition of host2guc_slpc with rearrangement of patches.
Added task control/status functions.
v8: Rebase w.r.t s/intel_guc_send/intel_guc_send_mmio.
--- drivers/gpu/drm/i915/intel_guc.c | 21 ++++- drivers/gpu/drm/i915/intel_guc.h | 2 + drivers/gpu/drm/i915/intel_slpc.c | 185 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 8 ++ 4 files changed, 215 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_guc.c +20 -1
@@ -67,9 +67,11 @@ void intel_guc_init_send_regs(struct intel_guc *guc)/* * This function implements the MMIO based host to GuC interface. */ -int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len) +int __intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len, +u32 *output) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); +union slpc_event_output_header header;u32 status;int i;int ret;
@@ -115,12 +117,29 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len) action[0], ret, status, I915_READ(SOFT_SCRATCH(15))); } +/* +* Output data from Host to GuC SLPC actions is populated in scratch +* registers SOFT_SCRATCH(1) to SOFT_SCRATCH(14) based on event. +* Currently only SLPC action status in GuC is meaningful as Host +* can query only overridden parameters and that are fetched from +* Host-GuC SLPC shared data. +*/ +if (output && !ret) { + output[0 ] = header.value =I915_READ (SOFT_SCRATCH (1 )); + ret = header.status; + } +intel_uncore_forcewake_put (dev_priv, guc->send_regs.fw_domains);mutex_unlock (&guc->send_mutex);return ret; } +int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len) +{ +return __intel_guc_send_mmio (guc, action, len,NULL ); +} +int intel_guc_sample_forcewake (struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc);
drivers/gpu/drm/i915/intel_guc.h +2 -0
@@ -132,6 +132,8 @@ struct intel_guc {int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len);void gen8_guc_raise_irq (struct intel_guc *guc);void intel_guc_init_send_regs (struct intel_guc *guc); +int __intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len, +u32 *output);int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len);int intel_guc_sample_forcewake (struct intel_guc *guc);int intel_guc_runtime_suspend (struct intel_guc *guc);
drivers/gpu/drm/i915/intel_slpc.c +185 -0
191 lines not on this page · raw message
drivers/gpu/drm/i915/intel_slpc.h +8 -0
@@ -247,6 +247,14 @@ struct slpc_param {#define SLPC_PARAM_TASK_UNKNOWN 3/* intel_slpc.c */ +void intel_slpc_set_param (struct intel_slpc *slpc,u32 id,u32 value); +void intel_slpc_unset_param (struct intel_slpc *slpc,u32 id); +void intel_slpc_get_param (struct intel_slpc *slpc,u32 id, +int *overriding,u32 *value); +int intel_slpc_task_control (struct intel_slpc *slpc,u64 val, +u32 enable_id,u32 disable_id); +int intel_slpc_task_status (struct intel_slpc *slpc,u64 *val, +u32 enable_id,u32 disable_id);void intel_slpc_init (struct intel_slpc *slpc);void intel_slpc_cleanup (struct intel_slpc *slpc);void intel_slpc_enable (struct intel_slpc *slpc);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 20/31] drm/i915/slpc: Add parameter set/unset/get, task control/status functions
Quoted 48 lines · Sagar Arun Kamble
SLPC behavior can be changed through set of parameters. These parameters can be updated and queried from i915 though Host to GuC SLPC events. This patch adds parameter update events for setting/unsetting/getting parameters. SLPC has various tasks for controlling different controls. This patch adds functions to control and query the task status.
v1: Use
host2guc_slpc
updateslcp_param_idenum values for SLPC 2015.2.4 return void instead of ignored error code (Paulo)v2: Checkpatch update.
v3: Rebase.
v4: Updated with GuC firmware v9.
v5: Updated input structure to
host2guc_slpc. Added functions
to update only parameters in the SLPC shared memory. This will allow to setup shared data with all parameters and send single event to SLPC take them into effect. Commit message update. (Sagar)v6: Rearranged helpers to use them in
slpc_shared_data_init.
Added definition ofSLPC_KMD_MAX_PARAM.v7: Added definition of
host2guc_slpcwith rearrangement of patches.
Added task control/status functions.v8: Rebase w.r.t s/intel_guc_send/intel_guc_send_mmio.
Cc Michal Wajdeczko <[email protected]>Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/intel_guc.c | 21 ++++- drivers/gpu/drm/i915/intel_guc.h | 2 + drivers/gpu/drm/i915/intel_slpc.c | 185 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 8 ++ 4 files changed, 215 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_guc.c +0
-0@@ -67,9 +67,11 @@ void intel_guc_init_send_regs(struct intel_guc *guc)/*
drivers/gpu/drm/i915/intel_guc.c void intel_guc_init_send_regs(struct intel_guc *guc) · line 76
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.c +3
-1* This function implements the MMIO based host to GuC interface. */ -int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len) +int __intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len, +u32 *output) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); +union slpc_event_output_header header;
Don't pollute generic send function with slpc specific code.
drivers/gpu/drm/i915/intel_guc.c int intel_guc_send_mmio(struct intel_guc *guc, · line 122
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc.c +0
-0u32 status;drivers/gpu/drm/i915/intel_guc.c +3
-0int i;int ret;@@ -115,12 +117,29 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len) action[0], ret, status, I915_READ(SOFT_SCRATCH(15))); } +/* +* Output data from Host to GuC SLPC actions is populated in scratch +* registers SOFT_SCRATCH(1) to SOFT_SCRATCH(14) based on event.
Note that receiving more data over MMIO will be handled by these pending patches
https://patchwork.freedesktop.org/patch/170667/ https://patchwork.freedesktop.org/patch/170669/
The same series will also add support for responses over CT so stay tuned!
Quoted 242 lines
drivers/gpu/drm/i915/intel_guc.c +14
-0+* Currently only SLPC action status in GuC is meaningful as Host +* can query only overridden parameters and that are fetched from +* Host-GuC SLPC shared data. +*/ +if (output && !ret) { + output[0 ] = header.value =I915_READ (SOFT_SCRATCH (1 )); + ret = header.status; + } +intel_uncore_forcewake_put (dev_priv, guc->send_regs.fw_domains);mutex_unlock (&guc->send_mutex);return ret; } +int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len) +{ +return __intel_guc_send_mmio (guc, action, len,NULL ); +} +int intel_guc_sample_forcewake (struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc);drivers/gpu/drm/i915/intel_guc.h +2
-0@@ -132,6 +132,8 @@ struct intel_guc {int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len);void gen8_guc_raise_irq (struct intel_guc *guc);void intel_guc_init_send_regs (struct intel_guc *guc); +int __intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len, +u32 *output); int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32len);
intintel_guc_sample_forcewake(struct intel_guc *guc); intintel_guc_runtime_suspend(struct intel_guc *guc);drivers/gpu/drm/i915/intel_slpc.c +185
-0@@ -132,6 +132,191 @@ int slpc_mem_task_control(struct slpc_shared_data *data, u64 val, return ret; } +static void host2guc_slpc (struct intel_slpc *slpc, +struct slpc_event_input *input,u32 len) +{ +struct intel_guc *guc =slpc_to_guc (slpc); +u32 *data; +u32 output[SLPC_EVENT_MAX_OUTPUT_ARGS ]; +int ret =0 ; + +/* +* We have only 15 scratch registers for communication. +* the first we will use for the event ID in input and +* output data. Event processing status will be present +* in SOFT_SCRATCH(1) register. +*/ +BUILD_BUG_ON (SLPC_EVENT_MAX_INPUT_ARGS >14 ); +BUILD_BUG_ON (SLPC_EVENT_MAX_OUTPUT_ARGS <1 ); +BUILD_BUG_ON (SLPC_EVENT_MAX_OUTPUT_ARGS >14 ); + + data = (u32 *) input; + data[0 ] =INTEL_GUC_ACTION_SLPC_REQUEST ; + ret =__intel_guc_send_mmio (guc, data, len, output); + +if (ret) +DRM_ERROR ("event 0x%x status %d\n" , + ((output[0 ] &0xFF00 ) >>8 ), ret); +} + +static void host2guc_slpc_set_param (struct intel_slpc *slpc, +u32 id,u32 value) +{ +struct slpc_event_input data = {0 }; + + data.header.value =SLPC_EVENT (SLPC_EVENT_PARAMETER_SET ,2 ); + data.args[0 ] = id; + data.args[1 ] = value; + +host2guc_slpc (slpc, &data,4 ); +} + +static void host2guc_slpc_unset_param (struct intel_slpc *slpc, +u32 id) +{ +struct slpc_event_input data = {0 }; + + data.header.value =SLPC_EVENT (SLPC_EVENT_PARAMETER_UNSET ,1 ); + data.args[0 ] = id; + +host2guc_slpc (slpc, &data,3 ); +} + +void intel_slpc_set_param (struct intel_slpc *slpc, +u32 id, +u32 value) +{ +struct page *page; +struct slpc_shared_data *data =NULL ; + +WARN_ON (id >=SLPC_MAX_PARAM ); + +if (!slpc->vma) +return ; + + page =i915_vma_first_page (slpc->vma); + data =kmap_atomic (page); +slpc_mem_set_param (data, id, value); +kunmap_atomic (data); + +host2guc_slpc_set_param (slpc, id, value); +} + +void intel_slpc_unset_param (struct intel_slpc *slpc, +u32 id) +{ +struct page *page; +struct slpc_shared_data *data =NULL ; + +WARN_ON (id >=SLPC_MAX_PARAM ); + +if (!slpc->vma) +return ; + + page =i915_vma_first_page (slpc->vma); + data =kmap_atomic (page); +slpc_mem_unset_param (data, id); +kunmap_atomic (data); + +host2guc_slpc_unset_param (slpc, id); +} + +void intel_slpc_get_param (struct intel_slpc *slpc, +u32 id, +int *overriding,u32 *value) +{ +struct page *page; +struct slpc_shared_data *data =NULL ; +u32 bits; + +WARN_ON (id >=SLPC_MAX_PARAM ); + +if (!slpc->vma) +return ; + + page =i915_vma_first_page (slpc->vma); + data =kmap_atomic (page); +if (overriding) { + bits = data->override_parameters_set_bits[id >>5 ]; + *overriding = (0 != (bits & (1 << (id %32 )))); + } +if (value) + *value = data->override_parameters_values[id]; + +kunmap_atomic (data); +} + +int intel_slpc_task_control (struct intel_slpc *slpc,u64 val, +u32 enable_id,u32 disable_id) +{ +struct drm_i915_private *dev_priv =slpc_to_i915 (slpc); +int ret =0 ; + +if (!slpc->active) +return -ENODEV ; + +intel_runtime_pm_get (dev_priv); + +if (val ==SLPC_PARAM_TASK_DEFAULT ) { +/* set default */ +intel_slpc_unset_param (slpc, enable_id); +intel_slpc_unset_param (slpc, disable_id); + }else if (val ==SLPC_PARAM_TASK_ENABLED ) { +/* set enable */ +intel_slpc_set_param (slpc, enable_id,1 ); +intel_slpc_unset_param (slpc, disable_id); + }else if (val ==SLPC_PARAM_TASK_DISABLED ) { +/* set disable */ +intel_slpc_set_param (slpc, disable_id,1 ); +intel_slpc_unset_param (slpc, enable_id); + }else { + ret = -EINVAL ; + } + +intel_slpc_enable (slpc); +intel_runtime_pm_put (dev_priv); + +return ret; +} + +int intel_slpc_task_status (struct intel_slpc *slpc,u64 *val, +u32 enable_id,u32 disable_id) +{ +int override_enable, override_disable; +u32 value_enable, value_disable; +int ret =0 ; + +if (!slpc->active) { + ret = -ENODEV ; + }else if (val) { +intel_slpc_get_param (slpc, enable_id, &override_enable, + &value_enable); +intel_slpc_get_param (slpc, disable_id, &override_disable, + &value_disable); + +/* +* Set the output value: +* 0: default +* 1: enabled +* 2: disabled +* 3: unknown (should not happen) +*/ +if (override_disable && (value_disable ==1 )) + *val =SLPC_PARAM_TASK_DISABLED ; +else if (override_enable && (value_enable ==1 )) + *val =SLPC_PARAM_TASK_ENABLED ; +else if (!override_enable && !override_disable) + *val =SLPC_PARAM_TASK_DEFAULT ; +else + *val =SLPC_PARAM_TASK_UNKNOWN ; + + }else { + ret = -EINVAL ; + } + +return ret; +} +static void slpc_shared_data_init (struct intel_slpc *slpc) {struct drm_i915_private *dev_priv =slpc_to_i915 (slpc);drivers/gpu/drm/i915/intel_slpc.h +1
-0@@ -247,6 +247,14 @@ struct slpc_param {#define SLPC_PARAM_TASK_UNKNOWN 3/* intel_slpc.c */ +void intel_slpc_set_param (struct intel_slpc *slpc,u32 id,u32 value);
drivers/gpu/drm/i915/intel_slpc.h struct slpc_param { · line 259
Quoted 10 lines
drivers/gpu/drm/i915/intel_slpc.h +7
-0+void intel_slpc_unset_param (struct intel_slpc *slpc,u32 id); +void intel_slpc_get_param (struct intel_slpc *slpc,u32 id, +int *overriding,u32 *value); +int intel_slpc_task_control (struct intel_slpc *slpc,u64 val, +u32 enable_id,u32 disable_id); +int intel_slpc_task_status (struct intel_slpc *slpc,u64 *val, +u32 enable_id,u32 disable_id);void intel_slpc_init (struct intel_slpc *slpc);void intel_slpc_cleanup (struct intel_slpc *slpc);void intel_slpc_enable (struct intel_slpc *slpc);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 20/31] drm/i915/slpc: Add parameter set/unset/get, task control/status functions
Quoted 54 lines · Michal Wajdeczko
Quoted 52 lines · Sagar Arun Kamble
SLPC behavior can be changed through set of parameters. These parameters can be updated and queried from i915 though Host to GuC SLPC events. This patch adds parameter update events for setting/unsetting/getting parameters. SLPC has various tasks for controlling different controls. This patch adds functions to control and query the task status.
v1: Use
host2guc_slpc
updateslcp_param_idenum values for SLPC 2015.2.4 return void instead of ignored error code (Paulo)v2: Checkpatch update.
v3: Rebase.
v4: Updated with GuC firmware v9.
v5: Updated input structure to
host2guc_slpc. Added functions to update only parameters in the SLPC shared memory. This will allow to setup shared data with all parameters and send single event to SLPC take them into effect. Commit message update. (Sagar)v6: Rearranged helpers to use them in
slpc_shared_data_init. Added definition ofSLPC_KMD_MAX_PARAM.v7: Added definition of
host2guc_slpcwith rearrangement of patches. Added task control/status functions.v8: Rebase w.r.t s/intel_guc_send/intel_guc_send_mmio.
Cc Michal Wajdeczko <[email protected]>Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/intel_guc.c | 21 ++++-
drivers/gpu/drm/i915/intel_guc.h | 2 +
drivers/gpu/drm/i915/intel_slpc.c | 185
++++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_slpc.h | 8 ++4 files changed, 215 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_guc.c +0
-1@@ -67,9 +67,11 @@ void intel_guc_init_send_regs(struct intel_guc *guc) /** This function implements the MMIO based host to GuC interface. */ -int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action, u32 len)
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc.c void intel_guc_init_send_regs(struct intel_guc *guc) · line 74
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc.c +3
-0+int __intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len, + u32 *output) { struct drm_i915_private *dev_priv = guc_to_i915(guc); + union slpc_event_output_header header;Don't pollute generic send function with slpc specific code.
Ok. Will prepare new SLPC specific send function built on top of GUC CT based send.
Quoted 18 lines
Quoted 11 lines
drivers/gpu/drm/i915/intel_guc.c +0
-0u32 status;int i;
int ret;drivers/gpu/drm/i915/intel_guc.c +2
-0@@ -115,12 +117,29 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len) action[0], ret, status, I915_READ(SOFT_SCRATCH(15))); } + /* +* Output data from Host to GuC SLPC actions is populated in Quoted 2 lines
scratch
+ * registersSOFT_SCRATCH(1)toSOFT_SCRATCH(14)based on event.Note that receiving more data over MMIO will be handled by these pending patches
https://patchwork.freedesktop.org/patch/170667/
https://patchwork.freedesktop.org/patch/170669/
Quoted 1 line
The same series will also add support for responses over CT so stay tuned!
Yes. Will base SLPC changes on top of these.
Quoted 243 lines
Quoted 243 lines
+ * Currently only SLPC action status in GuC is meaningful as Host + * can query only overridden parameters and that are fetched from + * Host-GuC SLPC shared data.
+ */
+ if (output && !ret) {
+ output[0] = header.value = I915_READ(SOFT_SCRATCH(1)); + ret = header.status;
+ }
+
intel_uncore_forcewake_put(dev_priv, guc->send_regs.fw_domains);mutex_unlock(&guc->send_mutex);
return ret;
}
+intintel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len)drivers/gpu/drm/i915/intel_guc.c +4
-0+{ + return __intel_guc_send_mmio(guc, action, len, NULL); +} +int
intel_guc_sample_forcewake(struct intel_guc *guc){
structdrm_i915_private*dev_priv=guc_to_i915(guc);drivers/gpu/drm/i915/intel_guc.h +2
-0@@ -132,6 +132,8 @@ struct intel_guc { int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len); void gen8_guc_raise_irq(struct intel_guc *guc); void intel_guc_init_send_regs(struct intel_guc *guc); +int __intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len, + u32 *output); int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len); int intel_guc_sample_forcewake(struct intel_guc *guc);int
intel_guc_runtime_suspend(struct intel_guc *guc);drivers/gpu/drm/i915/intel_slpc.c +185
-0@@ -132,6 +132,191 @@ int slpc_mem_task_control(struct slpc_shared_data *data, u64 val, return ret; } +static void host2guc_slpc (struct intel_slpc *slpc, + struct slpc_event_input *input, u32 len) +{ + struct intel_guc *guc = slpc_to_guc(slpc); + u32 *data; + u32 output[SLPC_EVENT_MAX_OUTPUT_ARGS]; + int ret = 0; + + /* + * We have only 15 scratch registers for communication. + * the first we will use for the event ID in input and + * output data. Event processing status will be present + * in SOFT_SCRATCH(1) register. + */ + BUILD_BUG_ON(SLPC_EVENT_MAX_INPUT_ARGS > 14); + BUILD_BUG_ON(SLPC_EVENT_MAX_OUTPUT_ARGS < 1); + BUILD_BUG_ON(SLPC_EVENT_MAX_OUTPUT_ARGS > 14); + + data = (u32 *) input; + data[0] = INTEL_GUC_ACTION_SLPC_REQUEST; + ret = __intel_guc_send_mmio(guc, data, len, output); + + if (ret) + DRM_ERROR("event 0x%x status %d\n", + ((output[0] & 0xFF00) >> 8), ret); +} + +static void host2guc_slpc_set_param (struct intel_slpc *slpc, + u32 id, u32 value) +{ + struct slpc_event_input data = {0}; + + data.header.value = SLPC_EVENT(SLPC_EVENT_PARAMETER_SET, 2); + data.args[0] = id; + data.args[1] = value; + + host2guc_slpc(slpc, &data, 4); +} + +static void host2guc_slpc_unset_param (struct intel_slpc *slpc, + u32 id) +{ + struct slpc_event_input data = {0}; + + data.header.value = SLPC_EVENT(SLPC_EVENT_PARAMETER_UNSET, 1); + data.args[0] = id; + + host2guc_slpc(slpc, &data, 3); +} + +void intel_slpc_set_param (struct intel_slpc *slpc, + u32 id, + u32 value) +{ + struct page *page; + struct slpc_shared_data *data = NULL; + + WARN_ON(id >= SLPC_MAX_PARAM); + + if (!slpc->vma) + return; + + page = i915_vma_first_page(slpc->vma); + data = kmap_atomic(page); + slpc_mem_set_param(data, id, value); + kunmap_atomic(data); + + host2guc_slpc_set_param(slpc, id, value); +} + +void intel_slpc_unset_param (struct intel_slpc *slpc, + u32 id) +{ + struct page *page; + struct slpc_shared_data *data = NULL; + + WARN_ON(id >= SLPC_MAX_PARAM); + + if (!slpc->vma) + return; + + page = i915_vma_first_page(slpc->vma); + data = kmap_atomic(page); + slpc_mem_unset_param(data, id); + kunmap_atomic(data); + + host2guc_slpc_unset_param(slpc, id); +} + +void intel_slpc_get_param (struct intel_slpc *slpc, + u32 id, + int *overriding, u32 *value) +{ + struct page *page; + struct slpc_shared_data *data = NULL; + u32 bits; + + WARN_ON(id >= SLPC_MAX_PARAM); + + if (!slpc->vma) + return; + + page = i915_vma_first_page(slpc->vma); + data = kmap_atomic(page); + if (overriding) { + bits = data->override_parameters_set_bits[id >> 5]; + *overriding = (0 != (bits & (1 << (id % 32)))); + } + if (value) + *value = data->override_parameters_values[id]; + + kunmap_atomic(data); +} + +int intel_slpc_task_control (struct intel_slpc *slpc,u64 val, + u32 enable_id, u32 disable_id) +{ + struct drm_i915_private *dev_priv = slpc_to_i915(slpc); + int ret = 0; + + if (!slpc->active) + return -ENODEV; + + intel_runtime_pm_get(dev_priv); + + if (val == SLPC_PARAM_TASK_DEFAULT) { + /* set default */ + intel_slpc_unset_param(slpc, enable_id); + intel_slpc_unset_param(slpc, disable_id); + } else if (val == SLPC_PARAM_TASK_ENABLED) { + /* set enable */ + intel_slpc_set_param(slpc, enable_id, 1); + intel_slpc_unset_param(slpc, disable_id); + } else if (val == SLPC_PARAM_TASK_DISABLED) { + /* set disable */ + intel_slpc_set_param(slpc, disable_id, 1); + intel_slpc_unset_param(slpc, enable_id); + } else { + ret = -EINVAL; + } + + intel_slpc_enable(slpc); + intel_runtime_pm_put(dev_priv); + + return ret; +} + +int intel_slpc_task_status (struct intel_slpc *slpc,u64 *val, + u32 enable_id, u32 disable_id) +{ + int override_enable, override_disable; + u32 value_enable, value_disable; + int ret = 0; + + if (!slpc->active) { + ret = -ENODEV; + } else if (val) { + intel_slpc_get_param(slpc, enable_id, &override_enable, + &value_enable); + intel_slpc_get_param(slpc, disable_id, &override_disable, + &value_disable); + + /* + * Set the output value: + * 0: default + * 1: enabled + * 2: disabled + * 3: unknown (should not happen) + */ + if (override_disable && (value_disable == 1)) + *val = SLPC_PARAM_TASK_DISABLED; + else if (override_enable && (value_enable == 1)) + *val = SLPC_PARAM_TASK_ENABLED; + else if (!override_enable && !override_disable) + *val = SLPC_PARAM_TASK_DEFAULT; + else + *val = SLPC_PARAM_TASK_UNKNOWN; + + } else { + ret = -EINVAL; + } + + return ret; +} + static void slpc_shared_data_init(struct intel_slpc *slpc) { struct drm_i915_private *dev_priv = slpc_to_i915(slpc);drivers/gpu/drm/i915/intel_slpc.h +3
-0@@ -247,6 +247,14 @@ struct slpc_param { #define SLPC_PARAM_TASK_UNKNOWN 3/* intel_slpc.c */ +void intel_slpc_set_param (struct intel_slpc *slpc,u32 id,u32 value); +void intel_slpc_unset_param (struct intel_slpc *slpc,u32 id); +void intel_slpc_get_param(struct intel_slpc *slpc, u32 id,
Quoted 8 lines
drivers/gpu/drm/i915/intel_slpc.h struct slpc_param { · line 260
Quoted 8 lines
drivers/gpu/drm/i915/intel_slpc.h +5
-0+ int *overriding, u32 *value); +int intel_slpc_task_control (struct intel_slpc *slpc,u64 val, + u32 enable_id, u32 disable_id); +int intel_slpc_task_status (struct intel_slpc *slpc,u64 *val, + u32 enable_id, u32 disable_id); void intel_slpc_init(struct intel_slpc *slpc); void intel_slpc_cleanup(struct intel_slpc *slpc); void intel_slpc_enable(struct intel_slpc *slpc);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 21/31 drm/i915/slpc: Send RESET event to enable SLPC during Load/TDR
In reply to Sagar Arun KambleSend host2guc SLPC reset event to GuC post GuC load.
Post this, i915 can ascertain if SLPC has started running successfully through shared data. This check is done during intel_init_gt_powersave. This allows to get initial configuration setup by SLPC and if needed move to Host RPS if SLPC runs into issues.
On TDR/Engine reset i915 should send extra flag SLPC_RESET_FLAG_TDR_OCCURREDto clear SLPC state as appropriate.
v1: Extract host2guc_slpc to handle slpc status code
coding style changes (Paulo)
Removed WARN_ON for checking msb of gtt address of shared gem obj. (ChrisW)
host2guc_action to i915_guc_action change.(Sagar) Updating SLPC enabled status. (Sagar)
v2: Commit message update. (David)
v3: Rebase.
v4: Added DRM_INFO message when SLPC is enabled.
v5: Updated patch as host2guc_slpc is moved to earlier patch.
SLPC activation status message put after checking the state from shared data during intel_init_gt_powersave.
v6: Added definition of host2guc_slpc and clflush the shared data only
for required size. Setting state to NOT_RUNNING before sending RESET event. Output data for SLPC actions is to be retrieved during intel_guc_send with lock protection so created wrapper __intel_guc_send that outputs GuC output data if needed. Clearing pm_rps_events on confirming SLPC RUNNING status so that even if host touches any of the PM registers by mistake it should not have any effect. (Sagar)
v7: Added save/restore_default_rps as Uncore sanitize will clear the
RP_CONTROL setup by BIOS. s/i915_ggtt_offset/guc_ggtt_offset.
v8: Added support for handling TDR based SLPC reset. Added functions
host2guc_slpc_tdr_reset, intel_slpc_reset_prepare and intel_slpc_tdr_reset to handle TDR based SLPC reset.
--- drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_irq.c | 7 +- drivers/gpu/drm/i915/intel_pm.c | 10 +++ drivers/gpu/drm/i915/intel_slpc.c | 170 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 9 ++ drivers/gpu/drm/i915/intel_uc.c | 1 + 6 files changed, 198 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +2 -0
@@ -1074,6 +1074,8 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)intel_sanitize_options (dev_priv); +intel_slpc_save_default_rps (&dev_priv->guc.slpc); + ret =i915_ggtt_probe_hw (dev_priv);if (ret)return ret;
drivers/gpu/drm/i915/i915_irq.c +6 -1
@@ -2838,8 +2838,13 @@ void i915_handle_error(struct drm_i915_private *dev_priv, } } -if (!engine_mask) +if (!engine_mask) { +if (intel_slpc_active (&dev_priv->guc.slpc)) { +intel_slpc_reset_prepare (&dev_priv->guc.slpc); +intel_slpc_tdr_reset (&dev_priv->guc.slpc); + } goto out; + }/* Full reset needs the mutex, stop any other user trying to do so. */ if (test_and_set_bit (I915_RESET_BACKOFF , &dev_priv->gpu_error.flags)) {
drivers/gpu/drm/i915/intel_pm.c +10 -0
@@ -7918,6 +7918,16 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv)intel_runtime_pm_get (dev_priv); } +if (intel_slpc_enabled ()) { + dev_priv->guc.slpc.active = +intel_slpc_get_status (&dev_priv->guc.slpc); +if (!intel_slpc_active (&dev_priv->guc.slpc)) { + i915.enable_slpc =0 ; +intel_sanitize_gt_powersave (dev_priv); + }else + dev_priv->pm_rps_events =0 ; + } +mutex_lock (&dev_priv->drm.struct_mutex);mutex_lock (&dev_priv->pm.pcu_lock);
drivers/gpu/drm/i915/intel_slpc.c +170 -0
182 lines not on this page · raw message
drivers/gpu/drm/i915/intel_slpc.h +9 -0
@@ -26,7 +26,9 @@struct intel_slpc {bool active; +bool tdr_reset;struct i915_vma *vma; +u32 rp_control; };static inline int intel_slpc_enabled (void )
@@ -255,9 +257,16 @@ int intel_slpc_task_control(struct intel_slpc *slpc, u64 val, u32 enable_id, u32 disable_id);int intel_slpc_task_status (struct intel_slpc *slpc,u64 *val,u32 enable_id,u32 disable_id); +void intel_slpc_read_shared_data (struct intel_slpc *slpc, +struct slpc_shared_data *data); +const char *intel_slpc_get_state_str (enum slpc_global_state state); +bool intel_slpc_get_status (struct intel_slpc *slpc); +void intel_slpc_save_default_rps (struct intel_slpc *slpc);void intel_slpc_init (struct intel_slpc *slpc);void intel_slpc_cleanup (struct intel_slpc *slpc);void intel_slpc_enable (struct intel_slpc *slpc);void intel_slpc_disable (struct intel_slpc *slpc); +void intel_slpc_reset_prepare (struct intel_slpc *slpc); +void intel_slpc_tdr_reset (struct intel_slpc *slpc);#endif
drivers/gpu/drm/i915/intel_uc.c +1 -0
@@ -502,5 +502,6 @@ int intel_uc_resume(struct drm_i915_private *dev_priv)int intel_uc_reset_prepare (struct drm_i915_private *dev_priv) { +intel_slpc_reset_prepare (&dev_priv->guc.slpc);return intel_uc_suspend (dev_priv); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 21/31] drm/i915/slpc: Send RESET event to enable SLPC during Load/TDR
Quoted 71 lines · Sagar Arun Kamble
Send host2guc SLPC reset event to GuC post GuC load.
Post this, i915 can ascertain if SLPC has started running successfully through shared data. This check is done duringintel_init_gt_powersave. This allows to get initial configuration setup by SLPC and if needed move to Host RPS if SLPC runs into issues.
On TDR/Engine reset i915 should send extra flagSLPC_RESET_FLAG_TDR_OCCURREDtoclear SLPC state as appropriate.v1: Extract
host2guc_slpcto handle slpc status code
coding style changes (Paulo)
RemovedWARN_ONfor checking msb of gtt address of shared gem obj. (ChrisW)
host2guc_actiontoi915_guc_actionchange.(Sagar) Updating SLPC enabled status. (Sagar)v2: Commit message update. (David)
v3: Rebase.
v4: Added
DRM_INFOmessage when SLPC is enabled.v5: Updated patch as
host2guc_slpcis moved to earlier patch.
SLPC activation status message put after checking the state from shared data duringintel_init_gt_powersave.v6: Added definition of
host2guc_slpcand clflush the shared data only
for required size. Setting state toNOT_RUNNINGbefore sending RESET event. Output data for SLPC actions is to be retrieved duringintel_guc_sendwith lock protection so created wrapper__intel_guc_sendthat outputs GuC output data if needed. Clearingpm_rps_eventson confirming SLPC RUNNING status so that even if host touches any of the PM registers by mistake it should not have any effect. (Sagar)v7: Added save/restore_default_rps as Uncore sanitize will clear the
RP_CONTROLsetup by BIOS. s/i915_ggtt_offset/guc_ggtt_offset.v8: Added support for handling TDR based SLPC reset. Added functions
host2guc_slpc_tdr_reset,intel_slpc_reset_prepareandintel_slpc_tdr_resetto handle TDR based SLPC reset.Cc Michal Wajdeczko <[email protected]>Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_irq.c | 7 +- drivers/gpu/drm/i915/intel_pm.c | 10 +++ drivers/gpu/drm/i915/intel_slpc.c | 170 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 9 ++ drivers/gpu/drm/i915/intel_uc.c | 1 + 6 files changed, 198 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +2
-0@@ -1074,6 +1074,8 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)intel_sanitize_options (dev_priv ); +intel_slpc_save_default_rps (&dev_priv->guc.slpc); + ret =i915_ggtt_probe_hw (dev_priv);if (ret)return ret;drivers/gpu/drm/i915/i915_irq.c +0
-0
drivers/gpu/drm/i915/i915_irq.c void i915_handle_error(struct drm_i915_private · line 2845
Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +5
-1@@ -2838,8 +2838,13 @@ void i915_handle_error(struct drm_i915_private *dev_priv, } } -if (!engine_mask) +if (!engine_mask) { +if (intel_slpc_active (&dev_priv->guc.slpc)) { +intel_slpc_reset_prepare (&dev_priv->guc.slpc); +intel_slpc_tdr_reset (&dev_priv->guc.slpc); + }
Can you just jump to single slpc function that will hide slpc internals ?
Quoted 12 lines
drivers/gpu/drm/i915/i915_irq.c +1
-0goto out; + }/* Full reset needs the mutex, stop any other user trying to do so. */ if (test_and_set_bit (I915_RESET_BACKOFF , &dev_priv->gpu_error.flags)) {drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -7918,6 +7918,16 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv)intel_runtime_pm_get (dev_priv ); }
drivers/gpu/drm/i915/intel_pm.c void intel_init_gt_powersave(struct · line 7930
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +10
-0+if (intel_slpc_enabled ()) { + dev_priv->guc.slpc.active = +intel_slpc_get_status (&dev_priv->guc.slpc); +if (!intel_slpc_active (&dev_priv->guc.slpc)) { + i915.enable_slpc =0 ; +intel_sanitize_gt_powersave (dev_priv); + }else + dev_priv->pm_rps_events =0 ; + } +
Hmm, on one hand you're trying to use friendly wrappers like enabled() active() but at the same time you're modifying data which these helpers were trying to hide ...
Quoted 81 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0mutex_lock (&dev_priv->drm.struct_mutex);mutex_lock (&dev_priv->pm.pcu_lock);drivers/gpu/drm/i915/intel_slpc.c +45
-0@@ -390,6 +390,140 @@ static void slpc_shared_data_init(struct intel_slpc *slpc)kunmap_atomic (data ); } +static void host2guc_slpc_reset (struct intel_slpc *slpc) +{ +struct slpc_event_input data = {0 }; +u32 shared_data_gtt_offset =guc_ggtt_offset (slpc->vma); + + data.header.value =SLPC_EVENT (SLPC_EVENT_RESET ,2 ); + data.args[0 ] = shared_data_gtt_offset; + data.args[1 ] =0 ; + +host2guc_slpc (slpc, &data,4 ); +} + +static void host2guc_slpc_tdr_reset (struct intel_slpc *slpc) +{ +struct slpc_event_input data = {0 }; +u32 shared_data_gtt_offset =guc_ggtt_offset (slpc->vma); + + data.header.value =SLPC_EVENT (SLPC_EVENT_RESET ,3 ); + data.args[0 ] = shared_data_gtt_offset; + data.args[1 ] =0 ; + data.args[2 ] =SLPC_RESET_FLAG_TDR_OCCURRED ; + +host2guc_slpc (slpc, &data,5 ); +} + +static void host2guc_slpc_query_task_state (struct intel_slpc *slpc) +{ +struct slpc_event_input data = {0 }; +u32 shared_data_gtt_offset =guc_ggtt_offset (slpc->vma); + + data.header.value =SLPC_EVENT (SLPC_EVENT_QUERY_TASK_STATE ,2 ); + data.args[0 ] = shared_data_gtt_offset; + data.args[1 ] =0 ; + +host2guc_slpc (slpc, &data,4 ); +} + +void intel_slpc_query_task_state (struct intel_slpc *slpc) +{ +if (slpc->active) +host2guc_slpc_query_task_state (slpc); +} + +/* +* This function will reads the state updates from GuC SLPC into shared data
+ * by invoking H2G action. Returns current state of GuC SLPC.
+ */drivers/gpu/drm/i915/intel_slpc.c +23
-0+void intel_slpc_read_shared_data (struct intel_slpc *slpc, +struct slpc_shared_data *data) +{ +struct page *page; +void *pv =NULL ; + +intel_slpc_query_task_state (slpc); + + page =i915_vma_first_page (slpc->vma); + pv =kmap_atomic (page); + +drm_clflush_virt_range (pv,sizeof (struct slpc_shared_data )); +memcpy (data, pv,sizeof (struct slpc_shared_data )); + +kunmap_atomic (pv); +} + +const char *intel_slpc_get_state_str (enum slpc_global_state state) +{ +if (state ==SLPC_GLOBAL_STATE_NOT_RUNNING ) +return "not running" ; +else if (state ==SLPC_GLOBAL_STATE_INITIALIZING ) +return "initializing" ;
drivers/gpu/drm/i915/intel_slpc.c static void slpc_shared_data_init(struct intel_slpc *slpc) · line 472
Quoted 10 lines
drivers/gpu/drm/i915/intel_slpc.c +10
-0+else if (state ==SLPC_GLOBAL_STATE_RESETTING ) +return "resetting" ; +else if (state ==SLPC_GLOBAL_STATE_RUNNING ) +return "running" ; +else if (state ==SLPC_GLOBAL_STATE_SHUTTING_DOWN ) +return "shutting down" ; +else if (state ==SLPC_GLOBAL_STATE_ERROR ) +return "error" ; +else +return "unknown" ;
s/if..else/switch..case
Quoted 24 lines
drivers/gpu/drm/i915/intel_slpc.c +24
-0+} + +bool intel_slpc_get_status (struct intel_slpc *slpc) +{ +struct slpc_shared_data data; +bool ret = false; + +intel_slpc_read_shared_data (slpc, &data); +DRM_INFO ("SLPC state: %s\n" , +intel_slpc_get_state_str (data.global_state)); + +switch (data.global_state) { +case SLPC_GLOBAL_STATE_RUNNING : +/* Capture required state from SLPC here */ + ret = true; +break ; +case SLPC_GLOBAL_STATE_ERROR : +DRM_ERROR ("SLPC in error state.\n" ); +break ; +case SLPC_GLOBAL_STATE_RESETTING : +/* +* SLPC enabling in GuC should be completing fast. +* If SLPC is taking time to initialize (unlikely as we are +* sending reset event during GuC load itself).
drivers/gpu/drm/i915/intel_slpc.c static void slpc_shared_data_init(struct intel_slpc *slpc) · line 506
Quoted 10 lines
drivers/gpu/drm/i915/intel_slpc.c +10
-0+* TODO: Need to wait till state changes to RUNNING. +*/ + ret = true; +DRM_ERROR ("SLPC not running yet.!!!" ); +break ; +default : +break ; + } +return ret; +}
Hmm, this function is trying to do much more than simple 'get' status. Is this necessary to print that many messages here ?
Quoted 100 lines
drivers/gpu/drm/i915/intel_slpc.c +3
-0+ +/* +* Uncore sanitize clears RPS state in Host GTPM flows set by BIOS, Save the
+ * initial BIOS programmed RPS state that is needed by SLPC and not set by SLPC.
+ * Set this state while enabling SLPC.
+ */drivers/gpu/drm/i915/intel_slpc.c +50
-0+void intel_slpc_save_default_rps (struct intel_slpc *slpc) +{ +struct drm_i915_private *dev_priv =slpc_to_i915 (slpc); + + slpc->rp_control =I915_READ (GEN6_RP_CONTROL ); +} + +static void intel_slpc_restore_default_rps (struct intel_slpc *slpc) +{ +struct drm_i915_private *dev_priv =slpc_to_i915 (slpc); + +I915_WRITE (GEN6_RP_CONTROL , slpc->rp_control); +} +void intel_slpc_init (struct intel_slpc *slpc) {struct intel_guc *guc =slpc_to_guc (slpc);@@ -426,6 +560,42 @@ void intel_slpc_cleanup(struct intel_slpc *slpc)void intel_slpc_enable (struct intel_slpc *slpc) { +struct page *page; +struct slpc_shared_data *data; + +intel_slpc_restore_default_rps (slpc); + + page =i915_vma_first_page (slpc->vma); + data =kmap_atomic (page); + data->global_state =SLPC_GLOBAL_STATE_NOT_RUNNING ; +kunmap_atomic (data); + +if (slpc->tdr_reset) { +host2guc_slpc_tdr_reset (slpc); + slpc->tdr_reset = false; + }else { +host2guc_slpc_reset (slpc); + } + + slpc->active = true; +} + +void intel_slpc_reset_prepare (struct intel_slpc *slpc) +{ +if (intel_slpc_active (slpc)) { +intel_slpc_disable (slpc); + slpc->tdr_reset = true; + } +} + +void intel_slpc_tdr_reset (struct intel_slpc *slpc) +{ +intel_slpc_restore_default_rps (slpc); +slpc_shared_data_init (slpc); + +host2guc_slpc_tdr_reset (slpc); + slpc->active = true; + slpc->tdr_reset = false; }void intel_slpc_disable (struct intel_slpc *slpc)drivers/gpu/drm/i915/intel_slpc.h +9
-0@@ -26,7 +26,9 @@struct intel_slpc {bool active; +bool tdr_reset;struct i915_vma *vma; +u32 rp_control; };static inline int intel_slpc_enabled (void )@@ -255,9 +257,16 @@ int intel_slpc_task_control(struct intel_slpc *slpc, u64 val, u32 enable_id, u32 disable_id);int intel_slpc_task_status (struct intel_slpc *slpc,u64 *val,u32 enable_id,u32 disable_id); +void intel_slpc_read_shared_data (struct intel_slpc *slpc, +struct slpc_shared_data *data); +const char *intel_slpc_get_state_str (enum slpc_global_state state); +bool intel_slpc_get_status (struct intel_slpc *slpc); +void intel_slpc_save_default_rps (struct intel_slpc *slpc);void intel_slpc_init (struct intel_slpc *slpc);void intel_slpc_cleanup (struct intel_slpc *slpc);void intel_slpc_enable (struct intel_slpc *slpc);void intel_slpc_disable (struct intel_slpc *slpc); +void intel_slpc_reset_prepare (struct intel_slpc *slpc); +void intel_slpc_tdr_reset (struct intel_slpc *slpc);#endif drivers/gpu/drm/i915/intel_uc.c +0
-0
drivers/gpu/drm/i915/intel_uc.c int intel_uc_resume(struct drm_i915_private · line 507
Quoted 6 lines
drivers/gpu/drm/i915/intel_uc.c +1
-0@@ -502,5 +502,6 @@ int intel_uc_resume(struct drm_i915_private *dev_priv)int intel_uc_reset_prepare (struct drm_i915_private *dev_priv) { +intel_slpc_reset_prepare (&dev_priv->guc.slpc);return intel_uc_suspend (dev_priv); }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 21/31] drm/i915/slpc: Send RESET event to enable SLPC during Load/TDR
Quoted 76 lines · Michal Wajdeczko
Quoted 74 lines · Sagar Arun Kamble
Send host2guc SLPC reset event to GuC post GuC load.
Post this, i915 can ascertain if SLPC has started running successfully through shared data. This check is done duringintel_init_gt_powersave. This allows to get initial configuration setup by SLPC and if needed move to Host RPS if SLPC runs into issues.
On TDR/Engine reset i915 should send extra flagSLPC_RESET_FLAG_TDR_OCCURREDtoclear SLPC state as appropriate.v1: Extract
host2guc_slpcto handle slpc status code coding style changes (Paulo)
RemovedWARN_ONfor checking msb of gtt address of shared gem obj. (ChrisW)
host2guc_actiontoi915_guc_actionchange.(Sagar) Updating SLPC enabled status. (Sagar)v2: Commit message update. (David)
v3: Rebase.
v4: Added
DRM_INFOmessage when SLPC is enabled.v5: Updated patch as
host2guc_slpcis moved to earlier patch. SLPC activation status message put after checking the state from shared data duringintel_init_gt_powersave.v6: Added definition of
host2guc_slpcand clflush the shared data only for required size. Setting state toNOT_RUNNINGbefore sending RESET event. Output data for SLPC actions is to be retrieved duringintel_guc_sendwith lock protection so created wrapper__intel_guc_sendthat outputs GuC output data if needed. Clearingpm_rps_eventson confirming SLPC RUNNING status so that even if host touches any of the PM registers by mistake it should not have any effect. (Sagar)v7: Added save/restore_default_rps as Uncore sanitize will clear the
RP_CONTROLsetup by BIOS. s/i915_ggtt_offset/guc_ggtt_offset.v8: Added support for handling TDR based SLPC reset. Added functions
host2guc_slpc_tdr_reset,intel_slpc_reset_prepareandintel_slpc_tdr_resetto handle TDR based SLPC reset.Cc Michal Wajdeczko <[email protected]>Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_irq.c | 7 +- drivers/gpu/drm/i915/intel_pm.c | 10 +++drivers/gpu/drm/i915/intel_slpc.c | 170
++++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_slpc.h | 9 ++
drivers/gpu/drm/i915/intel_uc.c | 1 +6 files changed, 198 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.c +2
-0@@ -1074,6 +1074,8 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) intel_sanitize_options(dev_priv); + intel_slpc_save_default_rps(&dev_priv->guc.slpc); + ret = i915_ggtt_probe_hw(dev_priv); if (ret) return ret;drivers/gpu/drm/i915/i915_irq.c +0
-0@@ -2838,8 +2838,13 @@ void i915_handle_error(struct drm_i915_private *dev_priv, } }
Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c void i915_handle_error(struct drm_i915_private *dev_priv, · line 2845
Quoted 6 lines
drivers/gpu/drm/i915/i915_irq.c +5
-1- if (!engine_mask) + if (!engine_mask) { + if (intel_slpc_active(&dev_priv->guc.slpc)) { +intel_slpc_reset_prepare (&dev_priv->guc.slpc); + intel_slpc_tdr_reset(&dev_priv->guc.slpc); + }Can you just jump to single slpc function that will hide slpc internals ?
we need to have these two calls as currently SLPC gets enabled during intel_uc_init_hw and we can reset from two places.
1. engine reset 2. full gpu reset
In 1st case we want to disable SLPC and reset it
In 2nd case we just want to disable SLPC and let it get enabled through intel_slpc_enable based on flag tdr_reset. I will remove intel_slpc_active check here and probably create two functions now to handle these different types of resets.
Quoted 18 lines
Quoted 18 lines
drivers/gpu/drm/i915/i915_irq.c +1
-0goto out; + } /* Full reset needs the mutex, stop any other user trying to do so. */ if (test_and_set_bit(I915_RESET_BACKOFF, &dev_priv->gpu_error.flags)) {drivers/gpu/drm/i915/intel_pm.c +6
-0@@ -7918,6 +7918,16 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv) intel_runtime_pm_get(dev_priv); } + if (intel_slpc_enabled()) { + dev_priv->guc.slpc.active = + intel_slpc_get_status(&dev_priv->guc.slpc); + if (!intel_slpc_active(&dev_priv->guc.slpc)) { + i915.enable_slpc = 0; + intel_sanitize_gt_powersave(dev_priv);
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c void intel_init_gt_powersave(struct drm_i915_private *dev_priv) · line 7930
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +4
-0+ } else + dev_priv->pm_rps_events = 0; + } +Hmm, on one hand you're trying to use friendly wrappers like
enabled()active()but at the same time you're modifying data which these helpers were trying to hide ...
This actually is point from where on intel_slpc_active() is determined.
SLPC enabling is asynchronous and we would need to poll on the shared memory status to know the status like in HuC case. I wanted to hide that latency by pushing out the check for SLPC status to intel_init_gt_powersave and not hold the gem_init for long. But it seems this mechanism is unreliable and it is better to poll. Ideally SLPC should have just returned ACK immediately. Will update this to include poll similar to the one done in SLPC disabling.
current flow is, i915_gem_init->intel_init_gt_powersave->intel_enable_gt_powersave (later during workload submission)
Quoted 86 lines
Quoted 86 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0mutex_lock (&dev_priv->drm.struct_mutex); mutex_lock(&dev_priv->pm.pcu_lock);drivers/gpu/drm/i915/intel_slpc.c +45
-0@@ -390,6 +390,140 @@ static void slpc_shared_data_init(struct intel_slpc *slpc) kunmap_atomic(data); } +static void host2guc_slpc_reset (struct intel_slpc *slpc) +{ + struct slpc_event_input data = {0}; + u32 shared_data_gtt_offset = guc_ggtt_offset(slpc->vma); + + data.header.value = SLPC_EVENT(SLPC_EVENT_RESET, 2); + data.args[0] = shared_data_gtt_offset; + data.args[1] = 0; + + host2guc_slpc(slpc, &data, 4); +} + +static void host2guc_slpc_tdr_reset (struct intel_slpc *slpc) +{ + struct slpc_event_input data = {0}; + u32 shared_data_gtt_offset = guc_ggtt_offset(slpc->vma); + + data.header.value = SLPC_EVENT(SLPC_EVENT_RESET, 3); + data.args[0] = shared_data_gtt_offset; + data.args[1] = 0; + data.args[2] = SLPC_RESET_FLAG_TDR_OCCURRED; + + host2guc_slpc(slpc, &data, 5); +} + +static void host2guc_slpc_query_task_state (struct intel_slpc *slpc) +{ + struct slpc_event_input data = {0}; + u32 shared_data_gtt_offset = guc_ggtt_offset(slpc->vma); + + data.header.value = SLPC_EVENT(SLPC_EVENT_QUERY_TASK_STATE, 2); + data.args[0] = shared_data_gtt_offset; + data.args[1] = 0; + + host2guc_slpc(slpc, &data, 4); +} + +void intel_slpc_query_task_state (struct intel_slpc *slpc) +{ + if (slpc->active) + host2guc_slpc_query_task_state(slpc); +} + +/* +* This function will reads the state updates from GuC SLPC into shared data
+ * by invoking H2G action. Returns current state of GuC SLPC.
+ */drivers/gpu/drm/i915/intel_slpc.c +27
-0+void intel_slpc_read_shared_data (struct intel_slpc *slpc, + struct slpc_shared_data *data) +{ + struct page *page; + void *pv = NULL; + + intel_slpc_query_task_state(slpc); + + page = i915_vma_first_page(slpc->vma); + pv = kmap_atomic(page); + + drm_clflush_virt_range(pv, sizeof(struct slpc_shared_data)); + memcpy(data, pv, sizeof(struct slpc_shared_data)); + + kunmap_atomic(pv); +} + +const char *intel_slpc_get_state_str (enum slpc_global_state state) +{ + if (state == SLPC_GLOBAL_STATE_NOT_RUNNING) + return "not running"; + else if (state == SLPC_GLOBAL_STATE_INITIALIZING) + return "initializing"; + else if (state == SLPC_GLOBAL_STATE_RESETTING) + return "resetting"; + else if (state == SLPC_GLOBAL_STATE_RUNNING) + return "running";
Quoted 8 lines
Quoted 6 lines
+ else if (state ==
SLPC_GLOBAL_STATE_SHUTTING_DOWN) + return "shutting down";
+ else if (state ==SLPC_GLOBAL_STATE_ERROR) + return "error";
+ else
+ return "unknown";s/if..else/switch..case
Ok. will update.
Quoted 30 lines
Quoted 30 lines
drivers/gpu/drm/i915/intel_slpc.c +29
-0+} + +bool intel_slpc_get_status (struct intel_slpc *slpc) +{ + struct slpc_shared_data data; + bool ret = false; + + intel_slpc_read_shared_data(slpc, &data); + DRM_INFO("SLPC state: %s\n", + intel_slpc_get_state_str(data.global_state)); + + switch (data.global_state) { + case SLPC_GLOBAL_STATE_RUNNING: + /* Capture required state from SLPC here */ + ret = true; + break; + case SLPC_GLOBAL_STATE_ERROR: + DRM_ERROR("SLPC in error state.\n"); + break; + case SLPC_GLOBAL_STATE_RESETTING: + /* + * SLPC enabling in GuC should be completing fast. + * If SLPC is taking time to initialize (unlikely as we are + * sending reset event during GuC load itself). + * TODO: Need to wait till state changes to RUNNING. + */ + ret = true; + DRM_ERROR("SLPC not running yet.!!!"); + break;
Quoted 8 lines
Quoted 5 lines
+ default:
+ break;
+ }
+ return ret;
+}Hmm, this function is trying to do much more than simple 'get' status. Is this necessary to print that many messages here ?
These are for debug purpose. will split the functionality here.
Quoted 99 lines
Quoted 99 lines
drivers/gpu/drm/i915/intel_slpc.c +3
-0+ +/* +* Uncore sanitize clears RPS state in Host GTPM flows set by BIOS, Save the
+ * initial BIOS programmed RPS state that is needed by SLPC and not set by SLPC.
+ * Set this state while enabling SLPC.
+ */drivers/gpu/drm/i915/intel_slpc.c +14
-0+void intel_slpc_save_default_rps (struct intel_slpc *slpc) +{ + struct drm_i915_private *dev_priv = slpc_to_i915(slpc); + + slpc->rp_control = I915_READ(GEN6_RP_CONTROL); +} + +static void intel_slpc_restore_default_rps (struct intel_slpc *slpc) +{ + struct drm_i915_private *dev_priv = slpc_to_i915(slpc); + + I915_WRITE(GEN6_RP_CONTROL, slpc->rp_control); +} +void
intel_slpc_init(struct intel_slpc *slpc)
{
structintel_guc*guc =slpc_to_guc(slpc);drivers/gpu/drm/i915/intel_slpc.c +36
-0@@ -426,6 +560,42 @@ void intel_slpc_cleanup(struct intel_slpc *slpc)void intel_slpc_enable (struct intel_slpc *slpc) { + struct page *page; + struct slpc_shared_data *data; + + intel_slpc_restore_default_rps(slpc); + + page = i915_vma_first_page(slpc->vma); + data = kmap_atomic(page); + data->global_state = SLPC_GLOBAL_STATE_NOT_RUNNING; + kunmap_atomic(data); + + if (slpc->tdr_reset) { + host2guc_slpc_tdr_reset(slpc); + slpc->tdr_reset = false; + } else { + host2guc_slpc_reset(slpc); + } + + slpc->active = true; +} + +void intel_slpc_reset_prepare (struct intel_slpc *slpc) +{ + if (intel_slpc_active(slpc)) { + intel_slpc_disable(slpc); + slpc->tdr_reset = true; + } +} + +void intel_slpc_tdr_reset (struct intel_slpc *slpc) +{ + intel_slpc_restore_default_rps(slpc); + slpc_shared_data_init(slpc); + + host2guc_slpc_tdr_reset(slpc); + slpc->active = true; + slpc->tdr_reset = false; }void intel_slpc_disable (struct intel_slpc *slpc)drivers/gpu/drm/i915/intel_slpc.h +9
-0@@ -26,7 +26,9 @@struct intel_slpc { bool active; + bool tdr_reset; struct i915_vma *vma; + u32 rp_control; };static inline int intel_slpc_enabled (void )@@ -255,9 +257,16 @@ int intel_slpc_task_control(struct intel_slpc *slpc, u64 val, u32 enable_id, u32 disable_id); int intel_slpc_task_status(struct intel_slpc *slpc, u64 *val, u32 enable_id, u32 disable_id); +void intel_slpc_read_shared_data (struct intel_slpc *slpc, + struct slpc_shared_data *data); +const char *intel_slpc_get_state_str (enum slpc_global_state state); +bool intel_slpc_get_status (struct intel_slpc *slpc); +void intel_slpc_save_default_rps (struct intel_slpc *slpc); void intel_slpc_init(struct intel_slpc *slpc); void intel_slpc_cleanup(struct intel_slpc *slpc); void intel_slpc_enable(struct intel_slpc *slpc); void intel_slpc_disable(struct intel_slpc *slpc); +void intel_slpc_reset_prepare (struct intel_slpc *slpc); +void intel_slpc_tdr_reset (struct intel_slpc *slpc);#endif drivers/gpu/drm/i915/intel_uc.c +0
-1--- a/drivers/gpu/drm/i915/intel_uc.c
Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.c int intel_uc_resume(struct drm_i915_private · line 507
Quoted 8 lines
+++
b/drivers/gpu/drm/i915/intel_uc.cdrivers/gpu/drm/i915/intel_uc.c +1
-0@@ -502,5 +502,6 @@ int intel_uc_resume(struct drm_i915_private *dev_priv)int intel_uc_reset_prepare (struct drm_i915_private *dev_priv) { + intel_slpc_reset_prepare(&dev_priv->guc.slpc); return intel_uc_suspend(dev_priv); }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 22/31 drm/i915/slpc: Send SHUTDOWN event
In reply to Sagar Arun KambleFrom: Tom O'Rourke <Tom.O'[email protected]>
Send SLPC shutdown event during disable, suspend, and reset operations. Sending shutdown event while already shutdown is OK.
v1: Return void instead of ignored error code (Paulo)
Removed WARN_ON for checking msb of gtt address of shared gem obj. (ChrisW)
Added SLPC state update during disable, suspend and reset. Changed semantics of reset. It is supposed to just disable. (Sagar)
v2-v4: Rebase.
v5: Updated the input data structure. (Sagar)
v6: Rebase.
v7: s/i915_ggtt_offset/guc_ggtt_offset.
v8: Updated the status check post disabling to wait for 20us. (Sagar)
--- drivers/gpu/drm/i915/intel_slpc.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/gpu/drm/i915/intel_slpc.c +27 -0
@@ -427,6 +427,18 @@ static void host2guc_slpc_query_task_state(struct intel_slpc *slpc)host2guc_slpc (slpc, &data,4 ); } +static void host2guc_slpc_shutdown (struct intel_slpc *slpc) +{ +struct slpc_event_input data = {0 }; +u32 shared_data_gtt_offset =guc_ggtt_offset (slpc->vma); + + data.header.value =SLPC_EVENT (SLPC_EVENT_SHUTDOWN ,2 ); + data.args[0 ] = shared_data_gtt_offset; + data.args[1 ] =0 ; + +host2guc_slpc (slpc, &data,4 ); +} +void intel_slpc_query_task_state (struct intel_slpc *slpc) {if (slpc->active)
@@ -598,6 +610,21 @@ void intel_slpc_tdr_reset(struct intel_slpc *slpc) slpc->tdr_reset = false; } +static bool intel_slpc_disabled (struct intel_slpc *slpc) +{ +struct slpc_shared_data data; + +intel_slpc_read_shared_data (slpc, &data); +return (data.global_state ==SLPC_GLOBAL_STATE_NOT_RUNNING ); +} +void intel_slpc_disable (struct intel_slpc *slpc) { +host2guc_slpc_shutdown (slpc); + +/* Ensure SLPC is not running prior to releasing Shared data */ +if (wait_for_us (intel_slpc_disabled (slpc),20 )) +WARN_ONCE (true,"SLPC shutdown failed\n" ); + + slpc->active = false; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 23/31 drm/i915/slpc: Add support for min/max frequency control
In reply to Sagar Arun KambleUpdate sysfs and debugfs functions to set SLPC
parameters when setting max/min frequency.
v1: Update for SLPC 2015.2.4 (params for both slice and unslice)
Replace HAS_SLPC with intel_slpc_active() (Paulo)
v2-v4: Rebase.
v5: Removed typecasting the frequency values to u32. (Chris)
Changed intel_slpc_active to guc.slpc.enabled. Carved out SLPC helpers to set min and max frequencies.
v6: Rebase. Doing explicit SLPC reset on setting frequency to start sane
and covered with RPM get/put. Caching SLPC limits post enabling first.
v7: Rebase due to change in the dev_priv->pm.rps structure.
--- drivers/gpu/drm/i915/i915_debugfs.c | 48 ++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/i915_sysfs.c | 36 ++++++++++++++++++++---- drivers/gpu/drm/i915/intel_slpc.c | 56 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 5 ++++ 4 files changed, 135 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +44 -4
@@ -4381,7 +4381,13 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,if (INTEL_GEN (dev_priv) <6 )return -ENODEV ; - *val =intel_gpu_freq (dev_priv, dev_priv->pm.rps.max_freq_softlimit); +if (intel_slpc_active (&dev_priv->guc.slpc)) + *val =intel_gpu_freq (dev_priv, + dev_priv->guc.slpc.max_unslice_freq); +else + *val =intel_gpu_freq (dev_priv, + dev_priv->pm.rps.max_freq_softlimit); +return 0 ; }
@@ -4398,20 +4404,32 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,DRM_DEBUG_DRIVER ("Manually setting max freq to %llu\n" , val); +intel_runtime_pm_get (dev_priv); + ret =mutex_lock_interruptible (&dev_priv->pm.pcu_lock); -if (ret) +if (ret) { +intel_runtime_pm_put (dev_priv);return ret; + }/* * Turbo will still be enabled, but won't go above the set value. */ val =intel_freq_opcode (dev_priv, val); +if (intel_slpc_active (&dev_priv->guc.slpc)) { + ret =intel_slpc_max_freq_set (&dev_priv->guc.slpc, val); +mutex_unlock (&dev_priv->pm.pcu_lock); +intel_runtime_pm_put (dev_priv); +return ret; + } + hw_max = rps->max_freq; hw_min = rps->min_freq;if (val < hw_min || val > hw_max || val < rps->min_freq_softlimit) {mutex_unlock (&dev_priv->pm.pcu_lock); +intel_runtime_pm_put (dev_priv);return -EINVAL ; }
@@ -4422,6 +4440,8 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,mutex_unlock (&dev_priv->pm.pcu_lock); +intel_runtime_pm_put (dev_priv); +return 0 ; }
@@ -4437,7 +4457,13 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,if (INTEL_GEN (dev_priv) <6 )return -ENODEV ; - *val =intel_gpu_freq (dev_priv, dev_priv->pm.rps.min_freq_softlimit); +if (intel_slpc_active (&dev_priv->guc.slpc)) + *val =intel_gpu_freq (dev_priv, + dev_priv->guc.slpc.min_unslice_freq); +else + *val =intel_gpu_freq (dev_priv, + dev_priv->pm.rps.min_freq_softlimit); +return 0 ; }
@@ -4453,21 +4479,33 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,DRM_DEBUG_DRIVER ("Manually setting min freq to %llu\n" , val); +intel_runtime_pm_get (dev_priv); + ret =mutex_lock_interruptible (&dev_priv->pm.pcu_lock); -if (ret) +if (ret) { +intel_runtime_pm_put (dev_priv);return ret; + }/* * Turbo will still be enabled, but won't go below the set value. */ val =intel_freq_opcode (dev_priv, val); +if (intel_slpc_active (&dev_priv->guc.slpc)) { + ret =intel_slpc_min_freq_set (&dev_priv->guc.slpc, val); +mutex_unlock (&dev_priv->pm.pcu_lock); +intel_runtime_pm_put (dev_priv); +return ret; + } + hw_max = dev_priv->pm.rps.max_freq; hw_min = dev_priv->pm.rps.min_freq;if (val < hw_min || val > hw_max || val > dev_priv->pm.rps.max_freq_softlimit) {mutex_unlock (&dev_priv->pm.pcu_lock); +intel_runtime_pm_put (dev_priv);return -EINVAL ; }
@@ -4478,6 +4516,8 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,mutex_unlock (&dev_priv->pm.pcu_lock); +intel_runtime_pm_put (dev_priv); +return 0 ; }
drivers/gpu/drm/i915/i915_sysfs.c +30 -6
@@ -325,9 +325,14 @@ static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attribute {struct drm_i915_private *dev_priv =kdev_minor_to_i915 (kdev); -return snprintf (buf,PAGE_SIZE ,"%d\n" , -intel_gpu_freq (dev_priv, - dev_priv->pm.rps.max_freq_softlimit)); +if (intel_slpc_active (&dev_priv->guc.slpc)) +return snprintf (buf,PAGE_SIZE ,"%d\n" , +intel_gpu_freq (dev_priv, + dev_priv->guc.slpc.max_unslice_freq)); +else +return snprintf (buf,PAGE_SIZE ,"%d\n" , +intel_gpu_freq (dev_priv, + dev_priv->pm.rps.max_freq_softlimit)); } static ssize_t gt_max_freq_mhz_store(struct device *kdev,
@@ -348,6 +353,13 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev, val =intel_freq_opcode (dev_priv, val); +if (intel_slpc_active (&dev_priv->guc.slpc)) { + ret =intel_slpc_max_freq_set (&dev_priv->guc.slpc, val); +mutex_unlock (&dev_priv->pm.pcu_lock); +intel_runtime_pm_put (dev_priv); +return ret ? ret : count; + } +if (val < dev_priv->pm.rps.min_freq || val > dev_priv->pm.rps.max_freq || val < dev_priv->pm.rps.min_freq_softlimit) {
@@ -382,9 +394,14 @@ static ssize_t gt_min_freq_mhz_show(struct device *kdev, struct device_attribute {struct drm_i915_private *dev_priv =kdev_minor_to_i915 (kdev); -return snprintf (buf,PAGE_SIZE ,"%d\n" , -intel_gpu_freq (dev_priv, - dev_priv->pm.rps.min_freq_softlimit)); +if (intel_slpc_active (&dev_priv->guc.slpc)) +return snprintf (buf,PAGE_SIZE ,"%d\n" , +intel_gpu_freq (dev_priv, + dev_priv->guc.slpc.min_unslice_freq)); +else +return snprintf (buf,PAGE_SIZE ,"%d\n" , +intel_gpu_freq (dev_priv, + dev_priv->pm.rps.min_freq_softlimit)); } static ssize_t gt_min_freq_mhz_store(struct device *kdev,
@@ -405,6 +422,13 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev, val =intel_freq_opcode (dev_priv, val); +if (intel_slpc_active (&dev_priv->guc.slpc)) { + ret =intel_slpc_min_freq_set (&dev_priv->guc.slpc, val); +mutex_unlock (&dev_priv->pm.pcu_lock); +intel_runtime_pm_put (dev_priv); +return ret ? ret : count; + } +if (val < dev_priv->pm.rps.min_freq || val > dev_priv->pm.rps.max_freq || val > dev_priv->pm.rps.max_freq_softlimit) {
drivers/gpu/drm/i915/intel_slpc.c +56 -0
68 lines not on this page · raw message
drivers/gpu/drm/i915/intel_slpc.h +5 -0
@@ -29,6 +29,9 @@ struct intel_slpc {bool tdr_reset;struct i915_vma *vma;u32 rp_control; +/* i915 cached SLPC frequency limits */ +u32 min_unslice_freq; +u32 max_unslice_freq; };static inline int intel_slpc_enabled (void )
@@ -262,6 +265,8 @@ void intel_slpc_read_shared_data(struct intel_slpc *slpc,const char *intel_slpc_get_state_str (enum slpc_global_state state);bool intel_slpc_get_status (struct intel_slpc *slpc);void intel_slpc_save_default_rps (struct intel_slpc *slpc); +int intel_slpc_max_freq_set (struct intel_slpc *slpc,u32 val); +int intel_slpc_min_freq_set (struct intel_slpc *slpc,u32 val);void intel_slpc_init (struct intel_slpc *slpc);void intel_slpc_cleanup (struct intel_slpc *slpc);void intel_slpc_enable (struct intel_slpc *slpc);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 24/31 drm/i915/slpc: Add debugfs support to read/write/revert the parameters
In reply to Sagar Arun KambleThis patch adds two debugfs interfaces:
1. i915_slpc_paramlist: List of all parameters that Host can configure. Currently listing id and description of each.
2. i915_slpc_param_ctl: This allows to change the parameters. Syntax is:
echo "write <id> <value>" > i915_slpc_param_ctl.
echo "read <id>" > i915_slpc_param_ctl; cat i915_slpc_param_ctl revert allows to set to default SLPC internal values. Syntax is:
echo "revert <id>" > i915_slpc_param_ctl.
Added support to set/read parameters and unset the parameters which will revert them to default SLPC internal values. Also added RPM ref. cover around set/unset calls. Explicit SLPC reset is needed on setting/unsetting some of the parameters.
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 +++++ drivers/gpu/drm/i915/intel_slpc.c | 158 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 6 ++ 3 files changed, 183 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +19 -0
@@ -2352,6 +2352,23 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data)return 0 ; } +static int i915_slpc_paramlist_info (struct seq_file *m,void *data) +{ +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +int i; + +if (!dev_priv->guc.slpc.active) { +seq_puts (m,"SLPC not active\n" ); +return 0 ; + } + +seq_puts (m,"Param id\tParam description\n" ); +for (i =0 ; i <SLPC_MAX_PARAM ; i++) +seq_printf (m,"%8d\t%s\n" , slpc_paramlist[i].id, + slpc_paramlist[i].description); +return 0 ; +} +static int i915_guc_load_status_info (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);
@@ -4881,6 +4898,7 @@ static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file) {"i915_guc_load_err_log_dump", i915_guc_log_dump, 0, (void *)1}, {"i915_guc_stage_pool", i915_guc_stage_pool, 0}, {"i915_huc_load_status", i915_huc_load_status_info, 0}, + {"i915_slpc_paramlist", i915_slpc_paramlist_info, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_hangcheck_info", i915_hangcheck_info, 0}, {"i915_reset_info", i915_reset_info, 0},
@@ -4944,6 +4962,7 @@ static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file) {"i915_dp_test_type", &i915_displayport_test_type_fops}, {"i915_dp_test_active", &i915_displayport_test_active_fops}, {"i915_guc_log_control", &i915_guc_log_control_fops}, + {"i915_slpc_param_ctl", &i915_slpc_param_ctl_fops}, {"i915_hpd_storm_ctl", &i915_hpd_storm_ctl_fops}, {"i915_ipc_status", &i915_ipc_status_fops} };
drivers/gpu/drm/i915/intel_slpc.c +158 -0
167 lines not on this page · raw message
drivers/gpu/drm/i915/intel_slpc.h +6 -0
@@ -32,6 +32,10 @@ struct intel_slpc {/* i915 cached SLPC frequency limits */ u32 min_unslice_freq;u32 max_unslice_freq; + +u32 debug_param_id; +u32 debug_param_value; +u32 debug_param_override; };static inline int intel_slpc_enabled (void )
@@ -251,6 +255,8 @@ struct slpc_param {#define SLPC_PARAM_TASK_DISABLED 2#define SLPC_PARAM_TASK_UNKNOWN 3 +extern const struct file_operations i915_slpc_param_ctl_fops; +/* intel_slpc.c */ void intel_slpc_set_param (struct intel_slpc *slpc,u32 id,u32 value);void intel_slpc_unset_param (struct intel_slpc *slpc,u32 id);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 24/31] drm/i915/slpc: Add debugfs support to read/write/revert the parameters
Quoted 27 lines · Sagar Arun Kamble
This patch adds two debugfs interfaces:
1.i915_slpc_paramlist: List of all parameters that Host can configure. Currently listing id and description of each.
2.i915_slpc_param_ctl: This allows to change the parameters. Syntax is:echo "write <id> <value>" > i915_slpc_param_ctl. echo "read <id>" > i915_slpc_param_ctl; cat i915_slpc_param_ctl revert allows to set to default SLPC internal values. Syntax is: echo "revert <id>" > i915_slpc_param_ctl.Added support to set/read parameters and unset the parameters which will revert them to default SLPC internal values. Also added RPM ref. cover around set/unset calls. Explicit SLPC reset is needed on setting/unsetting some of the parameters.
Signed-off-by Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 19 +++++ drivers/gpu/drm/i915/intel_slpc.c | 158 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 6 ++ 3 files changed, 183 insertions(+)drivers/gpu/drm/i915/i915_debugfs.c +0
-0
drivers/gpu/drm/i915/i915_debugfs.c static int i915_huc_load_status_info(struct · line 2355
Quoted 4 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0@@ -2352,6 +2352,23 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data)return 0 ; } +static int i915_slpc_paramlist_info (struct seq_file *m,void *data)
I'm little confused that part of the debugfs functionality is done here while other part in slpc.c
drivers/gpu/drm/i915/i915_debugfs.c static int i915_huc_load_status_info(struct seq_file *m, void *data) · line 2360
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +5
-0+{ +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +int i; + +if (!dev_priv->guc.slpc.active) {
intel_slpc_active() ?
drivers/gpu/drm/i915/i915_debugfs.c static int i915_huc_load_status_info(struct seq_file *m, void *data) · line 2368
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +8
-0+seq_puts (m,"SLPC not active\n" ); +return 0 ; + } + +seq_puts (m,"Param id\tParam description\n" ); +for (i =0 ; i <SLPC_MAX_PARAM ; i++) +seq_printf (m,"%8d\t%s\n" , slpc_paramlist[i].id, + slpc_paramlist[i].description);
What if size of slpc_paramlist[] will be smaller than i ?
Quoted 37 lines
drivers/gpu/drm/i915/i915_debugfs.c +4
-0+return 0 ; +} +static int i915_guc_load_status_info (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);@@ -4881,6 +4898,7 @@ static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file) {"i915_guc_load_err_log_dump", i915_guc_log_dump, 0, (void *)1}, {"i915_guc_stage_pool", i915_guc_stage_pool, 0}, {"i915_huc_load_status", i915_huc_load_status_info, 0}, + {"i915_slpc_paramlist", i915_slpc_paramlist_info, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_hangcheck_info", i915_hangcheck_info, 0},drivers/gpu/drm/i915/i915_debugfs.c +1
-0{"i915_reset_info", i915_reset_info, 0},@@ -4944,6 +4962,7 @@ static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file) {"i915_dp_test_type", &i915_displayport_test_type_fops}, {"i915_dp_test_active", &i915_displayport_test_active_fops}, {"i915_guc_log_control", &i915_guc_log_control_fops}, + {"i915_slpc_param_ctl", &i915_slpc_param_ctl_fops}, {"i915_hpd_storm_ctl", &i915_hpd_storm_ctl_fops}, {"i915_ipc_status", &i915_ipc_status_fops}};
drivers/gpu/drm/i915/intel_slpc.c +2
-0@@ -25,6 +25,8 @@#include <asm/msr-index.h> #include "i915_drv.h" #include "intel_uc.h" +#include <linux/seq_file.h> +#include <linux/debugfs.h> struct slpc_param slpc_paramlist[SLPC_MAX_PARAM ] = { {SLPC_PARAM_TASK_ENABLE_GTPERF ,"Enable task GTPERF" },
drivers/gpu/drm/i915/intel_slpc.c void intel_slpc_disable(struct intel_slpc *slpc) · line 694
Quoted 9 lines
drivers/gpu/drm/i915/intel_slpc.c +7
-0@@ -684,3 +686,159 @@ void intel_slpc_disable(struct intel_slpc *slpc) slpc->active = false; } + +static int slpc_param_ctl_show (struct seq_file *m,void *data) +{ +struct drm_i915_private *dev_priv = m->private; +struct intel_slpc *slpc = &dev_priv->guc.slpc; + +if (!slpc->active) {
intel_slpc_active() ?
drivers/gpu/drm/i915/intel_slpc.c void intel_slpc_disable(struct intel_slpc *slpc) · line 704
Quoted 9 lines
drivers/gpu/drm/i915/intel_slpc.c +9
-0+seq_puts (m,"SLPC not active\n" ); +return 0 ; + } + +seq_printf (m,"%s=%u, override=%s\n" , + slpc_paramlist[slpc->debug_param_id].description, + slpc->debug_param_value, +yesno (!!slpc->debug_param_override)); +
What if slpc->debug_param_id >= SLPC_MAX_PARAM or sizeof paramlist ?
Quoted 26 lines
drivers/gpu/drm/i915/intel_slpc.c +22
-0+return 0 ; +} + +static int slpc_param_ctl_open (struct inode *inode,struct file *file) +{ +return single_open (file, slpc_param_ctl_show, inode->i_private); +} + +static const char *read_token ="read" , *write_token ="write" , + *revert_token ="revert" ; + +/* +* Parse SLPC parameter control strings: (Similar to Pipe CRC handling) +* command: wsp* op wsp+ param id wsp+ [value] wsp* +* op: "read"/"write"/"revert" +* param id: slpc_param_id +* value: u32 value +* wsp: (#0x20 | #0x9 | #0xA)+ +* +* eg.: +* "read 0" -> read SLPC_PARAM_TASK_ENABLE_GTPERF +* "write 7 500" -> set SLPC_PARAM_GLOBAL_MIN_GT_SLICE_FREQ_MHZ to 500MHz
+ * "revert 7" -> revertSLPC_PARAM_GLOBAL_MIN_GT_SLICE_FREQ_MHZto
+ * default value.
+ */
drivers/gpu/drm/i915/intel_slpc.c void intel_slpc_disable(struct intel_slpc *slpc) · line 738
Quoted 9 lines
drivers/gpu/drm/i915/intel_slpc.c +9
-0+static int slpc_param_ctl_parse (char *buf,size_t len,char **op, +u32 *id,u32 *value) +{ +#define MAX_WORDS 3 +int n_words; +char *words[MAX_WORDS ]; +ssize_t ret; + + n_words =buffer_tokenize (buf, words,MAX_WORDS );
Ha! finally found the purpose of the patch 001
Please try to keep them closer.
drivers/gpu/drm/i915/intel_slpc.c void intel_slpc_disable(struct intel_slpc *slpc) · line 747
Quoted 9 lines
drivers/gpu/drm/i915/intel_slpc.c +9
-0+if (!(n_words ==3 ) && !(n_words ==2 )) { +DRM_DEBUG_DRIVER ("tokenize failed, a command is %d words\n" , +MAX_WORDS ); +return -EINVAL ; + } + +if (strcmp (words[0 ], read_token) &&strcmp (words[0 ], write_token) && +strcmp (words[0 ], revert_token)) { +DRM_DEBUG_DRIVER ("unknown operation\n" );
Please add operation word into message for easier debug
drivers/gpu/drm/i915/intel_slpc.c void intel_slpc_disable(struct intel_slpc *slpc) · line 751
Quoted 4 lines
drivers/gpu/drm/i915/intel_slpc.c +4
-0+return -EINVAL ; + } + + *op = words[0 ];
Hmm, this will cause yet another strcmp - try to convert into OP code.
drivers/gpu/drm/i915/intel_slpc.c void intel_slpc_disable(struct intel_slpc *slpc) · line 763
Quoted 12 lines
drivers/gpu/drm/i915/intel_slpc.c +12
-0+ + ret =kstrtou32 (words[1 ],0 , id); +if (ret) +return ret; + +if (n_words ==3 ) { + ret =kstrtou32 (words[2 ],0 , value); +if (ret) +return ret; + } + +return 0 ;
Shouldn't we return n_words-1 to easier catch any missing params?
Quoted 22 lines
drivers/gpu/drm/i915/intel_slpc.c +3
-0+} + +static ssize_t slpc_param_ctl_write(struct file *file, const char
__user*ubuf,drivers/gpu/drm/i915/intel_slpc.c +18
-0+ size_t len, loff_t *offp) +{ + struct seq_file *m = file->private_data; +struct drm_i915_private *dev_priv = m->private; +struct intel_slpc *slpc = &dev_priv->guc.slpc; +char *tmpbuf, *op =NULL ; +u32 id, value; +int ret; + +if (len ==0 ) +return 0 ; + +if (len >40 ) { +DRM_DEBUG_DRIVER ("expected <40 chars into slpc_param_ctl\n" ); +return -E2BIG ; + } + + tmpbuf =kmalloc (len +1 ,GFP_KERNEL );
drivers/gpu/drm/i915/intel_slpc.c void intel_slpc_disable(struct intel_slpc *slpc) · line 794
Quoted 10 lines
drivers/gpu/drm/i915/intel_slpc.c +10
-0+if (!tmpbuf) +return -ENOMEM ; + +if (copy_from_user (tmpbuf, ubuf, len)) { + ret = -EFAULT ; + goto out; + } + tmpbuf[len] ='\0' ; + + ret =slpc_param_ctl_parse (tmpbuf, len, &op, &id, &value);
'ret' is not checked for errors
Quoted 55 lines
drivers/gpu/drm/i915/intel_slpc.c +50
-0+ +if (id >=SLPC_MAX_PARAM ) { + ret = -EINVAL ; + goto out; + } + +if (!strcmp (op, read_token)) { +intel_slpc_get_param (slpc, id, + &slpc->debug_param_override, + &slpc->debug_param_value); + slpc->debug_param_id = id; + }else if (!strcmp (op, write_token) || !strcmp (op, revert_token)) { +if ((id >=SLPC_PARAM_TASK_ENABLE_GTPERF ) && + (id <=SLPC_PARAM_TASK_DISABLE_DCC )) { +DRM_DEBUG_DRIVER ("Tasks are not controlled by " +"this interface\n" ); + ret = -EINVAL ; + goto out; + } + +/* +* After updating parameters, RESET event has to be sent to GuC +* SLPC for ensuring parameters take effect. +*/ +intel_runtime_pm_get (dev_priv); +if (!strcmp (op, write_token)) +intel_slpc_set_param (slpc, id, value); +else if (!strcmp (op, revert_token)) +intel_slpc_unset_param (slpc, id); +intel_slpc_enable (slpc); +intel_runtime_pm_put (dev_priv); + } + +out: +kfree (tmpbuf); +if (ret <0 ) +return ret; + + *offp += len; +return len; +} + +const struct file_operations i915_slpc_param_ctl_fops = { + .owner =THIS_MODULE , + .open = slpc_param_ctl_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, + .write = slpc_param_ctl_write +};drivers/gpu/drm/i915/intel_slpc.h +0
-0
drivers/gpu/drm/i915/intel_slpc.h struct intel_slpc { · line 38
Quoted 7 lines
drivers/gpu/drm/i915/intel_slpc.h +4
-0@@ -32,6 +32,10 @@ struct intel_slpc {/* i915 cached SLPC frequency limits */ u32 min_unslice_freq;u32 max_unslice_freq; + +u32 debug_param_id; +u32 debug_param_value; +u32 debug_param_override;
Group above under 'debug' sub-struct
drivers/gpu/drm/i915/intel_slpc.h struct slpc_param { · line 261
Quoted 10 lines
drivers/gpu/drm/i915/intel_slpc.h +2
-0};static inline int intel_slpc_enabled (void )@@ -251,6 +255,8 @@ struct slpc_param {#define SLPC_PARAM_TASK_DISABLED 2#define SLPC_PARAM_TASK_UNKNOWN 3 +extern const struct file_operations i915_slpc_param_ctl_fops; +/* intel_slpc.c */ void intel_slpc_set_param (struct intel_slpc *slpc,u32 id,u32 value);void intel_slpc_unset_param (struct intel_slpc *slpc,u32 id);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 24/31] drm/i915/slpc: Add debugfs support to read/write/revert the parameters
Quoted 24 lines · Michal Wajdeczko
Quoted 22 lines · Sagar Arun Kamble
This patch adds two debugfs interfaces:
1.i915_slpc_paramlist: List of all parameters that Host can configure. Currently listing id and description of each.
2.i915_slpc_param_ctl: This allows to change the parameters. Syntax is:
echo "write <id> <value>" >i915_slpc_param_ctl.
echo "read <id>" >i915_slpc_param_ctl; cati915_slpc_param_ctlrevert allows to set to default SLPC internal values. Syntax is:
echo "revert <id>" >i915_slpc_param_ctl.Added support to set/read parameters and unset the parameters which will revert them to default SLPC internal values. Also added RPM ref. cover around set/unset calls. Explicit SLPC reset is needed on setting/unsetting some of the parameters.
Signed-off-by Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 19 +++++
drivers/gpu/drm/i915/intel_slpc.c | 158
++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_slpc.h | 6 ++3 files changed, 183 insertions(+)
Quoted 12 lines
drivers/gpu/drm/i915/i915_debugfs.c static int i915_huc_load_status_info(struct · line 2355
Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0@@ -2352,6 +2352,23 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data) return 0; } +static int i915_slpc_paramlist_info (struct seq_file *m,void *data)I'm little confused that part of the debugfs functionality is done here while other part in
slpc.c
Will pull them together. It was to allow new interfaces to make use of the functionality in slpc.c.
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c static int i915_huc_load_status_info(struct seq_file *m, void *data) · line 2360
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +5
-0+{ + struct drm_i915_private *dev_priv = node_to_i915(m->private); + int i; + + if (!dev_priv->guc.slpc.active) {
intel_slpc_active()?
yes. will update.
Quoted 11 lines
drivers/gpu/drm/i915/i915_debugfs.c static int i915_huc_load_status_info(struct seq_file *m, void *data) · line 2368
Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c +8
-0+ seq_puts(m, "SLPC not active\n"); + return 0; + } + + seq_puts(m, "Param id\tParam description\n"); + for (i = 0; i < SLPC_MAX_PARAM; i++) + seq_printf(m, "%8d\t%s\n", slpc_paramlist[i].id, + slpc_paramlist[i].description);What if size of slpc_paramlist[] will be smaller than i ?
will add the size checks.
Quoted 41 lines
Quoted 41 lines
drivers/gpu/drm/i915/i915_debugfs.c +4
-0+ return 0; +} + static int i915_guc_load_status_info(struct seq_file *m, void *data) { struct drm_i915_private *dev_priv = node_to_i915(m->private);@@ -4881,6 +4898,7 @@ static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file) {"i915_guc_load_err_log_dump", i915_guc_log_dump, 0, (void *)1}, {"i915_guc_stage_pool", i915_guc_stage_pool, 0}, {"i915_huc_load_status", i915_huc_load_status_info, 0}, + {"i915_slpc_paramlist", i915_slpc_paramlist_info, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_hangcheck_info", i915_hangcheck_info, 0},{"
i915_reset_info",i915_reset_info, 0},drivers/gpu/drm/i915/i915_debugfs.c +1
-0@@ -4944,6 +4962,7 @@ static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file) {"i915_dp_test_type", &i915_displayport_test_type_fops}, {"i915_dp_test_active", &i915_displayport_test_active_fops}, {"i915_guc_log_control", &i915_guc_log_control_fops}, + {"i915_slpc_param_ctl", &i915_slpc_param_ctl_fops}, {"i915_hpd_storm_ctl", &i915_hpd_storm_ctl_fops}, {"i915_ipc_status", &i915_ipc_status_fops}};
drivers/gpu/drm/i915/intel_slpc.c +3
-0@@ -25,6 +25,8 @@ #include <asm/msr-index.h> #include "i915_drv.h" #include "intel_uc.h" +#include <linux/seq_file.h> +#include <linux/debugfs.h> struct slpc_param slpc_paramlist[SLPC_MAX_PARAM ] = { {SLPC_PARAM_TASK_ENABLE_GTPERF, "Enable task GTPERF"},@@ -684,3 +686,159 @@ void intel_slpc_disable(struct intel_slpc *slpc) slpc->active = false; } +
Quoted 8 lines
drivers/gpu/drm/i915/intel_slpc.c void intel_slpc_disable(struct intel_slpc *slpc) · line 695
Quoted 6 lines
drivers/gpu/drm/i915/intel_slpc.c +6
-0+static int slpc_param_ctl_show (struct seq_file *m,void *data) +{ + struct drm_i915_private *dev_priv = m->private; + struct intel_slpc *slpc = &dev_priv->guc.slpc; + + if (!slpc->active) {
intel_slpc_active()?
yes. will update.
Quoted 12 lines
drivers/gpu/drm/i915/intel_slpc.c void intel_slpc_disable(struct intel_slpc *slpc) · line 704
Quoted 10 lines
drivers/gpu/drm/i915/intel_slpc.c +9
-0+ seq_puts(m, "SLPC not active\n"); + return 0; + } + + seq_printf(m, "%s=%u, override=%s\n", + slpc_paramlist[slpc->debug_param_id].description, + slpc->debug_param_value, + yesno(!!slpc->debug_param_override)); +What if
slpc->debug_param_id>=SLPC_MAX_PARAMor sizeof paramlist ?
will add the check.
Quoted 32 lines
Quoted 32 lines
drivers/gpu/drm/i915/intel_slpc.c +22
-0+ return 0; +} + +static int slpc_param_ctl_open (struct inode *inode,struct file *file) +{ + return single_open(file, slpc_param_ctl_show, inode->i_private); +} + +static const char *read_token ="read" , *write_token ="write" , + *revert_token = "revert"; + +/* +* Parse SLPC parameter control strings: (Similar to Pipe CRC handling) +* command: wsp* op wsp+ param id wsp+ [value] wsp* +* op: "read"/"write"/"revert" +* param id: slpc_param_id +* value: u32 value +* wsp: (#0x20 | #0x9 | #0xA)+ +* +* eg.: +* "read 0" -> read SLPC_PARAM_TASK_ENABLE_GTPERF +* "write 7 500" -> set SLPC_PARAM_GLOBAL_MIN_GT_SLICE_FREQ_MHZ to 500MHz
+ * "revert 7" -> revertSLPC_PARAM_GLOBAL_MIN_GT_SLICE_FREQ_MHZto
+ * default value.
+ */drivers/gpu/drm/i915/intel_slpc.c +4
-0+static int slpc_param_ctl_parse (char *buf,size_t len,char **op, + u32 *id, u32 *value) +{ +#define MAX_WORDS 3
Quoted 8 lines
Quoted 5 lines
+ int
n_words;
+ char *words[MAX_WORDS];
+ssize_tret;
+
+n_words=buffer_tokenize(buf, words, MAX_WORDS);Ha! finally found the purpose of the patch 001
Please try to keep them closer.
ok. will bring that closer. Thinking was to keep all drm/i915/slpc patches together.
Quoted 12 lines
Quoted 11 lines
+ if (!(n_words == 3) && !(n_words == 2)) {
+DRM_DEBUG_DRIVER("tokenize failed, a command is %d words\n", + MAX_WORDS);
+ return-EINVAL;
+ }
+
+ if (strcmp(words[0], read_token)&&strcmp(words[0], write_token)&&
+strcmp(words[0], revert_token)) {
+DRM_DEBUG_DRIVER("unknown operation\n");
Quoted 1 line
Please add operation word into message for easier debug
It is there. :) Did you mean "unknown operation word" ?
Quoted 7 lines
Quoted 5 lines
+ return
-EINVAL;
+ }
+
+ *op = words[0];Hmm, this will cause yet another strcmp - try to convert into OP code.
Ok. will update.
Quoted 15 lines
drivers/gpu/drm/i915/intel_slpc.c void intel_slpc_disable(struct intel_slpc *slpc) · line 763
Quoted 13 lines
drivers/gpu/drm/i915/intel_slpc.c +12
-0+ + ret = kstrtou32(words[1], 0, id); + if (ret) + return ret; + + if (n_words == 3) { + ret = kstrtou32(words[2], 0, value); + if (ret) + return ret; + } + + return 0;Shouldn't we return n_words-1 to easier catch any missing params?
Yes. Will add this.
Quoted 27 lines
Quoted 27 lines
drivers/gpu/drm/i915/intel_slpc.c +3
-0+} + +static ssize_t slpc_param_ctl_write(struct file *file, const char
__user*ubuf,
+size_tlen,loff_t*offp)drivers/gpu/drm/i915/intel_slpc.c +21
-0+{ + struct seq_file *m = file->private_data; + struct drm_i915_private *dev_priv = m->private; + struct intel_slpc *slpc = &dev_priv->guc.slpc; + char *tmpbuf, *op = NULL; + u32 id, value; + int ret; + + if (len == 0) + return 0; + + if (len > 40) { + DRM_DEBUG_DRIVER("expected <40 chars into slpc_param_ctl\n"); + return -E2BIG; + } + + tmpbuf = kmalloc(len + 1, GFP_KERNEL); + if (!tmpbuf) + return -ENOMEM; + + if (copy_from_user(tmpbuf, ubuf, len)) {
Quoted 8 lines
Quoted 6 lines
+ ret =
-EFAULT;
+ goto out;
+ }
+ tmpbuf[len] = '\0';
+
+ ret =slpc_param_ctl_parse(tmpbuf, len, &op, &id, &value);'ret' is not checked for errors
Will check now with above return fixed.
Quoted 57 lines
Quoted 57 lines
drivers/gpu/drm/i915/intel_slpc.c +50
-0+ + if (id >= SLPC_MAX_PARAM) { + ret = -EINVAL; + goto out; + } + + if (!strcmp(op, read_token)) { + intel_slpc_get_param(slpc, id, + &slpc->debug_param_override, + &slpc->debug_param_value); + slpc->debug_param_id = id; + } else if (!strcmp(op, write_token) || !strcmp(op, revert_token)) { + if ((id >= SLPC_PARAM_TASK_ENABLE_GTPERF) && + (id <= SLPC_PARAM_TASK_DISABLE_DCC)) { + DRM_DEBUG_DRIVER("Tasks are not controlled by " + "this interface\n"); + ret = -EINVAL; + goto out; + } + + /* + * After updating parameters, RESET event has to be sent to GuC + * SLPC for ensuring parameters take effect. + */ + intel_runtime_pm_get(dev_priv); + if (!strcmp(op, write_token)) + intel_slpc_set_param(slpc, id, value); + else if (!strcmp(op, revert_token)) + intel_slpc_unset_param(slpc, id); + intel_slpc_enable(slpc); + intel_runtime_pm_put(dev_priv); + } + +out: + kfree(tmpbuf); + if (ret < 0) + return ret; + + *offp += len; + return len; +} + +const struct file_operations i915_slpc_param_ctl_fops = { + .owner = THIS_MODULE, + .open = slpc_param_ctl_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, + .write = slpc_param_ctl_write +};drivers/gpu/drm/i915/intel_slpc.h +0
-0@@ -32,6 +32,10 @@ struct intel_slpc { /* i915 cached SLPC frequency limits */
Quoted 8 lines
drivers/gpu/drm/i915/intel_slpc.h struct intel_slpc { · line 38
Quoted 6 lines
drivers/gpu/drm/i915/intel_slpc.h +4
-0u32 min_unslice_freq; u32 max_unslice_freq; + + u32 debug_param_id; + u32 debug_param_value; + u32 debug_param_override;Group above under 'debug' sub-struct
Sure.
Quoted 11 lines
drivers/gpu/drm/i915/intel_slpc.h struct slpc_param { · line 261
Quoted 11 lines
drivers/gpu/drm/i915/intel_slpc.h +2
-0};static inline int intel_slpc_enabled (void )@@ -251,6 +255,8 @@ struct slpc_param { #define SLPC_PARAM_TASK_DISABLED 2 #define SLPC_PARAM_TASK_UNKNOWN 3 +extern const struct file_operations i915_slpc_param_ctl_fops; + /* intel_slpc.c */ void intel_slpc_set_param(struct intel_slpc *slpc, u32 id, u32 value); void intel_slpc_unset_param(struct intel_slpc *slpc, u32 id);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 25/31 drm/i915/slpc: Add enable/disable controls for SLPC tasks
In reply to Sagar Arun KambleFrom: Tom O'Rourke <Tom.O'[email protected]>
Adds debugfs hooks for enabling/disabling each SLPC task.
The enable/disable debugfs files are i915_slpc_gtperf, i915_slpc_balancer, and i915_slpc_dcc.
Each of these can take the values:
"default", "enabled", or "disabled"
v1: update for SLPC v2015.2.4
dfps and turbo merged and renamed "gtperf"
ibc split out and renamed "balancer"
Avoid magic numbers (Jon Bloomfield)
v2-v3: Rebase.
v5: Moved slpc_enable_disable_set and slpc_enable_disable_get to
intel_slpc.c. s/slpc_enable_disable_get/intel_slpc_task_status and s/slpc_enable_disable_set/intel_slpc_task_control. Prepared separate functions to update the task status only in the SLPC shared memory. Passing dev_priv as parameter.
v6: Rebase. s/slpc_param_show|write/slpc_task_param_show|write.
Moved functions to intel_slpc.c. RPM Get/Put added before setting parameters and sending RESET event explicitly. (Sagar)
--- drivers/gpu/drm/i915/i915_debugfs.c | 3 + drivers/gpu/drm/i915/intel_slpc.c | 184 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 3 + 3 files changed, 190 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +3 -0
@@ -4942,6 +4942,9 @@ static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file)const struct file_operations *fops; } i915_debugfs_files[] = { {"i915_wedged", &i915_wedged_fops}, + {"i915_slpc_gtperf", &i915_slpc_gtperf_fops}, + {"i915_slpc_balancer", &i915_slpc_balancer_fops}, + {"i915_slpc_dcc", &i915_slpc_dcc_fops}, {"i915_max_freq", &i915_max_freq_fops}, {"i915_min_freq", &i915_min_freq_fops}, {"i915_cache_sharing", &i915_cache_sharing_fops},
drivers/gpu/drm/i915/intel_slpc.c +184 -0
187 lines not on this page · raw message
drivers/gpu/drm/i915/intel_slpc.h +3 -0
@@ -256,6 +256,9 @@ struct slpc_param {#define SLPC_PARAM_TASK_UNKNOWN 3extern const struct file_operations i915_slpc_param_ctl_fops; +extern const struct file_operations i915_slpc_gtperf_fops; +extern const struct file_operations i915_slpc_balancer_fops; +extern const struct file_operations i915_slpc_dcc_fops;/* intel_slpc.c */ void intel_slpc_set_param (struct intel_slpc *slpc,u32 id,u32 value);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 26/31 drm/i915/slpc: Add i915_slpc_info to debugfs
In reply to Sagar Arun KambleFrom: Tom O'Rourke <Tom.O'[email protected]>
i915_slpc_info shows the contents of SLPC shared data parsed into text format.
v1: Reformat slpc info (Radek)
squashed query task state info
in slpc info, kunmap before seq_print (Paulo) return void instead of ignored return value (Paulo) Avoid magic numbers and use local variables (Jon Bloomfield) Removed WARN_ON for checking msb of gtt address of shared gem obj. (ChrisW)
Moved definition of power plan and power source to earlier patch in the series.
drm/i915/slpc: Allocate/Release/Initialize SLPC shared data (Akash)
v2-v3: Rebase.
v4: Updated with GuC firmware v9.
v5: Updated host2guc_slpc_query_task_state with struct slpc_input_event
structure. Removed unnecessary checks of vma from i915_slpc_info. Created helpers for reading the SLPC shared data and string form of SLPC state. (Sagar)
--- drivers/gpu/drm/i915/i915_debugfs.c | 165 ++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +165 -0
@@ -1023,6 +1023,170 @@ static int i915_error_state_open(struct inode *inode, struct file *file)NULL , i915_next_seqno_set, "0x%llx\n"); +static int i915_slpc_info (struct seq_file *m,void *unused) +{ +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +int i, value; +struct slpc_shared_data data; +enum slpc_global_state global_state; +enum slpc_platform_sku platform_sku; +struct slpc_task_state_data *task_data; +enum slpc_power_plan power_plan; +enum slpc_power_source power_source; + +if (!dev_priv->guc.slpc.active) +return -ENODEV ; + +intel_runtime_pm_get (dev_priv); +mutex_lock (&dev_priv->pm.pcu_lock); + +intel_slpc_read_shared_data (&dev_priv->guc.slpc, &data); + +mutex_unlock (&dev_priv->pm.pcu_lock); +intel_runtime_pm_put (dev_priv); + +seq_printf (m,"shared data size: %d\n" , data.shared_data_size); + + global_state = (enum slpc_global_state ) data.global_state; +seq_printf (m,"global state: %d (" , global_state); +seq_printf (m,"%s)\n" ,intel_slpc_get_state_str (global_state)); + + platform_sku = (enum slpc_platform_sku ) + data.platform_info.platform_sku; +seq_printf (m,"sku: %d (" , platform_sku); +switch (platform_sku) { +case SLPC_PLATFORM_SKU_UNDEFINED : +seq_puts (m,"undefined)\n" ); +break ; +case SLPC_PLATFORM_SKU_ULX : +seq_puts (m,"ULX)\n" ); +break ; +case SLPC_PLATFORM_SKU_ULT : +seq_puts (m,"ULT)\n" ); +break ; +case SLPC_PLATFORM_SKU_T : +seq_puts (m,"T)\n" ); +break ; +case SLPC_PLATFORM_SKU_MOBL : +seq_puts (m,"Mobile)\n" ); +break ; +case SLPC_PLATFORM_SKU_DT : +seq_puts (m,"DT)\n" ); +break ; +case SLPC_PLATFORM_SKU_UNKNOWN : +default : +seq_puts (m,"unknown)\n" ); +break ; + } +seq_printf (m,"slice count: %d\n" , + data.platform_info.slice_count); + +seq_printf (m,"power plan/source: 0x%x\n\tplan:\t" , + data.platform_info.power_plan_source); + power_plan = (enum slpc_power_plan )SLPC_POWER_PLAN ( + data.platform_info.power_plan_source); + power_source = (enum slpc_power_source )SLPC_POWER_SOURCE ( + data.platform_info.power_plan_source); +switch (power_plan) { +case SLPC_POWER_PLAN_UNDEFINED : +seq_puts (m,"undefined" ); +break ; +case SLPC_POWER_PLAN_BATTERY_SAVER : +seq_puts (m,"battery saver" ); +break ; +case SLPC_POWER_PLAN_BALANCED : +seq_puts (m,"balanced" ); +break ; +case SLPC_POWER_PLAN_PERFORMANCE : +seq_puts (m,"performance" ); +break ; +case SLPC_POWER_PLAN_UNKNOWN : +default : +seq_puts (m,"unknown" ); +break ; + } +seq_puts (m,"\n\tsource:\t" ); +switch (power_source) { +case SLPC_POWER_SOURCE_UNDEFINED : +seq_puts (m,"undefined\n" ); +break ; +case SLPC_POWER_SOURCE_AC : +seq_puts (m,"AC\n" ); +break ; +case SLPC_POWER_SOURCE_DC : +seq_puts (m,"DC\n" ); +break ; +case SLPC_POWER_SOURCE_UNKNOWN : +default : +seq_puts (m,"unknown\n" ); +break ; + } + +seq_printf (m,"IA frequency (MHz):\n\tP0: %d\n\tP1: %d\n\tPe: %d\n\tPn: %d\n" , + data.platform_info.P0_freq *50 , + data.platform_info.P1_freq *50 , + data.platform_info.Pe_freq *50 , + data.platform_info.Pn_freq *50 ); + + task_data = &data.task_state_data; +seq_printf (m,"task state data: 0x%08x 0x%08x\n" , + task_data->bitfield1, task_data->bitfield2); + +seq_printf (m,"\tgtperf task active: %s\n" , +yesno (task_data->gtperf_task_active)); +seq_printf (m,"\tgtperf stall possible: %s\n" , +yesno (task_data->gtperf_stall_possible)); +seq_printf (m,"\tgtperf gaming mode: %s\n" , +yesno (task_data->gtperf_gaming_mode)); +seq_printf (m,"\tgtperf target fps: %d\n" , + task_data->gtperf_target_fps); + +seq_printf (m,"\tdcc task active: %s\n" , +yesno (task_data->dcc_task_active)); +seq_printf (m,"\tin dcc: %s\n" , +yesno (task_data->in_dcc)); +seq_printf (m,"\tin dct: %s\n" , +yesno (task_data->in_dct)); +seq_printf (m,"\tfreq switch active: %s\n" , +yesno (task_data->freq_switch_active)); + +seq_printf (m,"\tibc enabled: %s\n" , +yesno (task_data->ibc_enabled)); +seq_printf (m,"\tibc active: %s\n" , +yesno (task_data->ibc_active)); +seq_printf (m,"\tpg1 enabled: %s\n" , +yesno (task_data->pg1_enabled)); +seq_printf (m,"\tpg1 active: %s\n" , +yesno (task_data->pg1_active)); + +seq_printf (m,"\tunslice max freq: %dMHz\n" , +intel_gpu_freq (dev_priv, + task_data->max_unslice_freq *GEN9_FREQ_SCALER )); +seq_printf (m,"\tunslice min freq: %dMHz\n" , +intel_gpu_freq (dev_priv, + task_data->min_unslice_freq *GEN9_FREQ_SCALER )); +seq_printf (m,"\tslice max freq: %dMHz\n" , +intel_gpu_freq (dev_priv, + task_data->max_slice_freq *GEN9_FREQ_SCALER )); +seq_printf (m,"\tslice min freq: %dMHz\n" , +intel_gpu_freq (dev_priv, + task_data->min_slice_freq *GEN9_FREQ_SCALER )); + +seq_puts (m,"override parameter bitfield\n" ); +for (i =0 ; i <SLPC_OVERRIDE_BITFIELD_SIZE ; i++) +seq_printf (m,"%d: 0x%08x\n" , i, + data.override_parameters_set_bits[i]); + +seq_puts (m,"override parameters (only non-zero shown)\n" ); +for (i =0 ; i <SLPC_MAX_OVERRIDE_PARAMETERS ; i++) { + value = data.override_parameters_values[i]; +if (value) +seq_printf (m,"%d: 0x%8x\n" , i, value); + } + +return 0 ; +} +static int i915_frequency_info (struct seq_file *m,void *unused) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);
@@ -4899,6 +5063,7 @@ static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file) {"i915_guc_stage_pool", i915_guc_stage_pool, 0}, {"i915_huc_load_status", i915_huc_load_status_info, 0}, {"i915_slpc_paramlist", i915_slpc_paramlist_info, 0}, + {"i915_slpc_info", i915_slpc_info, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_hangcheck_info", i915_hangcheck_info, 0}, {"i915_reset_info", i915_reset_info, 0},
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 26/31] drm/i915/slpc: Add i915_slpc_info to debugfs
Quoted 86 lines · Sagar Arun Kamble
From: Tom O'Rourke <Tom.O'[email protected]>
i915_slpc_infoshows the contents of SLPC shared data parsed into text format.v1: Reformat slpc info (Radek)
squashed query task state info
in slpc info, kunmap beforeseq_print(Paulo) return void instead of ignored return value (Paulo) Avoid magic numbers and use local variables (Jon Bloomfield) RemovedWARN_ONfor checking msb of gtt address of shared gem obj. (ChrisW)
Moved definition of power plan and power source to earlier patch in the series.
drm/i915/slpc: Allocate/Release/Initialize SLPC shared data (Akash)v2-v3: Rebase.
v4: Updated with GuC firmware v9.
v5: Updated
host2guc_slpc_query_task_statewith structslpc_input_event
structure. Removed unnecessary checks of vma fromi915_slpc_info. Created helpers for reading the SLPC shared data and string form of SLPC state. (Sagar)Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 165 ++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+)drivers/gpu/drm/i915/i915_debugfs.c +45
-0@@ -1023,6 +1023,170 @@ static int i915_error_state_open(struct inode *inode, struct file *file)NULL , i915_next_seqno_set, "0x%llx\n"); +static int i915_slpc_info (struct seq_file *m,void *unused) +{ +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +int i, value; +struct slpc_shared_data data; +enum slpc_global_state global_state; +enum slpc_platform_sku platform_sku; +struct slpc_task_state_data *task_data; +enum slpc_power_plan power_plan; +enum slpc_power_source power_source; + +if (!dev_priv->guc.slpc.active) +return -ENODEV ; + +intel_runtime_pm_get (dev_priv); +mutex_lock (&dev_priv->pm.pcu_lock); + +intel_slpc_read_shared_data (&dev_priv->guc.slpc, &data); + +mutex_unlock (&dev_priv->pm.pcu_lock); +intel_runtime_pm_put (dev_priv); + +seq_printf (m,"shared data size: %d\n" , data.shared_data_size); + + global_state = (enum slpc_global_state ) data.global_state; +seq_printf (m,"global state: %d (" , global_state); +seq_printf (m,"%s)\n" ,intel_slpc_get_state_str (global_state)); + + platform_sku = (enum slpc_platform_sku ) + data.platform_info.platform_sku; +seq_printf (m,"sku: %d (" , platform_sku); +switch (platform_sku) { +case SLPC_PLATFORM_SKU_UNDEFINED : +seq_puts (m,"undefined)\n" ); +break ; +case SLPC_PLATFORM_SKU_ULX : +seq_puts (m,"ULX)\n" ); +break ; +case SLPC_PLATFORM_SKU_ULT : +seq_puts (m,"ULT)\n" ); +break ; +case SLPC_PLATFORM_SKU_T : +seq_puts (m,"T)\n" ); +break ; +case SLPC_PLATFORM_SKU_MOBL :
drivers/gpu/drm/i915/i915_debugfs.c static int i915_error_state_open(struct inode · line 1080
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +10
-0+seq_puts (m,"Mobile)\n" ); +break ; +case SLPC_PLATFORM_SKU_DT : +seq_puts (m,"DT)\n" ); +break ; +case SLPC_PLATFORM_SKU_UNKNOWN : +default : +seq_puts (m,"unknown)\n" ); +break ; + }
Define platform_to_string() followed by single seq_puts()
Quoted 17 lines
drivers/gpu/drm/i915/i915_debugfs.c +17
-0+seq_printf (m,"slice count: %d\n" , + data.platform_info.slice_count); + +seq_printf (m,"power plan/source: 0x%x\n\tplan:\t" , + data.platform_info.power_plan_source); + power_plan = (enum slpc_power_plan )SLPC_POWER_PLAN ( + data.platform_info.power_plan_source); + power_source = (enum slpc_power_source )SLPC_POWER_SOURCE ( + data.platform_info.power_plan_source); +switch (power_plan) { +case SLPC_POWER_PLAN_UNDEFINED : +seq_puts (m,"undefined" ); +break ; +case SLPC_POWER_PLAN_BATTERY_SAVER : +seq_puts (m,"battery saver" ); +break ; +case SLPC_POWER_PLAN_BALANCED :
drivers/gpu/drm/i915/i915_debugfs.c static int i915_error_state_open(struct inode *inode, struct file *file) · line 1107
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +10
-0+seq_puts (m,"balanced" ); +break ; +case SLPC_POWER_PLAN_PERFORMANCE : +seq_puts (m,"performance" ); +break ; +case SLPC_POWER_PLAN_UNKNOWN : +default : +seq_puts (m,"unknown" ); +break ; + }
Define power_plan_to_string() followed by single seq_puts()
Quoted 94 lines
drivers/gpu/drm/i915/i915_debugfs.c +82
-0+seq_puts (m,"\n\tsource:\t" ); +switch (power_source) { +case SLPC_POWER_SOURCE_UNDEFINED : +seq_puts (m,"undefined\n" ); +break ; +case SLPC_POWER_SOURCE_AC : +seq_puts (m,"AC\n" ); +break ; +case SLPC_POWER_SOURCE_DC : +seq_puts (m,"DC\n" ); +break ; +case SLPC_POWER_SOURCE_UNKNOWN : +default : +seq_puts (m,"unknown\n" ); +break ; + } + + seq_printf(m, "IA frequency (MHz):\n\tP0: %d\n\tP1: %d\n\tPe: %d\n\tPn: %d\n", + data.platform_info.P0_freq * 50, + data.platform_info.P1_freq *50 , + data.platform_info.Pe_freq *50 , + data.platform_info.Pn_freq *50 ); + + task_data = &data.task_state_data; +seq_printf (m,"task state data: 0x%08x 0x%08x\n" , + task_data->bitfield1, task_data->bitfield2); + +seq_printf (m,"\tgtperf task active: %s\n" , +yesno (task_data->gtperf_task_active)); +seq_printf (m,"\tgtperf stall possible: %s\n" , +yesno (task_data->gtperf_stall_possible)); +seq_printf (m,"\tgtperf gaming mode: %s\n" , +yesno (task_data->gtperf_gaming_mode)); +seq_printf (m,"\tgtperf target fps: %d\n" , + task_data->gtperf_target_fps); + +seq_printf (m,"\tdcc task active: %s\n" , +yesno (task_data->dcc_task_active)); +seq_printf (m,"\tin dcc: %s\n" , +yesno (task_data->in_dcc)); +seq_printf (m,"\tin dct: %s\n" , +yesno (task_data->in_dct)); +seq_printf (m,"\tfreq switch active: %s\n" , +yesno (task_data->freq_switch_active)); + +seq_printf (m,"\tibc enabled: %s\n" , +yesno (task_data->ibc_enabled)); +seq_printf (m,"\tibc active: %s\n" , +yesno (task_data->ibc_active)); +seq_printf (m,"\tpg1 enabled: %s\n" , +yesno (task_data->pg1_enabled)); +seq_printf (m,"\tpg1 active: %s\n" , +yesno (task_data->pg1_active)); + +seq_printf (m,"\tunslice max freq: %dMHz\n" , +intel_gpu_freq (dev_priv, + task_data->max_unslice_freq *GEN9_FREQ_SCALER )); +seq_printf (m,"\tunslice min freq: %dMHz\n" , +intel_gpu_freq (dev_priv, + task_data->min_unslice_freq *GEN9_FREQ_SCALER )); +seq_printf (m,"\tslice max freq: %dMHz\n" , +intel_gpu_freq (dev_priv, + task_data->max_slice_freq *GEN9_FREQ_SCALER )); +seq_printf (m,"\tslice min freq: %dMHz\n" , +intel_gpu_freq (dev_priv, + task_data->min_slice_freq *GEN9_FREQ_SCALER )); + +seq_puts (m,"override parameter bitfield\n" ); +for (i =0 ; i <SLPC_OVERRIDE_BITFIELD_SIZE ; i++) +seq_printf (m,"%d: 0x%08x\n" , i, + data.override_parameters_set_bits[i]); + +seq_puts (m,"override parameters (only non-zero shown)\n" ); +for (i =0 ; i <SLPC_MAX_OVERRIDE_PARAMETERS ; i++) { + value = data.override_parameters_values[i]; +if (value) +seq_printf (m,"%d: 0x%8x\n" , i, value); + } + +return 0 ; +} +static int i915_frequency_info (struct seq_file *m,void *unused) {drivers/gpu/drm/i915/i915_debugfs.c +1
-0struct drm_i915_private *dev_priv =node_to_i915 (m->private);@@ -4899,6 +5063,7 @@ static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file) {"i915_guc_stage_pool", i915_guc_stage_pool, 0}, {"i915_huc_load_status", i915_huc_load_status_info, 0}, {"i915_slpc_paramlist", i915_slpc_paramlist_info, 0}, + {"i915_slpc_info", i915_slpc_info, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_hangcheck_info", i915_hangcheck_info, 0},
Quoted 1 line
{"
i915_reset_info",i915_reset_info, 0},
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 26/31] drm/i915/slpc: Add i915_slpc_info to debugfs
Quoted 92 lines · Michal Wajdeczko
Quoted 90 lines · Sagar Arun Kamble
From: Tom O'Rourke <Tom.O'[email protected]>
i915_slpc_infoshows the contents of SLPC shared data parsed into text format.v1: Reformat slpc info (Radek)
squashed query task state info
in slpc info, kunmap beforeseq_print(Paulo) return void instead of ignored return value (Paulo) Avoid magic numbers and use local variables (Jon Bloomfield) RemovedWARN_ONfor checking msb of gtt address of shared gem obj. (ChrisW)
Moved definition of power plan and power source to earlier patch in the series.
drm/i915/slpc: Allocate/Release/Initialize SLPC shared data (Akash)v2-v3: Rebase.
v4: Updated with GuC firmware v9.
v5: Updated
host2guc_slpc_query_task_statewith structslpc_input_eventstructure. Removed unnecessary checks of vma fromi915_slpc_info. Created helpers for reading the SLPC shared data and string form of SLPC state. (Sagar)Signed-off-by Tom O'Rourke <Tom.O'[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 165
++++++++++++++++++++++++++++++++++++1 file changed, 165 insertions(+)drivers/gpu/drm/i915/i915_debugfs.c +49
-0@@ -1023,6 +1023,170 @@ static int i915_error_state_open(struct inode *inode, struct file *file) NULL, i915_next_seqno_set, "0x%llx\n"); +static int i915_slpc_info (struct seq_file *m,void *unused) +{ + struct drm_i915_private *dev_priv = node_to_i915(m->private); + int i, value; + struct slpc_shared_data data; + enum slpc_global_state global_state; + enum slpc_platform_sku platform_sku; + struct slpc_task_state_data *task_data; + enum slpc_power_plan power_plan; + enum slpc_power_source power_source; + + if (!dev_priv->guc.slpc.active) + return -ENODEV; + + intel_runtime_pm_get(dev_priv); + mutex_lock(&dev_priv->pm.pcu_lock); + + intel_slpc_read_shared_data(&dev_priv->guc.slpc, &data); + + mutex_unlock(&dev_priv->pm.pcu_lock); + intel_runtime_pm_put(dev_priv); + + seq_printf(m, "shared data size: %d\n", data.shared_data_size); + + global_state = (enum slpc_global_state) data.global_state; + seq_printf(m, "global state: %d (", global_state); + seq_printf(m, "%s)\n", intel_slpc_get_state_str(global_state)); + + platform_sku = (enum slpc_platform_sku) + data.platform_info.platform_sku; + seq_printf(m, "sku: %d (", platform_sku); + switch (platform_sku) { + case SLPC_PLATFORM_SKU_UNDEFINED: + seq_puts(m, "undefined)\n"); + break; + case SLPC_PLATFORM_SKU_ULX: + seq_puts(m, "ULX)\n"); + break; + case SLPC_PLATFORM_SKU_ULT: + seq_puts(m, "ULT)\n"); + break; + case SLPC_PLATFORM_SKU_T: + seq_puts(m, "T)\n"); + break; + case SLPC_PLATFORM_SKU_MOBL: + seq_puts(m, "Mobile)\n"); + break; + case SLPC_PLATFORM_SKU_DT: + seq_puts(m, "DT)\n");
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c static int i915_error_state_open(struct inode *inode, struct file *file) · line 1080
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +6
-0+ break; + case SLPC_PLATFORM_SKU_UNKNOWN: + default: + seq_puts(m, "unknown)\n"); + break; + }Define
platform_to_string()followed by singleseq_puts()
Sure. Will update.
Quoted 29 lines
Quoted 18 lines
drivers/gpu/drm/i915/i915_debugfs.c +17
-0+ seq_printf(m, "slice count: %d\n", + data.platform_info.slice_count); + + seq_printf(m, "power plan/source: 0x%x\n\tplan:\t", + data.platform_info.power_plan_source); + power_plan = (enum slpc_power_plan) SLPC_POWER_PLAN( + data.platform_info.power_plan_source); + power_source = (enum slpc_power_source) SLPC_POWER_SOURCE( + data.platform_info.power_plan_source); + switch (power_plan) { + case SLPC_POWER_PLAN_UNDEFINED: + seq_puts(m, "undefined"); + break; + case SLPC_POWER_PLAN_BATTERY_SAVER: + seq_puts(m, "battery saver"); + break; + case SLPC_POWER_PLAN_BALANCED:drivers/gpu/drm/i915/i915_debugfs.c static int i915_error_state_open(struct inode *inode, struct file *file) · line 1107
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +10
-0+ seq_puts(m, "balanced"); + break; + case SLPC_POWER_PLAN_PERFORMANCE: + seq_puts(m, "performance"); + break; + case SLPC_POWER_PLAN_UNKNOWN: + default: + seq_puts(m, "unknown"); + break; + }
Quoted 1 line
Define
power_plan_to_string()followed by singleseq_puts()
Sure. Will update.
Quoted 88 lines
Quoted 88 lines
drivers/gpu/drm/i915/i915_debugfs.c +82
-0+ seq_puts(m, "\n\tsource:\t"); + switch (power_source) { + case SLPC_POWER_SOURCE_UNDEFINED: + seq_puts(m, "undefined\n"); + break; + case SLPC_POWER_SOURCE_AC: + seq_puts(m, "AC\n"); + break; + case SLPC_POWER_SOURCE_DC: + seq_puts(m, "DC\n"); + break; + case SLPC_POWER_SOURCE_UNKNOWN: + default: + seq_puts(m, "unknown\n"); + break; + } + + seq_printf(m, "IA frequency (MHz):\n\tP0: %d\n\tP1: %d\n\tPe: %d\n\tPn: %d\n", + data.platform_info.P0_freq * 50, + data.platform_info.P1_freq * 50, + data.platform_info.Pe_freq * 50, + data.platform_info.Pn_freq * 50); + + task_data = &data.task_state_data; + seq_printf(m, "task state data: 0x%08x 0x%08x\n", + task_data->bitfield1, task_data->bitfield2); + + seq_printf(m, "\tgtperf task active: %s\n", + yesno(task_data->gtperf_task_active)); + seq_printf(m, "\tgtperf stall possible: %s\n", + yesno(task_data->gtperf_stall_possible)); + seq_printf(m, "\tgtperf gaming mode: %s\n", + yesno(task_data->gtperf_gaming_mode)); + seq_printf(m, "\tgtperf target fps: %d\n", + task_data->gtperf_target_fps); + + seq_printf(m, "\tdcc task active: %s\n", + yesno(task_data->dcc_task_active)); + seq_printf(m, "\tin dcc: %s\n", + yesno(task_data->in_dcc)); + seq_printf(m, "\tin dct: %s\n", + yesno(task_data->in_dct)); + seq_printf(m, "\tfreq switch active: %s\n", + yesno(task_data->freq_switch_active)); + + seq_printf(m, "\tibc enabled: %s\n", + yesno(task_data->ibc_enabled)); + seq_printf(m, "\tibc active: %s\n", + yesno(task_data->ibc_active)); + seq_printf(m, "\tpg1 enabled: %s\n", + yesno(task_data->pg1_enabled)); + seq_printf(m, "\tpg1 active: %s\n", + yesno(task_data->pg1_active)); + + seq_printf(m, "\tunslice max freq: %dMHz\n", + intel_gpu_freq(dev_priv, + task_data->max_unslice_freq * GEN9_FREQ_SCALER)); + seq_printf(m, "\tunslice min freq: %dMHz\n", + intel_gpu_freq(dev_priv, + task_data->min_unslice_freq * GEN9_FREQ_SCALER)); + seq_printf(m, "\tslice max freq: %dMHz\n", + intel_gpu_freq(dev_priv, + task_data->max_slice_freq * GEN9_FREQ_SCALER)); + seq_printf(m, "\tslice min freq: %dMHz\n", + intel_gpu_freq(dev_priv, + task_data->min_slice_freq * GEN9_FREQ_SCALER)); + + seq_puts(m, "override parameter bitfield\n"); + for (i = 0; i < SLPC_OVERRIDE_BITFIELD_SIZE; i++) + seq_printf(m, "%d: 0x%08x\n", i, + data.override_parameters_set_bits[i]); + + seq_puts(m, "override parameters (only non-zero shown)\n"); + for (i = 0; i < SLPC_MAX_OVERRIDE_PARAMETERS; i++) { + value = data.override_parameters_values[i]; + if (value) + seq_printf(m, "%d: 0x%8x\n", i, value); + } + + return 0; +} + static int i915_frequency_info(struct seq_file *m, void *unused) {struct
drm_i915_private*dev_priv=node_to_i915(m->private);drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -4899,6 +5063,7 @@ static int i915_hpd_storm_ctl_open(struct inode
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0*inode, struct file *file) {"i915_guc_stage_pool", i915_guc_stage_pool, 0}, {"i915_huc_load_status", i915_huc_load_status_info, 0}, {"i915_slpc_paramlist", i915_slpc_paramlist_info, 0}, + {"i915_slpc_info", i915_slpc_info, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_hangcheck_info", i915_hangcheck_info, 0},{"
i915_reset_info",i915_reset_info, 0},
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 27/31 drm/i915/slpc: Add SLPC banner to RPS debugfs interfaces.
In reply to Sagar Arun KambleWhen SLPC is controlling frequency requests, RPS state related to autotuning is no longer valid. Make user aware through banner upfront. Value read from register RPNSWREQ likely has the frequency requested last by GuC SLPC.
v1: Replace HAS_SLPC with intel_slpc_active (Paulo)
Avoid magic numbers (Nick)
Use a function for repeated code (Jon)
v2: Add "SLPC Active" to i915_frequency_info output and
don't update cur_freq as it is driver internal request. (Chris)
v3: Removing sysfs interface gt_req_freq_mhz out of this patch
for proper division of functionality. (Sagar)
v4: idle_freq, boost_freq are also not used with SLPC.
v5: Added SLPC banner to i915_rps_boost_info and keep printing
driver internal values. (Chris)
v6: Commit message update.
--- drivers/gpu/drm/i915/i915_debugfs.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +6 -0
@@ -1195,6 +1195,9 @@ static int i915_frequency_info(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv); +if (intel_slpc_active (&dev_priv->guc.slpc)) +seq_puts (m,"SLPC Active\n" ); +if (IS_GEN5 (dev_priv)) {u16 rgvswctl =I915_READ16 (MEMSWCTL );u16 rgvstat =I915_READ16 (MEMSTAT_ILK );
@@ -2409,6 +2412,9 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)struct intel_rps *rps = &dev_priv->pm.rps;struct drm_file *file; +if (intel_slpc_active (&dev_priv->guc.slpc)) +seq_puts (m,"SLPC Active\n" ); +seq_printf (m,"RPS enabled? %d\n" , rps->enabled);seq_printf (m,"GPU busy? %s [%d requests]\n" ,yesno (dev_priv->gt.awake), dev_priv->gt.active_requests);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 28/31 drm/i915/slpc: Add SKL SLPC Support
In reply to Sagar Arun KambleFrom: Tom O'Rourke <Tom.O'[email protected]>
This patch adds has_slpc to skylake info.
The SLPC interface has changed and could continue to change. Only GuC versions known to be compatible are supported here.
v1: Move slpc_version_check to intel_guc_ucode_init.
fix whitespace (Sagar)
Moved version check to different patch as has_slpc should not be updated based on it. Instead module parameter should be updated based on version check. (Sagar) Added support to skylake_gt3 as well. (Sagar)
--- drivers/gpu/drm/i915/i915_pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -426,6 +426,7 @@ .platform = INTEL_SKYLAKE, \ .has_csr = 1, \ .has_guc = 1, \ + .has_slpc = 1, \ .ddb_size = 896 static const struct intel_device_info intel_skylake_gt1_info __initconst = {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 29/31 drm/i915/slpc: Add Broxton SLPC support
In reply to Sagar Arun KambleFrom: Tom O'Rourke <Tom.O'[email protected]>
Adds has_slpc to broxton info.
v1: Adjusted slpc version check for major version 8.
Added message if version mismatch happens for easier debug. (Sagar)
v2-v3: Rebase.
v4: Commit message update.
v5: Rebase. Updated check in sanitize_slpc_option.
--- drivers/gpu/drm/i915/i915_pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -484,6 +484,7 @@static const struct intel_device_info intel_broxton_info__initconst = {GEN9_LP_FEATURES , + .has_slpc =1 , .platform =INTEL_BROXTON , .ddb_size =512 , };
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 30/31 drm/i915/slpc: Add Kabylake SLPC support
In reply to Sagar Arun KambleAdds has_slpc to kabylake info.
--- drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/intel_slpc.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -502,6 +502,7 @@ .platform = INTEL_KABYLAKE, \ .has_csr = 1, \ .has_guc = 1, \ + .has_slpc = 1, \ .has_ipc =1 , \ .ddb_size = 896
drivers/gpu/drm/i915/intel_slpc.c +2 -2
@@ -71,9 +71,9 @@ static unsigned int slpc_get_platform_sku(struct drm_i915_private *dev_priv) {enum slpc_platform_sku platform_sku; -if (IS_SKL_ULX (dev_priv)) +if (IS_SKL_ULX (dev_priv) ||IS_KBL_ULX (dev_priv)) platform_sku =SLPC_PLATFORM_SKU_ULX ; -else if (IS_SKL_ULT (dev_priv)) +else if (IS_SKL_ULT (dev_priv) ||IS_KBL_ULT (dev_priv)) platform_sku =SLPC_PLATFORM_SKU_ULT ;else platform_sku =SLPC_PLATFORM_SKU_DT ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 31/31 drm/i915/slpc: Add Geminilake SLPC support
In reply to Sagar Arun KambleAdds has_slpc to geminilake info.
--- drivers/gpu/drm/i915/i915_pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -491,6 +491,7 @@static const struct intel_device_info intel_geminilake_info__initconst = {GEN9_LP_FEATURES , + .has_slpc =1 , .platform =INTEL_GEMINILAKE , .ddb_size =1024 , .color = { .degamma_lut_size =0 , .gamma_lut_size =1024 }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx