Add support for GuC-based SLPC
Subsystems (2)
v3 cover Add support for GuC-based SLPC
From: Tom O'Rourke <Tom.O'[email protected]>
SLPC (Single Loop Power Controller) is a replacement for some host-based power management features. The SLPC implemenation runs in firmware on GuC.
This series has been tested with SKL guc firmware version 6.1 and BXT guc version 5.1.
The graphics power management features in SLPC in those versions are called GTPERF, BALANCER, and DCC.
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; this includes an adaptive boost turbo method.
BALANCER adjusts balance between power budgets for IA and GT in power limited scenarios. BALANCER is only active when all display pipes are in "game" mode.
DCC (Duty Cycle Control) adjusts requested graphics frequency and stalls guc-scheduler to maintain actual graphics frequency in efficient range.
The v2 series was a followup to the request for comments "[Intel-gfx] [RFC 00/22] Add support for GuC-based SLPC"
https://lists.freedesktop.org/archives/intel-gfx/2016-January/085830.html
The v2 series can be found in the archive at "[Intel-gfx] [PATCH v2 00/26] Add support for GuC-based SLPC"
https://lists.freedesktop.org/archives/intel-gfx/2016-March/089259.html
Thank you to Paulo for his valuable review of the RFC series. Thank you also to Ville, Daniel, Jesse, and Martin for their helpful comments.
We (Tom and Sagar) have attempted to incorporate these suggestions in this series. We also adapted to a new SLPC interface version that reflects an internal reorganization within the firmware. The biggest change refactored the tasks. The DFPS and Turbo tasks were merged into the GTPERF task. The IBC (Intelligent Bias Control) feature that had been grouped with Turbo was split out into the BALANCER task.
The requested frequency can be fixed by setting min and max to the same value. As before, the actual frequency is controlled by the punit.
In addition to the debugfs files to enable/disable each task, there is a module parameter to completely disable SLPC. By default, SLPC will be disabled by module parameter. Benchmarks showing power/performance results are expected before enabling SLPC by default.
We anticipate DFPS and BALANCER will not be effective on Linux systems due to difficulty determining frame rate with a compositor and display not in "game" mode. GTPERF (Turbo) and DCC should be effective.
This v3 series is sent primarily to re-run CI tests now that SKL guc v6.1 has been published and the CI machines have been updated. The series has also been rebased on the latest drm-intel-nightly and there were minor updates to 3 patches (3/25, 4/25, 8/25).
Patches 22/25 to 25/25 are included for convenience in testing this series and are not intended to be merged at this time. SLPC requires guc submission and should be disabled if guc submission is not enabled.
VIZ-6773, VIZ-6889
Dave Gordon (1):
DO NOT MERGE: drm/i915: Enable GuC submission, where supported
Peter Antoine (1):
DO NOT MERGE: drm/i915: resize the GuC WOPCM for rc6
Sagar Arun Kamble (3):
drm/i915/slpc: Add Display mode event related data structures drm/i915/slpc: Notification of Display mode change drm/i915/slpc: Notification of Refresh Rate change
Tom O'Rourke (20):
drm/i915/slpc: Expose guc functions for use with SLPC drm/i915/slpc: Add has_slpc capability flag drm/i915/slpc: Add slpc_version_check drm/i915/slpc: Add enable_slpc module parameter drm/i915/slpc: Use intel_slpc_* functions if supported drm/i915/slpc: Enable SLPC in guc if supported drm/i915/slpc: If using SLPC, do not set frequency drm/i915/slpc: Allocate/Release/Initialize SLPC shared data drm/i915/slpc: Setup rps frequency values during SLPC init drm/i915/slpc: Update current requested frequency drm/i915/slpc: Send reset event
drm/i915/slpc: Send shutdown event
drm/i915/slpc: Add slpc_status enum values drm/i915/slpc: Add parameter unset/set/get functions drm/i915/slpc: Add slpc support for max/min freq drm/i915/slpc: Add enable/disable debugfs for slpc drm/i915/slpc: Add broxton support
drm/i915/slpc: Add i915_slpc_info to debugfs
DO NOT MERGE: drm/i915/bxt: Add Broxton to guc loader DO NOT MERGE: drm/i915: Enable SLPC, where supported
drivers/gpu/drm/i915/Makefile | 5 +- drivers/gpu/drm/i915/i915_debugfs.c | 456 +++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_drv.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_guc_reg.h | 3 +- drivers/gpu/drm/i915/i915_guc_submission.c | 6 +- drivers/gpu/drm/i915/i915_params.c | 10 +- drivers/gpu/drm/i915/i915_params.h | 1 + drivers/gpu/drm/i915/i915_sysfs.c | 20 ++ drivers/gpu/drm/i915/intel_display.c | 2 + drivers/gpu/drm/i915/intel_dp.c | 2 + drivers/gpu/drm/i915/intel_drv.h | 12 + drivers/gpu/drm/i915/intel_guc.h | 13 + drivers/gpu/drm/i915/intel_guc_loader.c | 49 ++- drivers/gpu/drm/i915/intel_pm.c | 41 ++- drivers/gpu/drm/i915/intel_slpc.c | 484 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 209 +++++++++++++ 17 files changed, 1298 insertions(+), 19 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 v3 1/25 drm/i915/slpc: Expose guc functions for use with SLPC
From: Tom O'Rourke <Tom.O'[email protected]>
Expose host2guc_action for use by SLPC in intel_slpc.c.
Expose functions to allocate and release objects used by GuC to be used for SLPC shared memory object.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 6 +++--- drivers/gpu/drm/i915/intel_guc.h | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +3 -3
@@ -75,7 +75,7 @@ static inline bool host2guc_action_response(struct drm_i915_private *dev_priv,return GUC2HOST_IS_RESPONSE (val); } -static int host2guc_action (struct intel_guc *guc,u32 *data,u32 len) +int host2guc_action (struct intel_guc *guc,u32 *data,u32 len) {struct drm_i915_private *dev_priv =guc_to_i915 (guc);u32 status;
@@ -610,7 +610,7 @@ int i915_guc_submit(struct i915_guc_client *client,* * Return: A drm_i915_gem_object if successful, otherwise NULL. */ -static struct drm_i915_gem_object *gem_allocate_guc_obj (struct drm_device *dev, +struct drm_i915_gem_object *gem_allocate_guc_obj (struct drm_device *dev,u32 size) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -641,7 +641,7 @@ static struct drm_i915_gem_object *gem_allocate_guc_obj(struct drm_device *dev,* gem_release_guc_obj() - Release gem object allocated for GuC usage * @obj: gem obj to be released */ -static void gem_release_guc_obj (struct drm_i915_gem_object *obj) +void gem_release_guc_obj (struct drm_i915_gem_object *obj) {if (!obj)return ;
drivers/gpu/drm/i915/intel_guc.h +4 -0
@@ -119,10 +119,14 @@ extern int intel_guc_suspend(struct drm_device *dev);extern int intel_guc_resume (struct drm_device *dev);/* i915_guc_submission.c */ +int host2guc_action (struct intel_guc *guc,u32 *data,u32 len);int i915_guc_submission_init (struct drm_device *dev);int i915_guc_submission_enable (struct drm_device *dev);int i915_guc_submit (struct i915_guc_client *client,struct drm_i915_gem_request *rq); +struct drm_i915_gem_object *gem_allocate_guc_obj (struct drm_device *dev, +u32 size); +void gem_release_guc_obj (struct drm_i915_gem_object *obj);void i915_guc_submission_disable (struct drm_device *dev);void i915_guc_submission_fini (struct drm_device *dev);int i915_guc_wq_check_space (struct i915_guc_client *client);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/25 drm/i915/slpc: Add has_slpc capability flag
In reply to [email protected]From: 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.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -725,6 +725,7 @@ struct intel_csr { func(is_kabylake) sep \ func(is_preliminary) sep \ func(has_fbc) sep \ + func(has_slpc) sep \ func(has_pipe_cxsr) sep \ func(has_hotplug) sep \ func(cursor_needs_physical) sep \
@@ -2677,6 +2678,7 @@ struct drm_i915_cmd_table {#define HAS_GUC_UCODE (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev))#define HAS_GUC_SCHED (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev)) +#define HAS_SLPC (dev) (INTEL_INFO(dev)->has_slpc)#define HAS_RESOURCE_STREAMER (dev) (IS_HASWELL(dev) || \ INTEL_INFO(dev)->gen >= 8)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/25 drm/i915/slpc: Add slpc_version_check
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
The SLPC interface has changed and could continue to change. Only GuC versions known to be compatible are supported here.
On Skylake, GuC firmware v6 is supported. Other
platforms and versions can be added here later.
This patch also adds has_slpc to skylake info.
v2: Move slpc_version_check to intel_guc_ucode_init
--- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/intel_guc_loader.c | 13 +++++++++++++ 2 files changed, 14 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -334,6 +334,7 @@ static const struct intel_device_info intel_skylake_info = { BDW_FEATURES, .is_skylake = 1, .gen = 9, + .has_slpc = 1, };static const struct intel_device_info intel_skylake_gt3_info = {
drivers/gpu/drm/i915/intel_guc_loader.c +13 -0
@@ -116,6 +116,17 @@ static void direct_interrupts_to_guc(struct drm_i915_private *dev_priv)I915_WRITE (GUC_WD_VECS_IER , ~irqs); } +static void slpc_version_check (struct drm_device *dev,struct intel_guc_fw *guc_fw) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_device_info *info; + +if (IS_SKYLAKE (dev) && (guc_fw->guc_fw_major_found !=6 )) { + info = (struct intel_device_info *) &dev_priv->info; + info->has_slpc =0 ; + } +} +static u32 get_gttype (struct drm_i915_private *dev_priv) {/* XXX: GT type based on PCI device ID? field seems unused by fw */
@@ -666,6 +677,8 @@ void intel_guc_ucode_init(struct drm_device *dev)DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path);guc_fw_fetch (dev, guc_fw);/* status must now be FAIL or SUCCESS */ + +slpc_version_check (dev, guc_fw); }/**
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/25 drm/i915/slpc: Add enable_slpc module parameter
In reply to [email protected]From: 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.
slpc_enable_sanitize() converts i915.enable_slpc to either 0 or 1. Interpretation of default value is based on HAS_SLPC(), after slpc_version_check(). This function also enforces the requirement that guc_submission is required for slpc.
intel_slpc_enabled() returns 1 if SLPC should be used.
v2: Add early call to sanitize enable_slpc in intel_guc_ucode_init
--- drivers/gpu/drm/i915/i915_params.c | 6 ++++++ drivers/gpu/drm/i915/i915_params.h | 1 + drivers/gpu/drm/i915/intel_guc.h | 6 ++++++ drivers/gpu/drm/i915/intel_guc_loader.c | 19 +++++++++++++++++++ 4 files changed, 32 insertions(+)
drivers/gpu/drm/i915/i915_params.c +6 -0
@@ -36,6 +36,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,
@@ -127,6 +128,11 @@ MODULE_PARM_DESC(enable_execlists,"Override execlists usage. " "(-1=auto [default], 0=disabled, 1=enabled)"); +module_param_named_unsafe (enable_slpc, i915.enable_slpc, int,0400 ); +MODULE_PARM_DESC (enable_slpc, +"Override single-loop-power-controller (slpc) usage. " +"(-1=auto, 0=disabled [default], 1=enabled)" ); +module_param_named_unsafe (enable_psr, i915.enable_psr, int,0600 );MODULE_PARM_DESC (enable_psr,"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
@@ -39,6 +39,7 @@ struct i915_params {int enable_fbc;int enable_ppgtt;int enable_execlists; +int enable_slpc;int enable_psr;unsigned int preliminary_hw_support;int disable_power_well;
drivers/gpu/drm/i915/intel_guc.h +6 -0
@@ -110,6 +110,12 @@ struct intel_guc {uint32_t last_seqno[GUC_MAX_ENGINES_NUM ]; }; +static inline int intel_slpc_enabled (void ) +{ +WARN_ON (i915.enable_slpc <0 ); +return i915.enable_slpc; +} +/* intel_guc_loader.c */ extern void intel_guc_ucode_init (struct drm_device *dev);extern int intel_guc_ucode_load (struct drm_device *dev);
drivers/gpu/drm/i915/intel_guc_loader.c +19 -0
@@ -116,6 +116,21 @@ static void direct_interrupts_to_guc(struct drm_i915_private *dev_priv)I915_WRITE (GUC_WD_VECS_IER , ~irqs); } +static void slpc_enable_sanitize (struct drm_device *dev) +{ +/* handle default case */ +if (i915.enable_slpc <0 ) + i915.enable_slpc =HAS_SLPC (dev); + +/* slpc requires hardware support and compatible firmware */ +if (!HAS_SLPC (dev)) + i915.enable_slpc =0 ; + +/* slpc requires guc submission */ +if (!i915.enable_guc_submission) + i915.enable_slpc =0 ; +} +static void slpc_version_check (struct drm_device *dev,struct intel_guc_fw *guc_fw) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -125,6 +140,8 @@ static void slpc_version_check(struct drm_device *dev, struct intel_guc_fw *guc_ info = (struct intel_device_info *) &dev_priv->info; info->has_slpc =0 ; } + +slpc_enable_sanitize (dev); }static u32 get_gttype (struct drm_i915_private *dev_priv)
@@ -656,6 +673,8 @@ void intel_guc_ucode_init(struct drm_device *dev) fw_path ="" ;/* unknown device */ } +slpc_enable_sanitize (dev); +if (!i915.enable_guc_submission)return ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 5/25 drm/i915/slpc: Use intel_slpc_* functions if supported
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
On platforms with SLPC support: call intel_slpc_*() functions from corresponding intel_*_gt_powersave() functions; and do not use rps functions.
v2: 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)
--- drivers/gpu/drm/i915/Makefile | 5 ++-- drivers/gpu/drm/i915/intel_drv.h | 4 +++ drivers/gpu/drm/i915/intel_guc.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 36 ++++++++++++++++++------- drivers/gpu/drm/i915/intel_slpc.c | 56 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 35 ++++++++++++++++++++++++ 6 files changed, 126 insertions(+), 11 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 +3 -2
@@ -41,8 +41,9 @@ i915-y += i915_cmd_parser.o \ intel_uncore.o # general-purpose microcontroller (GuC) support -i915-y += intel_guc_loader.o \ - i915_guc_submission.o +i915-y += i915_guc_submission.o \ + intel_guc_loader.o \ + intel_slpc.o # autogenerated null render state i915-y += intel_renderstate_gen6.o \
drivers/gpu/drm/i915/intel_drv.h +4 -0
@@ -1573,6 +1573,10 @@ void chv_phy_powergate_lanes(struct intel_encoder *encoder,bool chv_phy_powergate_ch (struct drm_i915_private *dev_priv,enum dpio_phy phy,enum dpio_channel ch,bool override); +static inline int intel_slpc_active (struct drm_device *dev) +{ +return 0 ; +}/* intel_pm.c */ void intel_init_clock_gating (struct drm_device *dev);
drivers/gpu/drm/i915/intel_guc.h +1 -0
@@ -26,6 +26,7 @@#include "intel_guc_fwif.h" #include "i915_guc_reg.h" +#include "intel_slpc.h" struct i915_guc_client {struct drm_i915_gem_object *client_obj;
drivers/gpu/drm/i915/intel_pm.c +27 -9
@@ -6192,7 +6192,9 @@ void intel_init_gt_powersave(struct drm_device *dev)intel_runtime_pm_get (dev_priv); } -if (IS_CHERRYVIEW (dev)) +if (intel_slpc_enabled ()) +intel_slpc_init (dev); +else if (IS_CHERRYVIEW (dev))cherryview_init_gt_powersave (dev);else if (IS_VALLEYVIEW (dev))valleyview_init_gt_powersave (dev);
@@ -6202,7 +6204,9 @@ void intel_cleanup_gt_powersave(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -if (IS_CHERRYVIEW (dev)) +if (intel_slpc_active (dev)) +intel_slpc_cleanup (dev); +else if (IS_CHERRYVIEW (dev))return ;else if (IS_VALLEYVIEW (dev))valleyview_cleanup_gt_powersave (dev);
@@ -6235,17 +6239,24 @@ void intel_suspend_gt_powersave(struct drm_device *dev)if (INTEL_INFO (dev)->gen <6 )return ; -gen6_suspend_rps (dev); +if (intel_slpc_active (dev)) { +intel_slpc_suspend (dev); + }else { +gen6_suspend_rps (dev); -/* Force GPU to min freq during suspend */ -gen6_rps_idle (dev_priv); +/* Force GPU to min freq during suspend */ +gen6_rps_idle (dev_priv); + } }void intel_disable_gt_powersave (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -if (IS_IRONLAKE_M (dev)) { +if (intel_slpc_active (dev)) { +intel_slpc_disable (dev); +gen9_disable_rps (dev); + }else if (IS_IRONLAKE_M (dev)) {ironlake_disable_drps (dev); }else if (INTEL_INFO (dev)->gen >=6 ) {intel_suspend_gt_powersave (dev);
@@ -6316,7 +6327,10 @@ void intel_enable_gt_powersave(struct drm_device *dev)if (intel_vgpu_active (dev))return ; -if (IS_IRONLAKE_M (dev)) { +if (intel_slpc_active (dev)) { +gen9_enable_rc6 (dev); +intel_slpc_enable (dev); + }else if (IS_IRONLAKE_M (dev)) {ironlake_enable_drps (dev);mutex_lock (&dev->struct_mutex);intel_init_emon (dev);
@@ -6347,8 +6361,12 @@ void intel_reset_gt_powersave(struct drm_device *dev)if (INTEL_INFO (dev)->gen <6 )return ; -gen6_suspend_rps (dev); - dev_priv->rps.enabled = false; +if (intel_slpc_active (dev)) { +intel_slpc_reset (dev); + }else { +gen6_suspend_rps (dev); + dev_priv->rps.enabled = false; + } }static void ibx_init_clock_gating (struct drm_device *dev)
drivers/gpu/drm/i915/intel_slpc.c new file +56 -0
56 lines not on this page · raw message
drivers/gpu/drm/i915/intel_slpc.h new file +35 -0
@@ -0,0 +1,35 @@ +/* +* Copyright © 2015 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. +* +*/ +#ifndef _INTEL_SLPC_H_ +#define _INTEL_SLPC_H_ + +/* intel_slpc.c */ +void intel_slpc_init (struct drm_device *dev); +void intel_slpc_cleanup (struct drm_device *dev); +void intel_slpc_suspend (struct drm_device *dev); +void intel_slpc_disable (struct drm_device *dev); +void intel_slpc_enable (struct drm_device *dev); +void intel_slpc_reset (struct drm_device *dev); + +#endif
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 6/25 drm/i915/slpc: Enable SLPC in guc if supported
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
If slpc enabled, then add enable SLPC flag to guc
control parameter during guc load.
v2: Use intel_slpc_enabled() (Paulo)
--- drivers/gpu/drm/i915/intel_guc_loader.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +3 -0
@@ -187,6 +187,9 @@ static void set_guc_init_params(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 ; +if (i915.guc_log_level >=0 ) { params[GUC_CTL_LOG_PARAMS ] = guc->log_flags; params[GUC_CTL_DEBUG] =
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 7/25 drm/i915/slpc: If using SLPC, do not set frequency
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
When frequency requests are made by SLPC, host driver should not attempt to make frequency requests due to potential conflicts.
Host-based turbo operations are already avoided when SLPC is used. This change covers other frequency requests such as from sysfs or debugfs interfaces.
A later patch in this series updates sysfs/debugfs interfaces for setting max/min frequencies with SLPC.
v2: Use intel_slpc_active instead of HAS_SLPC (Paulo)
--- drivers/gpu/drm/i915/intel_pm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +3 -0
@@ -4567,6 +4567,9 @@ void gen6_rps_boost(struct drm_i915_private *dev_priv,void intel_set_rps (struct drm_device *dev,u8 val) { +if (intel_slpc_active (dev)) +return ; +if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev))valleyview_set_rps (dev, val);else
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 8/25 drm/i915/slpc: Allocate/Release/Initialize SLPC shared data
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
SLPC shared data is used to pass information
to/from SLPC firmware.
For Skylake, platform sku type and slice count
are identified from device id and fuse values.
Support for other platforms needs to be added.
v2: Update for SLPC interface version 2015.2.4
intel_slpc_active() returns 1 if slpc initialized (Paulo)
v3: change default host_os to "Windows"
--- drivers/gpu/drm/i915/intel_drv.h | 9 ++++- drivers/gpu/drm/i915/intel_guc.h | 2 + drivers/gpu/drm/i915/intel_slpc.c | 84 ++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_slpc.h | 75 ++++++++++++++++++++++++++++++++++ 4 files changed, 167 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +8 -1
@@ -1575,9 +1575,16 @@ bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,static inline int intel_slpc_active (struct drm_device *dev) { -return 0 ; +struct drm_i915_private *dev_priv = dev->dev_private; +int ret =0 ; + +if (dev_priv->guc.slpc.shared_data_obj) + ret =1 ; + +return ret; } +/* intel_pm.c */ void intel_init_clock_gating (struct drm_device *dev);void intel_suspend_hw (struct drm_device *dev);
drivers/gpu/drm/i915/intel_guc.h +2 -0
@@ -109,6 +109,8 @@ struct intel_guc {uint64_t submissions[GUC_MAX_ENGINES_NUM ];uint32_t last_seqno[GUC_MAX_ENGINES_NUM ]; + +struct intel_slpc slpc; };static inline int intel_slpc_enabled (void )
drivers/gpu/drm/i915/intel_slpc.c +82 -2
99 lines not on this page · raw message
drivers/gpu/drm/i915/intel_slpc.h +75 -0
81 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 v3 9/25 drm/i915/slpc: Setup rps frequency values during SLPC init
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
v2: Add mutex lock/unlock
--- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/i915/intel_slpc.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1595,6 +1595,7 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv);void intel_pm_setup (struct drm_device *dev);void intel_gpu_ips_init (struct drm_i915_private *dev_priv);void intel_gpu_ips_teardown (void ); +void gen6_init_rps_frequencies (struct drm_device *dev);void intel_init_gt_powersave (struct drm_device *dev);void intel_cleanup_gt_powersave (struct drm_device *dev);void intel_enable_gt_powersave (struct drm_device *dev);
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -4716,7 +4716,7 @@ int intel_enable_rc6(const struct drm_device *dev)return i915.enable_rc6; } -static void gen6_init_rps_frequencies (struct drm_device *dev) +void gen6_init_rps_frequencies (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;uint32_t rp_state_cap;
drivers/gpu/drm/i915/intel_slpc.c +5 -0
@@ -92,6 +92,11 @@ void intel_slpc_init(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;struct drm_i915_gem_object *obj; +/* Initialize the rps frequecny values */ +mutex_lock (&dev_priv->rps.hw_lock); +gen6_init_rps_frequencies (dev); +mutex_unlock (&dev_priv->rps.hw_lock); +/* Allocate shared data structure */ obj = dev_priv->guc.slpc.shared_data_obj;if (!obj) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 10/25 drm/i915/slpc: Update current requested frequency
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
When SLPC is controlling requested frequency, the rps.cur_freq value is not used to make the frequency request.
Before using rps.cur_freq in sysfs or debugfs, read requested frequency from register to get the value most recently requested by SLPC firmware.
v2: replace HAS_SLPC with intel_slpc_active (Paulo)
--- drivers/gpu/drm/i915/i915_debugfs.c | 6 ++++++ drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +6 -0
@@ -1135,6 +1135,9 @@ static int i915_frequency_info(struct seq_file *m, void *unused)flush_delayed_work (&dev_priv->rps.delayed_resume_work); +if (intel_slpc_active (dev)) + dev_priv->rps.cur_freq = (I915_READ (GEN6_RPNSWREQ ) >>23 ); +if (IS_GEN5 (dev)) {u16 rgvswctl =I915_READ16 (MEMSWCTL );u16 rgvstat =I915_READ16 (MEMSTAT_ILK );
@@ -2360,6 +2363,9 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)struct drm_i915_private *dev_priv = dev->dev_private;struct drm_file *file; +if (intel_slpc_active (dev)) + dev_priv->rps.cur_freq = (I915_READ (GEN6_RPNSWREQ ) >>23 ); +seq_printf (m,"RPS enabled? %d\n" , dev_priv->rps.enabled);seq_printf (m,"GPU busy? %d\n" , dev_priv->mm.busy);seq_printf (m,"CPU waiting? %d\n" ,count_irq_waiters (dev_priv));
drivers/gpu/drm/i915/i915_sysfs.c +2 -0
@@ -318,6 +318,8 @@ static ssize_t gt_cur_freq_mhz_show(struct device *kdev,intel_runtime_pm_get (dev_priv);mutex_lock (&dev_priv->rps.hw_lock); +if (intel_slpc_active (dev)) + dev_priv->rps.cur_freq = (I915_READ (GEN6_RPNSWREQ ) >>23 ); ret =intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq);mutex_unlock (&dev_priv->rps.hw_lock);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 11/25 drm/i915/slpc: Send reset event
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
Add host2guc SLPC reset event and send reset event during enable.
v2: extract host2guc_slpc to handle slpc status code
coding style changes (Paulo)
--- drivers/gpu/drm/i915/intel_slpc.c | 33 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_slpc.h | 14 ++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_slpc.c +32 -1
@@ -26,6 +26,36 @@#include "i915_drv.h" #include "intel_guc.h" +static void host2guc_slpc (struct drm_i915_private *dev_priv,u32 *data,u32 len) +{ +int ret =host2guc_action (&dev_priv->guc, data, len); + +if (!ret) { + ret =I915_READ (SOFT_SCRATCH (1 )); + ret &=SLPC_EVENT_STATUS_MASK ; + } + +if (ret) +DRM_ERROR ("event 0x%x status %d\n" , (data[1 ] >>8 ), ret); +} + +static void host2guc_slpc_reset (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_i915_gem_object *obj = dev_priv->guc.slpc.shared_data_obj; +u32 data[4 ]; +u64 shared_data_gtt_offset =i915_gem_obj_ggtt_offset (obj); + + data[0 ] =HOST2GUC_ACTION_SLPC_REQUEST ; + data[1 ] =SLPC_EVENT (SLPC_EVENT_RESET ,2 ); + data[2 ] =lower_32_bits (shared_data_gtt_offset); + data[3 ] =upper_32_bits (shared_data_gtt_offset); + +WARN_ON (data[3 ] !=0 ); + +host2guc_slpc (dev_priv, data,4 ); +} +static u8 slpc_get_platform_sku (struct drm_i915_gem_object *obj) {struct drm_device *dev = obj->base.dev;
@@ -132,7 +162,8 @@ void intel_slpc_disable(struct drm_device *dev)void intel_slpc_enable (struct drm_device *dev) { -return ; +if (intel_slpc_active (dev)) +host2guc_slpc_reset (dev); }void intel_slpc_reset (struct drm_device *dev)
drivers/gpu/drm/i915/intel_slpc.h +14 -0
@@ -28,6 +28,20 @@#define SLPC_MINOR_VER 4#define SLPC_VERSION ((2015 << 16) | (SLPC_MAJOR_VER << 8) | (SLPC_MINOR_VER)) +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 , +}; + +#define SLPC_EVENT (id, argc) ((u32) (id) << 8 | (argc)) +#define SLPC_EVENT_STATUS_MASK 0xFF +enum slpc_global_state {SLPC_GLOBAL_STATE_NOT_RUNNING =0 ,SLPC_GLOBAL_STATE_INITIALIZING =1 ,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 12/25 drm/i915/slpc: Send shutdown event
In reply to [email protected]From: 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.
v2: return void instead of ignored error code (Paulo)
--- drivers/gpu/drm/i915/intel_slpc.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_slpc.c +25 -3
@@ -56,6 +56,23 @@ static void host2guc_slpc_reset(struct drm_device *dev)host2guc_slpc (dev_priv, data,4 ); } +static void host2guc_slpc_shutdown (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_i915_gem_object *obj = dev_priv->guc.slpc.shared_data_obj; +u32 data[4 ]; +u64 shared_data_gtt_offset =i915_gem_obj_ggtt_offset (obj); + + data[0 ] =HOST2GUC_ACTION_SLPC_REQUEST ; + data[1 ] =SLPC_EVENT (SLPC_EVENT_SHUTDOWN ,2 ); + data[2 ] =lower_32_bits (shared_data_gtt_offset); + data[3 ] =upper_32_bits (shared_data_gtt_offset); + +WARN_ON (0 != data[3 ]); + +host2guc_slpc (dev_priv, data,4 ); +} +static u8 slpc_get_platform_sku (struct drm_i915_gem_object *obj) {struct drm_device *dev = obj->base.dev;
@@ -152,12 +169,14 @@ void intel_slpc_cleanup(struct drm_device *dev)void intel_slpc_suspend (struct drm_device *dev) { -return ; +if (intel_slpc_active (dev)) +host2guc_slpc_shutdown (dev); }void intel_slpc_disable (struct drm_device *dev) { -return ; +if (intel_slpc_active (dev)) +host2guc_slpc_shutdown (dev); }void intel_slpc_enable (struct drm_device *dev)
@@ -168,5 +187,8 @@ void intel_slpc_enable(struct drm_device *dev)void intel_slpc_reset (struct drm_device *dev) { -return ; +if (intel_slpc_active (dev)) { +host2guc_slpc_shutdown (dev); +host2guc_slpc_reset (dev); + } }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 13/25 drm/i915/slpc: Add Display mode event related data structures
In reply to [email protected]From: Sagar Arun Kamble <[email protected]>
v2: Cleaning up defines for number of pipes and other cosmetic changes.
--- drivers/gpu/drm/i915/intel_slpc.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/gpu/drm/i915/intel_slpc.h +29 -0
@@ -109,8 +109,37 @@ struct slpc_shared_data {u32 override_parameters_values[SLPC_MAX_OVERRIDE_PARAMETERS ]; } __packed; +#define SLPC_MAX_NUM_OF_PIPES 4 + +struct intel_display_pipe_info { +union { +u32 data; +struct { +u32 is_widi:1 ; +u32 refresh_rate:7 ; +u32 vsync_ft_usec:24 ; + }; + }; +} __packed; + +struct intel_slpc_display_mode_event_params { +struct { +struct intel_display_pipe_info per_pipe_info[SLPC_MAX_NUM_OF_PIPES ]; +union { +u32 global_data; +struct { +u32 active_pipes_bitmask:SLPC_MAX_NUM_OF_PIPES ; +u32 fullscreen_pipes:SLPC_MAX_NUM_OF_PIPES ; +u32 vbi_sync_on_pipes:SLPC_MAX_NUM_OF_PIPES ; +u32 num_active_pipes:2 ; + }; + }; + }; +} __packed; +struct intel_slpc {struct drm_i915_gem_object *shared_data_obj; +struct intel_slpc_display_mode_event_params display_mode_params; };/* intel_slpc.c */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 14/25 drm/i915/slpc: Notification of Display mode change
In reply to [email protected]From: Sagar Arun Kamble <[email protected]>
GuC SLPC need to be sent data related to Active pipes, refresh rates, widi pipes, fullscreen pipes related via host to GuC display mode change event. Based on this, SLPC will track FPS on active pipes. This patch defines the event and implements trigger of the event.
v2: Addressed review comments from Paulo and Ville. Changed the way display mode information is collected in intel_atomic_commit. Coupled display mode change event with SLPC enable/reset event. Updated inactive crtc state in display mode data. Updated refresh rate and vsync_ft_usec calculations to get more accurate value. (Paulo) v2(torourke): Updates suggested by Paulo: replace HAS_SLPC with intel_slpc_active. return void instead of ignored error code.
--- drivers/gpu/drm/i915/intel_display.c | 2 + drivers/gpu/drm/i915/intel_slpc.c | 142 ++++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_slpc.h | 3 + 3 files changed, 146 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +2 -0
@@ -13639,6 +13639,8 @@ static int intel_atomic_commit(struct drm_device *dev,if (hw_check)intel_modeset_check_state (dev, state); +intel_slpc_update_atomic_commit_info (dev, state); +drm_atomic_state_free (state);/* As one of the primary mmio accessors, KMS has a high likelihood
drivers/gpu/drm/i915/intel_slpc.c +141 -1
158 lines not on this page · raw message
drivers/gpu/drm/i915/intel_slpc.h +3 -0
@@ -149,5 +149,8 @@ void intel_slpc_suspend(struct drm_device *dev);void intel_slpc_disable (struct drm_device *dev);void intel_slpc_enable (struct drm_device *dev);void intel_slpc_reset (struct drm_device *dev); +void intel_slpc_update_display_mode_info (struct drm_device *dev); +void intel_slpc_update_atomic_commit_info (struct drm_device *dev, +struct drm_atomic_state *state);#endif
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 15/25 drm/i915/slpc: Notification of Refresh Rate change
In reply to [email protected]From: Sagar Arun Kamble <[email protected]>
This patch will inform GuC SLPC about changes in the refresh rate due to Seamless DRRS. Refresh rate changes due to Static DRRS will be notified via commit path.
v2: Rebased on previous changed patch and printed error message if H2G action fails.
v2(torourke): Updates suggested by Paulo: replace HAS_SLPC with intel_slpc_active. return void instead of ignored error code.
--- drivers/gpu/drm/i915/intel_dp.c | 2 ++ drivers/gpu/drm/i915/intel_slpc.c | 23 +++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 1 + 3 files changed, 26 insertions(+)
drivers/gpu/drm/i915/intel_dp.c +2 -0
@@ -5433,6 +5433,8 @@ static void intel_dp_set_drrs_state(struct drm_device *dev, int refresh_rate) dev_priv->drrs.refresh_rate_type = index;DRM_DEBUG_KMS ("eDP Refresh Rate set to : %dHz\n" , refresh_rate); + +intel_slpc_update_display_rr_info (dev, refresh_rate); }/**
drivers/gpu/drm/i915/intel_slpc.c +23 -0
@@ -332,3 +332,26 @@ void intel_slpc_update_atomic_commit_info(struct drm_device *dev,host2guc_slpc_display_mode_change (dev); } } + +void intel_slpc_update_display_rr_info (struct drm_device *dev,u32 refresh_rate) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_crtc *crtc; +struct intel_display_pipe_info *per_pipe_info; +struct intel_slpc_display_mode_event_params *display_params; + +if (!intel_slpc_active (dev)) +return ; + +if (!refresh_rate) +return ; + + display_params = &dev_priv->guc.slpc.display_mode_params; + crtc =dp_to_dig_port (dev_priv->drrs.dp)->base.base.crtc; + + per_pipe_info = &display_params->per_pipe_info[to_intel_crtc (crtc)->pipe]; + per_pipe_info->refresh_rate = refresh_rate; + per_pipe_info->vsync_ft_usec =1000000 / refresh_rate; + +host2guc_slpc_display_mode_change (dev); +}
drivers/gpu/drm/i915/intel_slpc.h +1 -0
@@ -152,5 +152,6 @@ void intel_slpc_reset(struct drm_device *dev);void intel_slpc_update_display_mode_info (struct drm_device *dev);void intel_slpc_update_atomic_commit_info (struct drm_device *dev,struct drm_atomic_state *state); +void intel_slpc_update_display_rr_info (struct drm_device *dev,u32 refresh_rate);#endif
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 16/25 drm/i915/slpc: Add slpc_status enum values
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
--- drivers/gpu/drm/i915/intel_slpc.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/gpu/drm/i915/intel_slpc.h +27 -0
@@ -28,6 +28,33 @@#define SLPC_MINOR_VER 4#define SLPC_VERSION ((2015 << 16) | (SLPC_MAJOR_VER << 8) | (SLPC_MINOR_VER)) +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_MISMATCHING_VERSION =16 , +SLPC_STATUS_MEMIO_ERROR =17 , +SLPC_STATUS_EVENT_QUEUED_REQ_DPC =18 , +SLPC_STATUS_EVENT_QUEUED_NOREQ_DPC =19 , +SLPC_STATUS_NO_EVENT_QUEUED =20 , +SLPC_STATUS_OUT_OF_SPACE =21 , +SLPC_STATUS_TIMEOUT =22 , +SLPC_STATUS_NO_LOCK =23 , +}; +enum slpc_event_id {SLPC_EVENT_RESET =0 ,SLPC_EVENT_SHUTDOWN =1 ,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 17/25 drm/i915/slpc: Add parameter unset/set/get functions
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
Add slpc_param_id enum values.
Add events for setting/unsetting parameters.
v2: use host2guc_slpc
update slcp_param_id enum values for SLPC 2015.2.4 return void instead of ignored error code (Paulo)
--- drivers/gpu/drm/i915/intel_slpc.c | 104 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 26 +++++++++- 2 files changed, 129 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_slpc.c +104 -0
@@ -88,6 +88,33 @@ static void host2guc_slpc_display_mode_change(struct drm_device *dev)host2guc_slpc (dev_priv, data,7 ); } +static void host2guc_slpc_set_param (struct drm_device *dev, +enum slpc_param_id id,u32 value) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +u32 data[4 ]; + + data[0 ] =HOST2GUC_ACTION_SLPC_REQUEST ; + data[1 ] =SLPC_EVENT (SLPC_EVENT_PARAMETER_SET ,2 ); + data[2 ] = (u32 ) id; + data[3 ] = value; + +host2guc_slpc (dev_priv, data,4 ); +} + +static void host2guc_slpc_unset_param (struct drm_device *dev, +enum slpc_param_id id) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +u32 data[3 ]; + + data[0 ] =HOST2GUC_ACTION_SLPC_REQUEST ; + data[1 ] =SLPC_EVENT (SLPC_EVENT_PARAMETER_UNSET ,1 ); + data[2 ] = (u32 ) id; + +host2guc_slpc (dev_priv, data,3 ); +} +static u8 slpc_get_platform_sku (struct drm_i915_gem_object *obj) {struct drm_device *dev = obj->base.dev;
@@ -355,3 +382,80 @@ void intel_slpc_update_display_rr_info(struct drm_device *dev, u32 refresh_rate)host2guc_slpc_display_mode_change (dev); } + +void intel_slpc_unset_param (struct drm_device *dev,enum slpc_param_id id) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_i915_gem_object *obj; +struct page *page; +struct slpc_shared_data *data =NULL ; + + obj = dev_priv->guc.slpc.shared_data_obj; +if (obj) { + page =i915_gem_object_get_page (obj,0 ); +if (page) + data =kmap_atomic (page); + } + +if (data) { + data->override_parameters_set_bits[id >>5 ] + &= (~(1 << (id %32 ))); + data->override_parameters_values[id] =0 ; +kunmap_atomic (data); + +host2guc_slpc_unset_param (dev, id); + } +} + +void intel_slpc_set_param (struct drm_device *dev,enum slpc_param_id id, +u32 value) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_i915_gem_object *obj; +struct page *page; +struct slpc_shared_data *data =NULL ; + + obj = dev_priv->guc.slpc.shared_data_obj; +if (obj) { + page =i915_gem_object_get_page (obj,0 ); +if (page) + data =kmap_atomic (page); + } + +if (data) { + data->override_parameters_set_bits[id >>5 ] + |= (1 << (id %32 )); + data->override_parameters_values[id] = value; +kunmap_atomic (data); + +host2guc_slpc_set_param (dev, id, value); + } +} + +void intel_slpc_get_param (struct drm_device *dev,enum slpc_param_id id, +int *overriding,u32 *value) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_i915_gem_object *obj; +struct page *page; +struct slpc_shared_data *data =NULL ; +u32 bits; + + obj = dev_priv->guc.slpc.shared_data_obj; +if (obj) { + page =i915_gem_object_get_page (obj,0 ); +if (page) + data =kmap_atomic (page); + } + +if (data) { +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); + } +}
drivers/gpu/drm/i915/intel_slpc.h +25 -1
@@ -69,6 +69,26 @@ enum slpc_event_id {#define SLPC_EVENT (id, argc) ((u32) (id) << 8 | (argc))#define SLPC_EVENT_STATUS_MASK 0xFF +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_DFPS_THRESHOLD_MAX_FPS =10 , +SLPC_PARAM_GLOBAL_DISABLE_GT_FREQ_MANAGEMENT =11 , +SLPC_PARAM_DFPS_DISABLE_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_DISABE_IA_GT_BALANCING =16 , +}; +enum slpc_global_state {SLPC_GLOBAL_STATE_NOT_RUNNING =0 ,SLPC_GLOBAL_STATE_INITIALIZING =1 ,
@@ -180,5 +200,9 @@ void intel_slpc_update_display_mode_info(struct drm_device *dev);void intel_slpc_update_atomic_commit_info (struct drm_device *dev,struct drm_atomic_state *state);void intel_slpc_update_display_rr_info (struct drm_device *dev,u32 refresh_rate); - +void intel_slpc_unset_param (struct drm_device *dev,enum slpc_param_id id); +void intel_slpc_set_param (struct drm_device *dev,enum slpc_param_id id, +u32 value); +void intel_slpc_get_param (struct drm_device *dev,enum slpc_param_id id, +int *overriding,u32 *value);#endif
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 18/25 drm/i915/slpc: Add slpc support for max/min freq
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
Update sysfs and debugfs functions to set SLPC
parameters when setting max/min frequency.
v2: Update for SLPC 2015.2.4 (params for both slice and unslice)
Replace HAS_SLPC with intel_slpc_active() (Paulo)
--- drivers/gpu/drm/i915/i915_debugfs.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/i915_sysfs.c | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +16 -0
@@ -4970,6 +4970,14 @@ i915_max_freq_set(void *data, u64 val) } dev_priv->rps.max_freq_softlimit = val; +if (intel_slpc_active (dev)) { +intel_slpc_set_param (dev, +SLPC_PARAM_GLOBAL_MAX_GT_UNSLICE_FREQ_MHZ , + (u32 )intel_gpu_freq (dev_priv, val)); +intel_slpc_set_param (dev, +SLPC_PARAM_GLOBAL_MAX_GT_SLICE_FREQ_MHZ , + (u32 )intel_gpu_freq (dev_priv, val)); + }intel_set_rps (dev, val);
@@ -5037,6 +5045,14 @@ i915_min_freq_set(void *data, u64 val) } dev_priv->rps.min_freq_softlimit = val; +if (intel_slpc_active (dev)) { +intel_slpc_set_param (dev, +SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ , + (u32 )intel_gpu_freq (dev_priv, val)); +intel_slpc_set_param (dev, +SLPC_PARAM_GLOBAL_MIN_GT_SLICE_FREQ_MHZ , + (u32 )intel_gpu_freq (dev_priv, val)); + }intel_set_rps (dev, val);
drivers/gpu/drm/i915/i915_sysfs.c +18 -0
@@ -392,6 +392,15 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev, dev_priv->rps.max_freq_softlimit = val; +if (intel_slpc_active (dev)) { +intel_slpc_set_param (dev, +SLPC_PARAM_GLOBAL_MAX_GT_UNSLICE_FREQ_MHZ , + (u32 )intel_gpu_freq (dev_priv, val)); +intel_slpc_set_param (dev, +SLPC_PARAM_GLOBAL_MAX_GT_SLICE_FREQ_MHZ , + (u32 )intel_gpu_freq (dev_priv, val)); + } + val =clamp_t (int, dev_priv->rps.cur_freq, dev_priv->rps.min_freq_softlimit, dev_priv->rps.max_freq_softlimit);
@@ -456,6 +465,15 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev, dev_priv->rps.min_freq_softlimit = val; +if (intel_slpc_active (dev)) { +intel_slpc_set_param (dev, +SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ , + (u32 )intel_gpu_freq (dev_priv, val)); +intel_slpc_set_param (dev, +SLPC_PARAM_GLOBAL_MIN_GT_SLICE_FREQ_MHZ , + (u32 )intel_gpu_freq (dev_priv, val)); + } + val =clamp_t (int, dev_priv->rps.cur_freq, dev_priv->rps.min_freq_softlimit, dev_priv->rps.max_freq_softlimit);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 18/25] drm/i915/slpc: Add slpc support for max/min freq
Quoted 7 lines · On 06/04/16 22:24, [email protected] wrote:
From: Tom O'Rourke <Tom.O'[email protected]>
Update sysfs and debugfs functions to set SLPC
parameters when setting max/min frequency.v2: Update for SLPC 2015.2.4 (params for both slice and unslice)
ReplaceHAS_SLPCwithintel_slpc_active()(Paulo)
Thanks for doing this!
Now, I just need to get hold of the PUNIT devs to get them to expose the number of throttling events that happened for both the CPU (linux already exposes something but not sure how reliable it is) and GPU.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 19/25 drm/i915/slpc: Add enable/disable debugfs for slpc
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
Adds debugfs hooks for 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"
v2: update for SLPC v2015.2.4
dfps and turbo merged and renamed "gtperf"
ibc split out and renamed "balancer"
--- drivers/gpu/drm/i915/i915_debugfs.c | 250 ++++++++++++++++++++++++++++++++++++ 1 file changed, 250 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +250 -0
@@ -1124,6 +1124,253 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops, i915_next_seqno_get, i915_next_seqno_set, "0x%llx\n"); +static int slpc_enable_disable_get (struct drm_device *dev,u64 *val, +enum slpc_param_id enable_id, +enum slpc_param_id disable_id) +{ +int override_enable, override_disable; +u32 value_enable, value_disable; +int ret =0 ; + +if (!intel_slpc_active (dev)) { + ret = -ENODEV ; + }else if (val) { +intel_slpc_get_param (dev, enable_id, &override_enable, + &value_enable); +intel_slpc_get_param (dev, disable_id, &override_disable, + &value_disable); + +/* set the output value: +* 0: default +* 1: enabled +* 2: disabled +* 3: unknown (should not happen) +*/ +if (override_disable && (1 == value_disable)) + *val =2 ; +else if (override_enable && (1 == value_enable)) + *val =1 ; +else if (!override_enable && !override_disable) + *val =0 ; +else + *val =3 ; + + }else { + ret = -EINVAL ; + } + +return ret; +} + +static int slpc_enable_disable_set (struct drm_device *dev,u64 val, +enum slpc_param_id enable_id, +enum slpc_param_id disable_id) +{ +int ret =0 ; + +if (!intel_slpc_active (dev)) { + ret = -ENODEV ; + }else if (0 == val) { +/* set default */ +intel_slpc_unset_param (dev, enable_id); +intel_slpc_unset_param (dev, disable_id); + }else if (1 == val) { +/* set enable */ +intel_slpc_set_param (dev, enable_id,1 ); +intel_slpc_unset_param (dev, disable_id); + }else if (2 == val) { +/* set disable */ +intel_slpc_set_param (dev, disable_id,1 ); +intel_slpc_unset_param (dev, enable_id); + }else { + ret = -EINVAL ; + } + +return ret; +} + +static void slpc_param_show (struct seq_file *m,enum slpc_param_id enable_id, +enum slpc_param_id disable_id) +{ +struct drm_device *dev = m->private; +const char *status; +u64 val; +int ret; + + ret =slpc_enable_disable_get (dev, &val, enable_id, disable_id); + +if (ret) { +seq_printf (m,"error %d\n" , ret); + }else { +switch (val) { +case 0 : + status ="default\n" ; +break ; + +case 1 : + status ="enabled\n" ; +break ; + +case 2 : + status ="disabled\n" ; +break ; + +default : + status ="unknown\n" ; +break ; + } + +seq_puts (m, status); + } +} + +static int slpc_param_write (struct seq_file *m,const char __user *ubuf, +size_t len,enum slpc_param_id enable_id, +enum slpc_param_id disable_id) +{ +struct drm_device *dev = m->private; +u64 val; +int ret =0 ; +char buf[10 ]; + +if (len >=sizeof (buf)) + ret = -EINVAL ; +else if (copy_from_user (buf, ubuf, len)) + ret = -EFAULT ; +else + buf[len] ='\0' ; + +if (!ret) { +if (!strncmp (buf,"default" ,7 )) + val =0 ; +else if (!strncmp (buf,"enabled" ,7 )) + val =1 ; +else if (!strncmp (buf,"disabled" ,8 )) + val =2 ; +else + ret = -EINVAL ; + } + +if (!ret) + ret =slpc_enable_disable_set (dev, val, enable_id, disable_id); + +return ret; +} + +static int slpc_gtperf_show (struct seq_file *m,void *data) +{ +slpc_param_show (m,SLPC_PARAM_TASK_ENABLE_GTPERF , +SLPC_PARAM_TASK_DISABLE_GTPERF ); + +return 0 ; +} + +static int slpc_gtperf_open (struct inode *inode,struct file *file) +{ +struct drm_connector *dev = inode->i_private; + +return single_open (file, slpc_gtperf_show, dev); +} + +static ssize_t slpc_gtperf_write (struct file *file,const char __user *ubuf, +size_t len,loff_t *offp) +{ +struct seq_file *m = file->private_data; +int ret =0 ; + + ret =slpc_param_write (m, ubuf, len,SLPC_PARAM_TASK_ENABLE_GTPERF , +SLPC_PARAM_TASK_DISABLE_GTPERF ); +if (ret) +return (size_t ) ret; + +return len; +} + +static const struct file_operations i915_slpc_gtperf_fops = { + .owner =THIS_MODULE , + .open = slpc_gtperf_open, + .release = single_release, + .read = seq_read, + .write = slpc_gtperf_write, + .llseek = seq_lseek +}; + +static int slpc_balancer_show (struct seq_file *m,void *data) +{ +slpc_param_show (m,SLPC_PARAM_TASK_ENABLE_BALANCER , +SLPC_PARAM_TASK_DISABLE_BALANCER ); + +return 0 ; +} + +static int slpc_balancer_open (struct inode *inode,struct file *file) +{ +struct drm_connector *dev = inode->i_private; + +return single_open (file, slpc_balancer_show, dev); +} + +static ssize_t slpc_balancer_write (struct file *file,const char __user *ubuf, +size_t len,loff_t *offp) +{ +struct seq_file *m = file->private_data; +int ret =0 ; + + ret =slpc_param_write (m, ubuf, len,SLPC_PARAM_TASK_ENABLE_BALANCER , +SLPC_PARAM_TASK_DISABLE_BALANCER ); +if (ret) +return (size_t ) ret; + +return len; +} + +static const struct file_operations i915_slpc_balancer_fops = { + .owner =THIS_MODULE , + .open = slpc_balancer_open, + .release = single_release, + .read = seq_read, + .write = slpc_balancer_write, + .llseek = seq_lseek +}; + +static int slpc_dcc_show (struct seq_file *m,void *data) +{ +slpc_param_show (m,SLPC_PARAM_TASK_ENABLE_DCC , +SLPC_PARAM_TASK_DISABLE_DCC ); + +return 0 ; +} + +static int slpc_dcc_open (struct inode *inode,struct file *file) +{ +struct drm_connector *dev = inode->i_private; + +return single_open (file, slpc_dcc_show, dev); +} + +static ssize_t slpc_dcc_write (struct file *file,const char __user *ubuf, +size_t len,loff_t *offp) +{ +struct seq_file *m = file->private_data; +int ret =0 ; + + ret =slpc_param_write (m, ubuf, len,SLPC_PARAM_TASK_ENABLE_DCC , +SLPC_PARAM_TASK_DISABLE_DCC ); +if (ret) +return (size_t ) ret; + +return len; +} + +static const struct file_operations i915_slpc_dcc_fops = { + .owner =THIS_MODULE , + .open = slpc_dcc_open, + .release = single_release, + .read = seq_read, + .write = slpc_dcc_write, + .llseek = seq_lseek +}; +static int i915_frequency_info (struct seq_file *m,void *unused) {struct drm_info_node *node = m->private;
@@ -5431,6 +5678,9 @@ static const struct i915_debugfs_files {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},
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 20/25 drm/i915/slpc: Add broxton support
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
Adds has_slpc to broxton info and adds broxton to version check. The SLPC interface version 2015.2.4 is found in Broxton Guc v5.
--- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/intel_guc_loader.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -354,6 +354,7 @@ static const struct intel_device_info intel_broxton_info = { .has_ddi = 1, .has_fpga_dbg = 1, .has_fbc = 1, + .has_slpc =1 ,GEN_DEFAULT_PIPEOFFSETS ,IVB_CURSOR_OFFSETS , BDW_COLORS,
drivers/gpu/drm/i915/intel_guc_loader.c +2 -1
@@ -136,7 +136,8 @@ static void slpc_version_check(struct drm_device *dev, struct intel_guc_fw *guc_struct drm_i915_private *dev_priv = dev->dev_private;struct intel_device_info *info; -if (IS_SKYLAKE (dev) && (guc_fw->guc_fw_major_found !=6 )) { +if ((IS_SKYLAKE (dev) && (guc_fw->guc_fw_major_found !=6 )) + || (IS_BROXTON (dev) && (guc_fw->guc_fw_major_found !=5 ))) { info = (struct intel_device_info *) &dev_priv->info; info->has_slpc =0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 21/25 drm/i915/slpc: Add i915_slpc_info to debugfs
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
i915_slpc_info shows the contents of SLPC shared data parsed into text format.
v2: 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)
--- drivers/gpu/drm/i915/i915_debugfs.c | 184 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.c | 23 +++++ drivers/gpu/drm/i915/intel_slpc.h | 1 + 3 files changed, 208 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +184 -0
@@ -1371,6 +1371,189 @@ static const struct file_operations i915_slpc_dcc_fops = { .llseek = seq_lseek }; +static int i915_slpc_info (struct seq_file *m,void *unused) +{ +struct drm_info_node *node = m->private; +struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_i915_gem_object *obj; +struct page *page; +void *pv =NULL ; +struct slpc_shared_data data; +int i, value; +enum slpc_global_state global_state; +enum slpc_platform_sku platform_sku; +enum slpc_host_os host_os; +enum slpc_power_plan power_plan; +enum slpc_power_source power_source; + + obj = dev_priv->guc.slpc.shared_data_obj; +if (obj) { +intel_slpc_query_task_state (dev); + + page =i915_gem_object_get_page (obj,0 ); +if (page) + pv =kmap_atomic (page); + } + +if (pv) { + data = *(struct slpc_shared_data *) pv; +kunmap_atomic (pv); + +seq_printf (m,"SLPC Version: %d.%d.%d (0x%8x)\n" , + data.slpc_version >>16 , + (data.slpc_version >>8 ) &0xFF , + data.slpc_version &0xFF , + data.slpc_version); +seq_printf (m,"shared data size: %d\n" , data.shared_data_size); + +seq_printf (m,"global state: %d (" , data.global_state); + global_state = (enum slpc_global_state ) data.global_state; +switch (global_state) { +case SLPC_GLOBAL_STATE_NOT_RUNNING : +seq_puts (m,"not running)\n" ); +break ; +case SLPC_GLOBAL_STATE_INITIALIZING : +seq_puts (m,"initializing)\n" ); +break ; +case SLPC_GLOBAL_STATE_RESETING : +seq_puts (m,"resetting)\n" ); +break ; +case SLPC_GLOBAL_STATE_RUNNING : +seq_puts (m,"running)\n" ); +break ; +case SLPC_GLOBAL_STATE_SHUTTING_DOWN : +seq_puts (m,"shutting down)\n" ); +break ; +case SLPC_GLOBAL_STATE_ERROR : +seq_puts (m,"error)\n" ); +break ; +default : +seq_puts (m,"unknown)\n" ); +break ; + } + +seq_printf (m,"sku: %d (" , data.platform_info.platform_sku); + platform_sku = (enum slpc_platform_sku ) + data.platform_info.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,"host OS: %d (" , data.platform_info.host_os); + host_os = (enum slpc_host_os ) data.platform_info.host_os; +switch (host_os) { +case SLPC_HOST_OS_UNDEFINED : +seq_puts (m,"undefined)\n" ); +break ; +case SLPC_HOST_OS_WINDOWS_8 : +seq_puts (m,"Windows 8)\n" ); +break ; +default : +seq_puts (m,"unknown)\n" ); +break ; + } + +seq_printf (m,"power plan/source: 0x%x\n\tplan:\t" , + data.platform_info.power_plan_source); + power_plan = (enum slpc_power_plan ) + data.platform_info.power_plan_source &0x3F ; + power_source = (enum slpc_power_source ) + data.platform_info.power_plan_source >>6 ; +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 ); +seq_printf (m,"RAPL package power limits:\n\t0x%08x\n\t0x%08x\n" , + data.platform_info.package_rapl_limit_high, + data.platform_info.package_rapl_limit_low); +seq_printf (m,"task state data: 0x%08x\n" , + data.task_state_data); +seq_printf (m,"\tturbo active: %d\n" , + (data.task_state_data &1 )); +seq_printf (m,"\tdfps stall possible: %d\n\tgame mode: %d\n\tdfps target fps: %d\n" , + (data.task_state_data &2 ), + (data.task_state_data &4 ), + (data.task_state_data >>3 ) &0xFF ); + +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); + } + + }else { +seq_puts (m,"no SLPC info available\n" ); + } + +return 0 ; +} +static int i915_frequency_info (struct seq_file *m,void *unused) {struct drm_info_node *node = m->private;
@@ -5636,6 +5819,7 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_guc_info", i915_guc_info, 0}, {"i915_guc_load_status", i915_guc_load_status_info, 0}, {"i915_guc_log_dump", i915_guc_log_dump, 0}, + {"i915_slpc_info", i915_slpc_info, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_hangcheck_info", i915_hangcheck_info, 0}, {"i915_drpc_info", i915_drpc_info, 0},
drivers/gpu/drm/i915/intel_slpc.c +23 -0
@@ -115,6 +115,23 @@ static void host2guc_slpc_unset_param(struct drm_device *dev,host2guc_slpc (dev_priv, data,3 ); } +static void host2guc_slpc_query_task_state (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_i915_gem_object *obj = dev_priv->guc.slpc.shared_data_obj; +u32 data[4 ]; +u64 shared_data_gtt_offset =i915_gem_obj_ggtt_offset (obj); + + data[0 ] =HOST2GUC_ACTION_SLPC_REQUEST ; + data[1 ] =SLPC_EVENT (SLPC_EVENT_QUERY_TASK_STATE ,2 ); + data[2 ] =lower_32_bits (shared_data_gtt_offset); + data[3 ] =upper_32_bits (shared_data_gtt_offset); + +WARN_ON (0 != data[3 ]); + +host2guc_slpc (dev_priv, data,4 ); +} +static u8 slpc_get_platform_sku (struct drm_i915_gem_object *obj) {struct drm_device *dev = obj->base.dev;
@@ -459,3 +476,9 @@ void intel_slpc_get_param(struct drm_device *dev, enum slpc_param_id id,kunmap_atomic (data); } } + +void intel_slpc_query_task_state (struct drm_device *dev) +{ +if (intel_slpc_active (dev)) +host2guc_slpc_query_task_state (dev); +}
drivers/gpu/drm/i915/intel_slpc.h +1 -0
@@ -205,4 +205,5 @@ void intel_slpc_set_param(struct drm_device *dev, enum slpc_param_id id, u32 value);void intel_slpc_get_param (struct drm_device *dev,enum slpc_param_id id,int *overriding,u32 *value); +void intel_slpc_query_task_state (struct drm_device *dev);#endif
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 22/25 DO NOT MERGE: drm/i915/bxt: Add Broxton to guc loader
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
This patch is expected as part of another series
and is included for convenience in testing this
series.
Do not merge unless Broxton guc v5 firmware is available.
--- drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +7 -0
@@ -62,6 +62,9 @@#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6.bin"MODULE_FIRMWARE (I915_SKL_GUC_UCODE ); +#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver5.bin" +MODULE_FIRMWARE (I915_BXT_GUC_UCODE ); +/* User-friendly representation of an enum */ const char *intel_guc_fw_status_repr (enum intel_guc_fw_status status) {
@@ -672,6 +675,10 @@ void intel_guc_ucode_init(struct drm_device *dev) fw_path =I915_SKL_GUC_UCODE ; guc_fw->guc_fw_major_wanted =6 ; guc_fw->guc_fw_minor_wanted =1 ; + }else if (IS_BROXTON (dev)) { + fw_path =I915_BXT_GUC_UCODE ; + guc_fw->guc_fw_major_wanted =5 ; + guc_fw->guc_fw_minor_wanted =0 ; }else { i915.enable_guc_submission = false; fw_path ="" ;/* unknown device */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 23/25 DO NOT MERGE: drm/i915: resize the GuC WOPCM for rc6
In reply to [email protected]From: Peter Antoine <[email protected]>
This patch resizes the GuC WOPCM to so that the GuC and the RC6 memory spaces do not overlap.
DO NOT MERGE: This patch is expected as part of another series and is included for convenience in testing this series.
Issue: https://jira01.devtools.intel.com/browse/VIZ-6638
--- drivers/gpu/drm/i915/i915_guc_reg.h | 3 ++- drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_guc_reg.h +2 -1
@@ -68,7 +68,8 @@#define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)#define GUC_WOPCM_SIZE _MMIO(0xc050) -#define GUC_WOPCM_SIZE_VALUE (0x80 << 12)/* 512KB */ +#define GUC_WOPCM_SIZE_VALUE (0x80 << 12)/* 512KB */ +#define BXT_GUC_WOPCM_SIZE_VALUE (0x70 << 12)/* 448KB */ /* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */ #define GUC_WOPCM_TOP (GUC_WOPCM_SIZE_VALUE)
drivers/gpu/drm/i915/intel_guc_loader.c +5 -1
@@ -343,7 +343,11 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* init WOPCM */ -I915_WRITE (GUC_WOPCM_SIZE ,GUC_WOPCM_SIZE_VALUE ); +if (IS_BROXTON (dev)) +I915_WRITE (GUC_WOPCM_SIZE ,BXT_GUC_WOPCM_SIZE_VALUE ); +else +I915_WRITE (GUC_WOPCM_SIZE ,GUC_WOPCM_SIZE_VALUE ); +I915_WRITE (DMA_GUC_WOPCM_OFFSET ,GUC_WOPCM_OFFSET_VALUE );/* Enable MIA caching. GuC clock gating is disabled. */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 23/25] DO NOT MERGE: drm/i915: resize the GuC WOPCM for rc6
Tom,
Might be worth taking the "Do Not Merge" message out.
Peter.
Quoted 40 lines · On Wed, 6 Apr 2016, [email protected] wrote:
From: Peter Antoine <[email protected]>
This patch resizes the GuC WOPCM to so that the GuC and the RC6 memory spaces do not overlap.
DO NOT MERGE: This patch is expected as part of another series and is included for convenience in testing this series.
Issue: https://jira01.devtools.intel.com/browse/VIZ-6638
Signed-off-by Peter Antoine <[email protected]>Signed-off-by Jeff McGee <[email protected]>---
drivers/gpu/drm/i915/i915_guc_reg.h| 3 ++-drivers/gpu/drm/i915/intel_guc_loader.c| 6 +++++-2 files changed, 7 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_guc_reg.h +2
-1@@ -68,7 +68,8 @@#define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)#define GUC_WOPCM_SIZE _MMIO(0xc050) -#define GUC_WOPCM_SIZE_VALUE (0x80 << 12)/* 512KB */ +#define GUC_WOPCM_SIZE_VALUE (0x80 << 12)/* 512KB */ +#define BXT_GUC_WOPCM_SIZE_VALUE (0x70 << 12)/* 448KB */ /* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */ #define GUC_WOPCM_TOP (GUC_WOPCM_SIZE_VALUE)drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -343,7 +343,11 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer(struct drm_i915_private *dev_priv) · line 353
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +5
-1/* init WOPCM */ -I915_WRITE (GUC_WOPCM_SIZE ,GUC_WOPCM_SIZE_VALUE ); +if (IS_BROXTON (dev)) +I915_WRITE (GUC_WOPCM_SIZE ,BXT_GUC_WOPCM_SIZE_VALUE ); +else +I915_WRITE (GUC_WOPCM_SIZE ,GUC_WOPCM_SIZE_VALUE ); +I915_WRITE (DMA_GUC_WOPCM_OFFSET ,GUC_WOPCM_OFFSET_VALUE );/* Enable MIA caching. GuC clock gating is disabled. */
--
Peter Antoine (Android Graphics Driver Software Engineer)
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 24/25 DO NOT MERGE: drm/i915: Enable GuC submission, where supported
In reply to [email protected]From: Dave Gordon <[email protected]>
DO NOT MERGE: This patch is added for convenience in reviewing SLPC patch series. This patch should be merged as part of a separate series to enable guc submission by default.
v5:
Rebased
--- drivers/gpu/drm/i915/i915_params.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +2 -2
@@ -55,7 +55,7 @@ struct i915_params i915 __read_mostly = { .verbose_state_checks = 1, .nuclear_pageflip = 0, .edp_vswing = 0, - .enable_guc_submission = false, + .enable_guc_submission = true, .guc_log_level = -1, .enable_dp_mst = true, .inject_load_failure = 0,
@@ -204,7 +204,7 @@ MODULE_PARM_DESC(edp_vswing, "2=default swing(400mV))");module_param_named_unsafe (enable_guc_submission, i915.enable_guc_submission, bool,0400 ); -MODULE_PARM_DESC (enable_guc_submission,"Enable GuC submission (default:false)" ); +MODULE_PARM_DESC (enable_guc_submission,"Enable GuC submission (default:true)" );module_param_named (guc_log_level, i915.guc_log_level, int,0400 ); MODULE_PARM_DESC(guc_log_level,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 25/25 DO NOT MERGE: drm/i915: Enable SLPC, where supported
In reply to [email protected]From: Tom O'Rourke <Tom.O'[email protected]>
This patch makes SLPC enabled by default on platforms with hardware/firmware support.
DO NOT MERGE: This patch is added for convenience in reviewing SLPC patch series. This patch should be merged after validation results show benefits of using SLPC.
--- drivers/gpu/drm/i915/i915_params.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +2 -2
@@ -36,7 +36,7 @@ struct i915_params i915 __read_mostly = { .enable_dc = -1, .enable_fbc = -1, .enable_execlists = -1, - .enable_slpc = 0, + .enable_slpc = -1, .enable_hangcheck = true, .enable_ppgtt = -1, .enable_psr = -1,
@@ -131,7 +131,7 @@ MODULE_PARM_DESC(enable_execlists,module_param_named_unsafe (enable_slpc, i915.enable_slpc, int,0400 );MODULE_PARM_DESC (enable_slpc,"Override single-loop-power-controller (slpc) usage. " -"(-1=auto, 0=disabled [default], 1=enabled)" ); +"(-1=auto [default], 0=disabled, 1=enabled)" );module_param_named_unsafe (enable_psr, i915.enable_psr, int,0600 ); MODULE_PARM_DESC(enable_psr, "Enable PSR "
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx