Hi,
This is the second series that prepares i915 to host multitile platforms. It introduces the for_each_gt() macro that loops over the tiles to perform per gt actions.
This patch is a combination of two patches developed originally by Abdiel, who introduced some refactoring during probe, and then Tvrtko has added the necessary tools to start using the various tiles.
The second patch re-organises the sysfs interface to expose the API for each of the GTs. I decided to prioritise this patch over others to unblock Sujaritha for further development.
A third series will still follow this.
Thanks, Andi
Patchwork: https://patchwork.freedesktop.org/series/98741/
Changelog ========= v2 -> v3 - Added Matt and Sujaritha's r-b for patch 1 and 2. - Reworded the commit of patch 2 to underline the fact that the interface is useful also when used manually. v1 -> v2 - fixed a couple of coding style issues in patch 2.
Andi Shyti (1): drm/i915/gt: make a gt sysfs group and move power management files
Tvrtko Ursulin (1): drm/i915: Prepare for multiple GTs
drivers/gpu/drm/i915/Makefile | 4 +- drivers/gpu/drm/i915/gt/intel_gt.c | 141 ++++++- drivers/gpu/drm/i915/gt/intel_gt.h | 14 +- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 9 +- drivers/gpu/drm/i915/gt/intel_gt_types.h | 7 + drivers/gpu/drm/i915/gt/sysfs_gt.c | 126 ++++++ drivers/gpu/drm/i915/gt/sysfs_gt.h | 44 ++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.c | 393 ++++++++++++++++++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.h | 16 + drivers/gpu/drm/i915/i915_driver.c | 29 +- drivers/gpu/drm/i915/i915_drv.h | 8 + drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/i915_sysfs.c | 315 +------------- drivers/gpu/drm/i915/i915_sysfs.h | 3 + drivers/gpu/drm/i915/intel_memory_region.h | 3 + drivers/gpu/drm/i915/intel_uncore.c | 12 +- drivers/gpu/drm/i915/intel_uncore.h | 3 +- .../gpu/drm/i915/selftests/mock_gem_device.c | 5 +- 18 files changed, 785 insertions(+), 348 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt.c create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt.h create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt_pm.c create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt_pm.h
From: Tvrtko Ursulin tvrtko.ursulin@intel.com
On a multi-tile platform, each tile has its own registers + GGTT space, and BAR 0 is extended to cover all of them.
Up to four gts are supported in i915->gt[], with slot zero shadowing the existing i915->gt0 to enable source compatibility with legacy driver paths. A for_each_gt macro is added to iterate over the GTs and will be used by upcoming patches that convert various parts of the driver to be multi-gt aware.
Only the primary/root tile is initialized for now; the other tiles will be detected and plugged in by future patches once the necessary infrastructure is in place to handle them.
Signed-off-by: Abdiel Janulgue abdiel.janulgue@gmail.com Signed-off-by: Daniele Ceraolo Spurio daniele.ceraolospurio@intel.com Signed-off-by: Tvrtko Ursulin tvrtko.ursulin@intel.com Signed-off-by: Matt Roper matthew.d.roper@intel.com Signed-off-by: Andi Shyti andi.shyti@linux.intel.com Cc: Daniele Ceraolo Spurio daniele.ceraolospurio@intel.com Cc: Joonas Lahtinen joonas.lahtinen@linux.intel.com Cc: Matthew Auld matthew.auld@intel.com Reviewed-by: Matt Roper matthew.d.roper@intel.com --- drivers/gpu/drm/i915/gt/intel_gt.c | 139 ++++++++++++++++-- drivers/gpu/drm/i915/gt/intel_gt.h | 14 +- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 9 +- drivers/gpu/drm/i915/gt/intel_gt_types.h | 7 + drivers/gpu/drm/i915/i915_driver.c | 29 ++-- drivers/gpu/drm/i915/i915_drv.h | 6 + drivers/gpu/drm/i915/intel_memory_region.h | 3 + drivers/gpu/drm/i915/intel_uncore.c | 12 +- drivers/gpu/drm/i915/intel_uncore.h | 3 +- .../gpu/drm/i915/selftests/mock_gem_device.c | 5 +- 10 files changed, 185 insertions(+), 42 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index 622cdfed8a8b..17927da9e23e 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -27,7 +27,8 @@ #include "shmem_utils.h" #include "pxp/intel_pxp.h"
-void __intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915) +static void +__intel_gt_init_early(struct intel_gt *gt) { spin_lock_init(>->irq_lock);
@@ -47,19 +48,27 @@ void __intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915) intel_rps_init_early(>->rps); }
+/* Preliminary initialization of Tile 0 */ void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915) { gt->i915 = i915; gt->uncore = &i915->uncore; + + __intel_gt_init_early(gt); }
-int intel_gt_probe_lmem(struct intel_gt *gt) +static int intel_gt_probe_lmem(struct intel_gt *gt) { struct drm_i915_private *i915 = gt->i915; + unsigned int instance = gt->info.id; struct intel_memory_region *mem; int id; int err;
+ id = INTEL_REGION_LMEM + instance; + if (drm_WARN_ON(&i915->drm, id >= INTEL_REGION_STOLEN_SMEM)) + return -ENODEV; + mem = intel_gt_setup_lmem(gt); if (mem == ERR_PTR(-ENODEV)) mem = intel_gt_setup_fake_lmem(gt); @@ -74,9 +83,8 @@ int intel_gt_probe_lmem(struct intel_gt *gt) return err; }
- id = INTEL_REGION_LMEM; - mem->id = id; + mem->instance = instance;
intel_memory_region_set_name(mem, "local%u", mem->instance);
@@ -791,16 +799,21 @@ void intel_gt_driver_release(struct intel_gt *gt) intel_gt_fini_buffer_pool(gt); }
-void intel_gt_driver_late_release(struct intel_gt *gt) +void intel_gt_driver_late_release(struct drm_i915_private *i915) { + struct intel_gt *gt; + unsigned int id; + /* We need to wait for inflight RCU frees to release their grip */ rcu_barrier();
- intel_uc_driver_late_release(>->uc); - intel_gt_fini_requests(gt); - intel_gt_fini_reset(gt); - intel_gt_fini_timelines(gt); - intel_engines_free(gt); + for_each_gt(gt, i915, id) { + intel_uc_driver_late_release(>->uc); + intel_gt_fini_requests(gt); + intel_gt_fini_reset(gt); + intel_gt_fini_timelines(gt); + intel_engines_free(gt); + } }
/** @@ -909,6 +922,112 @@ u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg) return intel_uncore_read_fw(gt->uncore, reg); }
+static int +intel_gt_tile_setup(struct intel_gt *gt, phys_addr_t phys_addr) +{ + struct drm_i915_private *i915 = gt->i915; + unsigned int id = gt->info.id; + int ret; + + if (id) { + struct intel_uncore_mmio_debug *mmio_debug; + struct intel_uncore *uncore; + + /* For multi-tile platforms BAR0 must have at least 16MB per tile */ + if (GEM_WARN_ON(pci_resource_len(to_pci_dev(i915->drm.dev), 0) < + (id + 1) * SZ_16M)) + return -EINVAL; + + uncore = kzalloc(sizeof(*uncore), GFP_KERNEL); + if (!gt->uncore) + return -ENOMEM; + + mmio_debug = kzalloc(sizeof(*mmio_debug), GFP_KERNEL); + if (!mmio_debug) { + kfree(uncore); + return -ENOMEM; + } + + gt->uncore = uncore; + gt->uncore->debug = mmio_debug; + + __intel_gt_init_early(gt); + } + + intel_uncore_init_early(gt->uncore, gt); + + ret = intel_uncore_setup_mmio(gt->uncore, phys_addr); + if (ret) + return ret; + + gt->phys_addr = phys_addr; + + return 0; +} + +static void +intel_gt_tile_cleanup(struct intel_gt *gt) +{ + intel_uncore_cleanup_mmio(gt->uncore); + + if (gt->info.id) { + kfree(gt->uncore); + kfree(gt); + } +} + +int intel_gt_probe_all(struct drm_i915_private *i915) +{ + struct pci_dev *pdev = to_pci_dev(i915->drm.dev); + struct intel_gt *gt = &i915->gt0; + phys_addr_t phys_addr; + unsigned int mmio_bar; + int ret; + + mmio_bar = GRAPHICS_VER(i915) == 2 ? 1 : 0; + phys_addr = pci_resource_start(pdev, mmio_bar); + + /* + * We always have at least one primary GT on any device + * and it has been already initialized early during probe + * in i915_driver_probe() + */ + ret = intel_gt_tile_setup(gt, phys_addr); + if (ret) + return ret; + + i915->gt[0] = gt; + + /* TODO: add more tiles */ + return 0; +} + +int intel_gt_tiles_init(struct drm_i915_private *i915) +{ + struct intel_gt *gt; + unsigned int id; + int ret; + + for_each_gt(gt, i915, id) { + ret = intel_gt_probe_lmem(gt); + if (ret) + return ret; + } + + return 0; +} + +void intel_gt_release_all(struct drm_i915_private *i915) +{ + struct intel_gt *gt; + unsigned int id; + + for_each_gt(gt, i915, id) { + intel_gt_tile_cleanup(gt); + i915->gt[id] = NULL; + } +} + void intel_gt_info_print(const struct intel_gt_info *info, struct drm_printer *p) { diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h index 94e1bac8c0cc..fcd10d88612a 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.h +++ b/drivers/gpu/drm/i915/gt/intel_gt.h @@ -35,9 +35,7 @@ static inline struct intel_gt *huc_to_gt(struct intel_huc *huc) }
void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915); -void __intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915); int intel_gt_assign_ggtt(struct intel_gt *gt); -int intel_gt_probe_lmem(struct intel_gt *gt); int intel_gt_init_mmio(struct intel_gt *gt); int __must_check intel_gt_init_hw(struct intel_gt *gt); int intel_gt_init(struct intel_gt *gt); @@ -47,7 +45,7 @@ void intel_gt_driver_unregister(struct intel_gt *gt); void intel_gt_driver_remove(struct intel_gt *gt); void intel_gt_driver_release(struct intel_gt *gt);
-void intel_gt_driver_late_release(struct intel_gt *gt); +void intel_gt_driver_late_release(struct drm_i915_private *i915);
int intel_gt_wait_for_idle(struct intel_gt *gt, long timeout);
@@ -86,6 +84,16 @@ static inline bool intel_gt_needs_read_steering(struct intel_gt *gt,
u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg);
+int intel_gt_probe_all(struct drm_i915_private *i915); +int intel_gt_tiles_init(struct drm_i915_private *i915); +void intel_gt_release_all(struct drm_i915_private *i915); + +#define for_each_gt(gt__, i915__, id__) \ + for ((id__) = 0; \ + (id__) < I915_MAX_GT; \ + (id__)++) \ + for_each_if(((gt__) = (i915__)->gt[(id__)])) + void intel_gt_info_print(const struct intel_gt_info *info, struct drm_printer *p);
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c index c0fa41e4c803..e66479d33bc3 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c @@ -128,7 +128,14 @@ static const struct intel_wakeref_ops wf_ops = {
void intel_gt_pm_init_early(struct intel_gt *gt) { - intel_wakeref_init(>->wakeref, gt->uncore->rpm, &wf_ops); + /* + * We access the runtime_pm structure via gt->i915 here rather than + * gt->uncore as we do elsewhere in the file because gt->uncore is not + * yet initialized for all tiles at this point in the driver startup. + * runtime_pm is per-device rather than per-tile, so this is still the + * correct structure. + */ + intel_wakeref_init(>->wakeref, >->i915->runtime_pm, &wf_ops); seqcount_mutex_init(>->stats.lock, >->wakeref.mutex); }
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h index 14216cc471b1..7311e485faae 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h @@ -180,7 +180,14 @@ struct intel_gt {
const struct intel_mmio_range *steering_table[NUM_STEERING_TYPES];
+ /* + * Base of per-tile GTTMMADR where we can derive the MMIO and the GGTT. + */ + phys_addr_t phys_addr; + struct intel_gt_info { + unsigned int id; + intel_engine_mask_t engine_mask;
u32 l3bank_mask; diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 8bef67cb6c33..aa00965cd36c 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -316,9 +316,8 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) intel_device_info_subplatform_init(dev_priv); intel_step_init(dev_priv);
- intel_gt_init_early(to_gt(dev_priv), dev_priv); + /* All tiles share a single mmio_debug */ intel_uncore_mmio_debug_init_early(&dev_priv->mmio_debug); - intel_uncore_init_early(&dev_priv->uncore, to_gt(dev_priv));
spin_lock_init(&dev_priv->irq_lock); spin_lock_init(&dev_priv->gpu_error.lock); @@ -349,7 +348,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
intel_wopcm_init_early(&dev_priv->wopcm);
- __intel_gt_init_early(to_gt(dev_priv), dev_priv); + intel_gt_init_early(to_gt(dev_priv), dev_priv);
i915_gem_init_early(dev_priv);
@@ -370,7 +369,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
err_gem: i915_gem_cleanup_early(dev_priv); - intel_gt_driver_late_release(to_gt(dev_priv)); + intel_gt_driver_late_release(dev_priv); intel_region_ttm_device_fini(dev_priv); err_ttm: vlv_suspend_cleanup(dev_priv); @@ -389,7 +388,7 @@ static void i915_driver_late_release(struct drm_i915_private *dev_priv) intel_irq_fini(dev_priv); intel_power_domains_cleanup(dev_priv); i915_gem_cleanup_early(dev_priv); - intel_gt_driver_late_release(to_gt(dev_priv)); + intel_gt_driver_late_release(dev_priv); intel_region_ttm_device_fini(dev_priv); vlv_suspend_cleanup(dev_priv); i915_workqueues_cleanup(dev_priv); @@ -420,13 +419,9 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv) if (ret < 0) return ret;
- ret = intel_uncore_setup_mmio(&dev_priv->uncore); - if (ret < 0) - goto err_bridge; - ret = intel_uncore_init_mmio(&dev_priv->uncore); if (ret) - goto err_mmio; + return ret;
/* Try to make sure MCHBAR is enabled before poking at it */ intel_setup_mchbar(dev_priv); @@ -444,9 +439,6 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv) err_uncore: intel_teardown_mchbar(dev_priv); intel_uncore_fini_mmio(&dev_priv->uncore); -err_mmio: - intel_uncore_cleanup_mmio(&dev_priv->uncore); -err_bridge: pci_dev_put(dev_priv->bridge_dev);
return ret; @@ -460,7 +452,6 @@ static void i915_driver_mmio_release(struct drm_i915_private *dev_priv) { intel_teardown_mchbar(dev_priv); intel_uncore_fini_mmio(&dev_priv->uncore); - intel_uncore_cleanup_mmio(&dev_priv->uncore); pci_dev_put(dev_priv->bridge_dev); }
@@ -593,7 +584,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) if (ret) goto err_ggtt;
- ret = intel_gt_probe_lmem(to_gt(dev_priv)); + ret = intel_gt_tiles_init(dev_priv); if (ret) goto err_mem_regions;
@@ -858,10 +849,14 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
intel_vgpu_detect(i915);
- ret = i915_driver_mmio_probe(i915); + ret = intel_gt_probe_all(i915); if (ret < 0) goto out_runtime_pm_put;
+ ret = i915_driver_mmio_probe(i915); + if (ret < 0) + goto out_tiles_cleanup; + ret = i915_driver_hw_probe(i915); if (ret < 0) goto out_cleanup_mmio; @@ -918,6 +913,8 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) i915_ggtt_driver_late_release(i915); out_cleanup_mmio: i915_driver_mmio_release(i915); +out_tiles_cleanup: + intel_gt_release_all(i915); out_runtime_pm_put: enable_rpm_wakeref_asserts(&i915->runtime_pm); i915_driver_late_release(i915); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 890f1f6fbc49..ec76011366fb 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -983,6 +983,12 @@ struct drm_i915_private { /* Abstract the submission mechanism (legacy ringbuffer or execlists) away */ struct intel_gt gt0;
+ /* + * i915->gt[0] == &i915->gt0 + */ +#define I915_MAX_GT 4 + struct intel_gt *gt[I915_MAX_GT]; + struct { struct i915_gem_contexts { spinlock_t lock; /* locks list */ diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h index 5625c9c38993..6a6324a08e72 100644 --- a/drivers/gpu/drm/i915/intel_memory_region.h +++ b/drivers/gpu/drm/i915/intel_memory_region.h @@ -30,6 +30,9 @@ enum intel_memory_type { enum intel_region_id { INTEL_REGION_SMEM = 0, INTEL_REGION_LMEM, + INTEL_REGION_LMEM1, + INTEL_REGION_LMEM2, + INTEL_REGION_LMEM3, INTEL_REGION_STOLEN_SMEM, INTEL_REGION_STOLEN_LMEM, INTEL_REGION_UNKNOWN, /* Should be last */ diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 41d082213e81..016639c1275d 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -2020,14 +2020,11 @@ static int i915_pmic_bus_access_notifier(struct notifier_block *nb, return NOTIFY_OK; }
-int intel_uncore_setup_mmio(struct intel_uncore *uncore) +int intel_uncore_setup_mmio(struct intel_uncore *uncore, phys_addr_t phys_addr) { struct drm_i915_private *i915 = uncore->i915; - struct pci_dev *pdev = to_pci_dev(i915->drm.dev); - int mmio_bar; int mmio_size;
- mmio_bar = GRAPHICS_VER(i915) == 2 ? 1 : 0; /* * Before gen4, the registers and the GTT are behind different BARs. * However, from gen4 onwards, the registers and the GTT are shared @@ -2044,7 +2041,7 @@ int intel_uncore_setup_mmio(struct intel_uncore *uncore) else mmio_size = 2 * 1024 * 1024;
- uncore->regs = pci_iomap(pdev, mmio_bar, mmio_size); + uncore->regs = ioremap(phys_addr, mmio_size); if (uncore->regs == NULL) { drm_err(&i915->drm, "failed to map registers\n"); return -EIO; @@ -2055,9 +2052,8 @@ int intel_uncore_setup_mmio(struct intel_uncore *uncore)
void intel_uncore_cleanup_mmio(struct intel_uncore *uncore) { - struct pci_dev *pdev = to_pci_dev(uncore->i915->drm.dev); - - pci_iounmap(pdev, uncore->regs); + if (uncore->regs) + iounmap(uncore->regs); }
void intel_uncore_init_early(struct intel_uncore *uncore, diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h index 210fe2a71612..2989032b580b 100644 --- a/drivers/gpu/drm/i915/intel_uncore.h +++ b/drivers/gpu/drm/i915/intel_uncore.h @@ -29,6 +29,7 @@ #include <linux/notifier.h> #include <linux/hrtimer.h> #include <linux/io-64-nonatomic-lo-hi.h> +#include <linux/types.h>
#include "i915_reg.h"
@@ -219,7 +220,7 @@ void intel_uncore_mmio_debug_init_early(struct intel_uncore_mmio_debug *mmio_debug); void intel_uncore_init_early(struct intel_uncore *uncore, struct intel_gt *gt); -int intel_uncore_setup_mmio(struct intel_uncore *uncore); +int intel_uncore_setup_mmio(struct intel_uncore *uncore, phys_addr_t phys_addr); int intel_uncore_init_mmio(struct intel_uncore *uncore); void intel_uncore_prune_engine_fw_domains(struct intel_uncore *uncore, struct intel_gt *gt); diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c index 28a0f054009a..79520f217c90 100644 --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c @@ -73,7 +73,7 @@ static void mock_device_release(struct drm_device *dev) destroy_workqueue(i915->wq);
intel_region_ttm_device_fini(i915); - intel_gt_driver_late_release(to_gt(i915)); + intel_gt_driver_late_release(i915); intel_memory_regions_driver_release(i915);
drm_mode_config_cleanup(&i915->drm); @@ -179,7 +179,6 @@ struct drm_i915_private *mock_gem_device(void)
i915_gem_init__mm(i915); intel_gt_init_early(to_gt(i915), i915); - __intel_gt_init_early(to_gt(i915), i915); mock_uncore_init(&i915->uncore, i915); atomic_inc(&to_gt(i915)->wakeref.count); /* disable; no hw support */ to_gt(i915)->awake = -ENODEV; @@ -227,7 +226,7 @@ struct drm_i915_private *mock_gem_device(void) err_drv: intel_region_ttm_device_fini(i915); err_ttm: - intel_gt_driver_late_release(to_gt(i915)); + intel_gt_driver_late_release(i915); intel_memory_regions_driver_release(i915); drm_mode_config_cleanup(&i915->drm); mock_destroy_device(i915);
The GT has its own properties and in sysfs they should be grouped in the 'gt/' directory.
Create a 'gt/' directory in sysfs which will contain gt0...gtN directories related to each tile configured in the GPU. Move the power management files inside those directories.
The previous power management files are kept in their original root directory to avoid breaking the ABI. They point to the tile '0' and a warning message is printed whenever accessed to. The deprecated interface needs for the CONFIG_SYSFS_DEPRECATED_V2 flag in order to be generated.
The new sysfs structure will have a similar layout for the 4 tile case:
/sys/.../card0 ├── gt │ ├── gt0 │ │ ├── id │ │ ├── rc6_enable │ │ ├── rc6_residency_ms │ │ ├── rps_act_freq_mhz │ │ ├── rps_boost_freq_mhz │ │ ├── rps_cur_freq_mhz │ │ ├── rps_max_freq_mhz │ │ ├── rps_min_freq_mhz │ │ ├── rps_RP0_freq_mhz │ │ ├── rps_RP1_freq_mhz │ │ └── rps_RPn_freq_mhz . . . . . . │ └── gt3 │ ├── id │ ├── rc6_enable │ ├── rc6_residency_ms │ ├── rps_act_freq_mhz │ ├── rps_boost_freq_mhz │ ├── rps_cur_freq_mhz │ ├── rps_max_freq_mhz │ ├── rps_min_freq_mhz │ ├── rps_RP0_freq_mhz │ ├── rps_RP1_freq_mhz │ └── rps_RPn_freq_mhz ├── gt_act_freq_mhz -+ ├── gt_boost_freq_mhz | ├── gt_cur_freq_mhz | Original interface ├── gt_max_freq_mhz +─-> kept as existing ABI; ├── gt_min_freq_mhz | it points to gt0/ ├── gt_RP0_freq_mhz | └── gt_RP1_freq_mhz | └── gt_RPn_freq_mhz -+
As soon as multitile platforms will start being supported, this interface will allow to control the power (either manually or with tools) on each tile, instead of affecting only tile 0 and getting incomplete results.
Signed-off-by: Andi Shyti andi.shyti@linux.intel.com Signed-off-by: Lucas De Marchi lucas.demarchi@intel.com Cc: Matt Roper matthew.d.roper@intel.com Cc: Sujaritha Sundaresan sujaritha.sundaresan@intel.com Cc: Tvrtko Ursulin tvrtko.ursulin@intel.com Reviewed-by: Sujaritha Sundaresan sujaritha.sundaresan@intel.com --- drivers/gpu/drm/i915/Makefile | 4 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 + drivers/gpu/drm/i915/gt/sysfs_gt.c | 126 +++++++++ drivers/gpu/drm/i915/gt/sysfs_gt.h | 44 +++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.c | 393 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.h | 16 ++ drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/i915_sysfs.c | 315 +-------------------- drivers/gpu/drm/i915/i915_sysfs.h | 3 + 10 files changed, 600 insertions(+), 306 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt.c create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt.h create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt_pm.c create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt_pm.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index aa86ac33effc..5fd203c626fc 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -121,7 +121,9 @@ gt-y += \ gt/intel_timeline.o \ gt/intel_workarounds.o \ gt/shmem_utils.o \ - gt/sysfs_engines.o + gt/sysfs_engines.o \ + gt/sysfs_gt.o \ + gt/sysfs_gt_pm.o # autogenerated null render state gt-y += \ gt/gen6_renderstate.o \ diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index 17927da9e23e..2584c51c1c14 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -25,6 +25,7 @@ #include "intel_rps.h" #include "intel_uncore.h" #include "shmem_utils.h" +#include "sysfs_gt.h" #include "pxp/intel_pxp.h"
static void @@ -453,6 +454,7 @@ void intel_gt_driver_register(struct intel_gt *gt) intel_rps_driver_register(>->rps);
intel_gt_debugfs_register(gt); + intel_gt_sysfs_register(gt); }
static int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size) diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt.c b/drivers/gpu/drm/i915/gt/sysfs_gt.c new file mode 100644 index 000000000000..46cf033a53ec --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt.c @@ -0,0 +1,126 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright © 2020 Intel Corporation + */ + +#include <drm/drm_device.h> +#include <linux/device.h> +#include <linux/kobject.h> +#include <linux/printk.h> +#include <linux/sysfs.h> + +#include "i915_drv.h" +#include "i915_sysfs.h" +#include "intel_gt.h" +#include "intel_gt_types.h" +#include "intel_rc6.h" + +#include "sysfs_gt.h" +#include "sysfs_gt_pm.h" + +struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev, + const char *name) +{ + struct kobject *kobj = &dev->kobj; + + /* + * We are interested at knowing from where the interface + * has been called, whether it's called from gt/ or from + * the parent directory. + * From the interface position it depends also the value of + * the private data. + * If the interface is called from gt/ then private data is + * of the "struct intel_gt *" type, otherwise it's * a + * "struct drm_i915_private *" type. + */ + if (!is_object_gt(kobj)) { + struct drm_i915_private *i915 = kdev_minor_to_i915(dev); + + pr_devel_ratelimited(DEPRECATED + "%s (pid %d) is trying to access deprecated %s " + "sysfs control, please use gt/gt<n>/%s instead\n", + current->comm, task_pid_nr(current), name, name); + return to_gt(i915); + } + + return kobj_to_gt(kobj); +} + +static struct kobject *gt_get_parent_obj(struct intel_gt *gt) +{ + return >->i915->drm.primary->kdev->kobj; +} + +static ssize_t id_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + + return sysfs_emit(buf, "%u\n", gt->info.id); +} + +static DEVICE_ATTR_RO(id); + +static void kobj_gt_release(struct kobject *kobj) +{ + kfree(kobj); +} + +static struct kobj_type kobj_gt_type = { + .release = kobj_gt_release, + .sysfs_ops = &kobj_sysfs_ops +}; + +struct kobject * +intel_gt_create_kobj(struct intel_gt *gt, struct kobject *dir, const char *name) +{ + struct kobj_gt *kg; + + kg = kzalloc(sizeof(*kg), GFP_KERNEL); + if (!kg) + return NULL; + + kobject_init(&kg->base, &kobj_gt_type); + kg->gt = gt; + + /* xfer ownership to sysfs tree */ + if (kobject_add(&kg->base, dir, "%s", name)) { + kobject_put(&kg->base); + return NULL; + } + + return &kg->base; /* borrowed ref */ +} + +void intel_gt_sysfs_register(struct intel_gt *gt) +{ + struct kobject *dir; + char name[80]; + + /* + * We need to make things right with the + * ABI compatibility. The files were originally + * generated under the parent directory. + * + * We generate the files only for gt 0 + * to avoid duplicates. + */ + if (!gt->info.id) + intel_gt_sysfs_pm_init(gt, gt_get_parent_obj(gt)); + + snprintf(name, sizeof(name), "gt%d", gt->info.id); + + dir = intel_gt_create_kobj(gt, gt->i915->sysfs_gt, name); + if (!dir) { + drm_err(>->i915->drm, + "failed to initialize %s sysfs root\n", name); + return; + } + + if (sysfs_create_file(dir, &dev_attr_id.attr)) + drm_err(>->i915->drm, + "failed to create sysfs %s info files\n", name); + + intel_gt_sysfs_pm_init(gt, dir); +} diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt.h b/drivers/gpu/drm/i915/gt/sysfs_gt.h new file mode 100644 index 000000000000..cd80a14bb14d --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2020 Intel Corporation + */ + +#ifndef __SYSFS_GT_H__ +#define __SYSFS_GT_H__ + +#include <linux/ctype.h> +#include <linux/kobject.h> + +#include "i915_gem.h" /* GEM_BUG_ON() */ + +struct intel_gt; + +struct kobj_gt { + struct kobject base; + struct intel_gt *gt; +}; + +static inline bool is_object_gt(struct kobject *kobj) +{ + bool b = !strncmp(kobj->name, "gt", 2); + + GEM_BUG_ON(b && !isdigit(kobj->name[2])); + + return b; +} + +struct kobject * +intel_gt_create_kobj(struct intel_gt *gt, + struct kobject *dir, + const char *name); + +static inline struct intel_gt *kobj_to_gt(struct kobject *kobj) +{ + return container_of(kobj, struct kobj_gt, base)->gt; +} + +void intel_gt_sysfs_register(struct intel_gt *gt); +struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev, + const char *name); + +#endif /* SYSFS_GT_H */ diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt_pm.c b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file mode 100644 index 000000000000..6f4424be42d1 --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.c @@ -0,0 +1,393 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright © 2020 Intel Corporation + */ + +#include <drm/drm_device.h> +#include <linux/sysfs.h> +#include <linux/printk.h> + +#include "i915_drv.h" +#include "intel_gt.h" +#include "intel_rc6.h" +#include "intel_rps.h" +#include "sysfs_gt.h" +#include "sysfs_gt_pm.h" + +#ifdef CONFIG_PM +static u32 get_residency(struct intel_gt *gt, i915_reg_t reg) +{ + intel_wakeref_t wakeref; + u64 res = 0; + + with_intel_runtime_pm(gt->uncore->rpm, wakeref) + res = intel_rc6_residency_us(>->rc6, reg); + + return DIV_ROUND_CLOSEST_ULL(res, 1000); +} + +static ssize_t rc6_enable_show(struct device *dev, + struct device_attribute *attr, + char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + u8 mask = 0; + + if (HAS_RC6(gt->i915)) + mask |= BIT(0); + if (HAS_RC6p(gt->i915)) + mask |= BIT(1); + if (HAS_RC6pp(gt->i915)) + mask |= BIT(2); + + return scnprintf(buff, PAGE_SIZE, "%x\n", mask); +} + +static ssize_t rc6_residency_ms_show(struct device *dev, + struct device_attribute *attr, + char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + u32 rc6_residency = get_residency(gt, GEN6_GT_GFX_RC6); + + return scnprintf(buff, PAGE_SIZE, "%u\n", rc6_residency); +} + +static ssize_t rc6p_residency_ms_show(struct device *dev, + struct device_attribute *attr, + char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + u32 rc6p_residency = get_residency(gt, GEN6_GT_GFX_RC6p); + + return scnprintf(buff, PAGE_SIZE, "%u\n", rc6p_residency); +} + +static ssize_t rc6pp_residency_ms_show(struct device *dev, + struct device_attribute *attr, + char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + u32 rc6pp_residency = get_residency(gt, GEN6_GT_GFX_RC6pp); + + return scnprintf(buff, PAGE_SIZE, "%u\n", rc6pp_residency); +} + +static ssize_t media_rc6_residency_ms_show(struct device *dev, + struct device_attribute *attr, + char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + u32 rc6_residency = get_residency(gt, VLV_GT_MEDIA_RC6); + + return scnprintf(buff, PAGE_SIZE, "%u\n", rc6_residency); +} + +static DEVICE_ATTR_RO(rc6_enable); +static DEVICE_ATTR_RO(rc6_residency_ms); +static DEVICE_ATTR_RO(rc6p_residency_ms); +static DEVICE_ATTR_RO(rc6pp_residency_ms); +static DEVICE_ATTR_RO(media_rc6_residency_ms); + +static struct attribute *rc6_attrs[] = { + &dev_attr_rc6_enable.attr, + &dev_attr_rc6_residency_ms.attr, + NULL +}; + +static struct attribute *rc6p_attrs[] = { + &dev_attr_rc6p_residency_ms.attr, + &dev_attr_rc6pp_residency_ms.attr, + NULL +}; + +static struct attribute *media_rc6_attrs[] = { + &dev_attr_media_rc6_residency_ms.attr, + NULL +}; + +static const struct attribute_group rc6_attr_group[] = { + { .name = power_group_name, .attrs = rc6_attrs }, + { .attrs = rc6_attrs } +}; + +static const struct attribute_group rc6p_attr_group[] = { + { .name = power_group_name, .attrs = rc6p_attrs }, + { .attrs = rc6p_attrs } +}; + +static const struct attribute_group media_rc6_attr_group[] = { + { .name = power_group_name, .attrs = media_rc6_attrs }, + { .attrs = media_rc6_attrs } +}; + +static int __intel_gt_sysfs_create_group(struct kobject *kobj, + const struct attribute_group *grp) +{ + int i = is_object_gt(kobj); + + return i ? sysfs_create_group(kobj, &grp[i]) : + sysfs_merge_group(kobj, &grp[i]); +} + +static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj) +{ + int ret; + + if (!HAS_RC6(gt->i915)) + return; + + ret = __intel_gt_sysfs_create_group(kobj, rc6_attr_group); + if (ret) + drm_err(>->i915->drm, + "failed to create gt%u RC6 sysfs files\n", gt->info.id); + + if (HAS_RC6p(gt->i915)) { + ret = __intel_gt_sysfs_create_group(kobj, rc6p_attr_group); + if (ret) + drm_err(>->i915->drm, + "failed to create gt%u RC6p sysfs files\n", + gt->info.id); + } + + if (IS_VALLEYVIEW(gt->i915) || IS_CHERRYVIEW(gt->i915)) { + ret = __intel_gt_sysfs_create_group(kobj, media_rc6_attr_group); + if (ret) + drm_err(>->i915->drm, + "failed to create media %u RC6 sysfs files\n", + gt->info.id); + } +} +#else +static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj) +{ +} +#endif /* CONFIG_PM */ + +static ssize_t act_freq_mhz_show(struct device *dev, + struct device_attribute *attr, char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + + return scnprintf(buff, PAGE_SIZE, "%d\n", + intel_rps_read_actual_frequency(>->rps)); +} + +static ssize_t cur_freq_mhz_show(struct device *dev, + struct device_attribute *attr, char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + struct intel_rps *rps = >->rps; + + return scnprintf(buff, PAGE_SIZE, "%d\n", + intel_rps_get_requested_frequency(rps)); +} + +static ssize_t boost_freq_mhz_show(struct device *dev, + struct device_attribute *attr, + char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + struct intel_rps *rps = >->rps; + + return scnprintf(buff, PAGE_SIZE, "%d\n", + intel_rps_get_boost_frequency(rps)); +} + +static ssize_t boost_freq_mhz_store(struct device *dev, + struct device_attribute *attr, + const char *buff, size_t count) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + struct intel_rps *rps = >->rps; + bool boost = false; + ssize_t ret; + u32 val; + + ret = kstrtou32(buff, 0, &val); + if (ret) + return ret; + + /* Validate against (static) hardware limits */ + val = intel_freq_opcode(rps, val); + if (val < rps->min_freq || val > rps->max_freq) + return -EINVAL; + + mutex_lock(&rps->lock); + if (val != rps->boost_freq) { + rps->boost_freq = val; + boost = atomic_read(&rps->num_waiters); + } + mutex_unlock(&rps->lock); + if (boost) + schedule_work(&rps->work); + + return count; +} + +static ssize_t vlv_rpe_freq_mhz_show(struct device *dev, + struct device_attribute *attr, char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + struct intel_rps *rps = >->rps; + + return scnprintf(buff, PAGE_SIZE, "%d\n", + intel_gpu_freq(rps, rps->efficient_freq)); +} + +static ssize_t max_freq_mhz_show(struct device *dev, + struct device_attribute *attr, + char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + struct intel_rps *rps = >->rps; + + return sysfs_emit(buff, "%d\n", intel_rps_get_max_frequency(rps)); +} + +static ssize_t max_freq_mhz_store(struct device *dev, + struct device_attribute *attr, + const char *buff, size_t count) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + struct intel_rps *rps = >->rps; + ssize_t ret; + u32 val; + + ret = kstrtou32(buff, 0, &val); + if (ret) + return ret; + + ret = intel_rps_set_max_frequency(rps, val); + + return ret ?: count; +} + +static ssize_t min_freq_mhz_show(struct device *dev, + struct device_attribute *attr, + char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + struct intel_rps *rps = >->rps; + + return sysfs_emit(buff, "%d\n", intel_rps_get_min_frequency(rps)); +} + +static ssize_t min_freq_mhz_store(struct device *dev, + struct device_attribute *attr, + const char *buff, size_t count) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + struct intel_rps *rps = >->rps; + ssize_t ret; + u32 val; + + ret = kstrtou32(buff, 0, &val); + if (ret) + return ret; + + ret = intel_rps_set_min_frequency(rps, val); + + return ret ?: count; +} + +#define INTEL_GT_RPS_SYSFS_ATTR(_name, _mode, _show, _store) \ + struct device_attribute dev_attr_gt_##_name = __ATTR(gt_##_name, _mode, _show, _store); \ + struct device_attribute dev_attr_rps_##_name = __ATTR(rps_##_name, _mode, _show, _store) + +#define INTEL_GT_RPS_SYSFS_ATTR_RO(_name) \ + INTEL_GT_RPS_SYSFS_ATTR(_name, 0444, _name##_show, NULL) +#define INTEL_GT_RPS_SYSFS_ATTR_RW(_name) \ + INTEL_GT_RPS_SYSFS_ATTR(_name, 0644, _name##_show, _name##_store) + +static INTEL_GT_RPS_SYSFS_ATTR_RO(act_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RO(cur_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RW(boost_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RW(max_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RW(min_freq_mhz); + +static DEVICE_ATTR_RO(vlv_rpe_freq_mhz); + +static ssize_t rps_rp_mhz_show(struct device *dev, + struct device_attribute *attr, + char *buff); + +static INTEL_GT_RPS_SYSFS_ATTR(RP0_freq_mhz, 0444, rps_rp_mhz_show, NULL); +static INTEL_GT_RPS_SYSFS_ATTR(RP1_freq_mhz, 0444, rps_rp_mhz_show, NULL); +static INTEL_GT_RPS_SYSFS_ATTR(RPn_freq_mhz, 0444, rps_rp_mhz_show, NULL); + +#define GEN6_ATTR(s) { \ + &dev_attr_##s##_act_freq_mhz.attr, \ + &dev_attr_##s##_cur_freq_mhz.attr, \ + &dev_attr_##s##_boost_freq_mhz.attr, \ + &dev_attr_##s##_max_freq_mhz.attr, \ + &dev_attr_##s##_min_freq_mhz.attr, \ + &dev_attr_##s##_RP0_freq_mhz.attr, \ + &dev_attr_##s##_RP1_freq_mhz.attr, \ + &dev_attr_##s##_RPn_freq_mhz.attr, \ + NULL, \ + } + +#define GEN6_RPS_ATTR GEN6_ATTR(rps) +#define GEN6_GT_ATTR GEN6_ATTR(gt) + +/* For now we have a static number of RP states */ +static ssize_t rps_rp_mhz_show(struct device *dev, + struct device_attribute *attr, + char *buff) +{ + struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name); + struct intel_rps *rps = >->rps; + u32 val; + + if (attr == &dev_attr_gt_RP0_freq_mhz || + attr == &dev_attr_rps_RP0_freq_mhz) { + val = intel_rps_get_rp0_frequency(rps); + } else if (attr == &dev_attr_gt_RP1_freq_mhz || + attr == &dev_attr_rps_RP1_freq_mhz) { + val = intel_rps_get_rp1_frequency(rps); + } else if (attr == &dev_attr_gt_RPn_freq_mhz || + attr == &dev_attr_rps_RPn_freq_mhz) { + val = intel_rps_get_rpn_frequency(rps); + } else { + GEM_WARN_ON(1); + return -ENODEV; + } + + return scnprintf(buff, PAGE_SIZE, "%d\n", val); +} + +static const struct attribute * const gen6_rps_attrs[] = GEN6_RPS_ATTR; +static const struct attribute * const gen6_gt_attrs[] = GEN6_GT_ATTR; + +static int intel_sysfs_rps_init(struct intel_gt *gt, struct kobject *kobj, + const struct attribute * const *attrs) +{ + int ret; + + if (GRAPHICS_VER(gt->i915) < 6) + return 0; + + ret = sysfs_create_files(kobj, attrs); + if (ret) + return ret; + + if (IS_VALLEYVIEW(gt->i915) || IS_CHERRYVIEW(gt->i915)) + ret = sysfs_create_file(kobj, &dev_attr_vlv_rpe_freq_mhz.attr); + + return ret; +} + +void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj) +{ + int ret; + + intel_sysfs_rc6_init(gt, kobj); + + ret = is_object_gt(kobj) ? + intel_sysfs_rps_init(gt, kobj, gen6_rps_attrs) : + intel_sysfs_rps_init(gt, kobj, gen6_gt_attrs); + if (ret) + drm_err(>->i915->drm, + "failed to create gt%u RPS sysfs files", gt->info.id); +} diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt_pm.h b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.h new file mode 100644 index 000000000000..18c60d929e6d --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2020 Intel Corporation + */ + +#ifndef __SYSFS_GT_PM_H__ +#define __SYSFS_GT_PM_H__ + +#include <linux/kobject.h> + +#include "intel_gt_types.h" + +void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj); +void intel_gt_sysfs_pm_remove(struct intel_gt *gt, struct kobject *kobj); + +#endif /* SYSFS_RC6_H */ diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index ec76011366fb..f11acbc0990b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -989,6 +989,8 @@ struct drm_i915_private { #define I915_MAX_GT 4 struct intel_gt *gt[I915_MAX_GT];
+ struct kobject *sysfs_gt; + struct { struct i915_gem_contexts { spinlock_t lock; /* locks list */ diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index ef6bc8180073..5153b3ff41e9 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -8480,6 +8480,7 @@ enum { #define GEN6_AGGRESSIVE_TURBO (0 << 15) #define GEN9_SW_REQ_UNSLICE_RATIO_SHIFT 23 #define GEN9_IGNORE_SLICE_RATIO (0 << 0) +#define GEN12_SW_REQ_UNSLICE_RATIO_SHIFT 23
#define GEN6_RC_VIDEO_FREQ _MMIO(0xA00C) #define GEN6_RC_CONTROL _MMIO(0xA090) diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index fae4d1f4f275..d6687e33f29d 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -38,113 +38,12 @@ #include "i915_sysfs.h" #include "intel_pm.h"
-static inline struct drm_i915_private *kdev_minor_to_i915(struct device *kdev) +struct drm_i915_private *kdev_minor_to_i915(struct device *kdev) { struct drm_minor *minor = dev_get_drvdata(kdev); return to_i915(minor->dev); }
-#ifdef CONFIG_PM -static u32 calc_residency(struct drm_i915_private *dev_priv, - i915_reg_t reg) -{ - intel_wakeref_t wakeref; - u64 res = 0; - - with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref) - res = intel_rc6_residency_us(&to_gt(dev_priv)->rc6, reg); - - return DIV_ROUND_CLOSEST_ULL(res, 1000); -} - -static ssize_t rc6_enable_show(struct device *kdev, - struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); - unsigned int mask; - - mask = 0; - if (HAS_RC6(dev_priv)) - mask |= BIT(0); - if (HAS_RC6p(dev_priv)) - mask |= BIT(1); - if (HAS_RC6pp(dev_priv)) - mask |= BIT(2); - - return sysfs_emit(buf, "%x\n", mask); -} - -static ssize_t rc6_residency_ms_show(struct device *kdev, - struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); - u32 rc6_residency = calc_residency(dev_priv, GEN6_GT_GFX_RC6); - return sysfs_emit(buf, "%u\n", rc6_residency); -} - -static ssize_t rc6p_residency_ms_show(struct device *kdev, - struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); - u32 rc6p_residency = calc_residency(dev_priv, GEN6_GT_GFX_RC6p); - return sysfs_emit(buf, "%u\n", rc6p_residency); -} - -static ssize_t rc6pp_residency_ms_show(struct device *kdev, - struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); - u32 rc6pp_residency = calc_residency(dev_priv, GEN6_GT_GFX_RC6pp); - return sysfs_emit(buf, "%u\n", rc6pp_residency); -} - -static ssize_t media_rc6_residency_ms_show(struct device *kdev, - struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); - u32 rc6_residency = calc_residency(dev_priv, VLV_GT_MEDIA_RC6); - return sysfs_emit(buf, "%u\n", rc6_residency); -} - -static DEVICE_ATTR_RO(rc6_enable); -static DEVICE_ATTR_RO(rc6_residency_ms); -static DEVICE_ATTR_RO(rc6p_residency_ms); -static DEVICE_ATTR_RO(rc6pp_residency_ms); -static DEVICE_ATTR_RO(media_rc6_residency_ms); - -static struct attribute *rc6_attrs[] = { - &dev_attr_rc6_enable.attr, - &dev_attr_rc6_residency_ms.attr, - NULL -}; - -static const struct attribute_group rc6_attr_group = { - .name = power_group_name, - .attrs = rc6_attrs -}; - -static struct attribute *rc6p_attrs[] = { - &dev_attr_rc6p_residency_ms.attr, - &dev_attr_rc6pp_residency_ms.attr, - NULL -}; - -static const struct attribute_group rc6p_attr_group = { - .name = power_group_name, - .attrs = rc6p_attrs -}; - -static struct attribute *media_rc6_attrs[] = { - &dev_attr_media_rc6_residency_ms.attr, - NULL -}; - -static const struct attribute_group media_rc6_attr_group = { - .name = power_group_name, - .attrs = media_rc6_attrs -}; -#endif - static int l3_access_valid(struct drm_i915_private *i915, loff_t offset) { if (!HAS_L3_DPF(i915)) @@ -256,171 +155,6 @@ static const struct bin_attribute dpf_attrs_1 = { .private = (void *)1 };
-static ssize_t gt_act_freq_mhz_show(struct device *kdev, - struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *i915 = kdev_minor_to_i915(kdev); - struct intel_rps *rps = &to_gt(i915)->rps; - - return sysfs_emit(buf, "%d\n", intel_rps_read_actual_frequency(rps)); -} - -static ssize_t gt_cur_freq_mhz_show(struct device *kdev, - struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *i915 = kdev_minor_to_i915(kdev); - struct intel_rps *rps = &to_gt(i915)->rps; - - return sysfs_emit(buf, "%d\n", intel_rps_get_requested_frequency(rps)); -} - -static ssize_t gt_boost_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *i915 = kdev_minor_to_i915(kdev); - struct intel_rps *rps = &to_gt(i915)->rps; - - return sysfs_emit(buf, "%d\n", intel_rps_get_boost_frequency(rps)); -} - -static ssize_t gt_boost_freq_mhz_store(struct device *kdev, - struct device_attribute *attr, - const char *buf, size_t count) -{ - struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); - struct intel_rps *rps = &to_gt(dev_priv)->rps; - ssize_t ret; - u32 val; - - ret = kstrtou32(buf, 0, &val); - if (ret) - return ret; - - ret = intel_rps_set_boost_frequency(rps, val); - - return ret ?: count; -} - -static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev, - struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); - struct intel_rps *rps = &to_gt(dev_priv)->rps; - - return sysfs_emit(buf, "%d\n", intel_gpu_freq(rps, rps->efficient_freq)); -} - -static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); - struct intel_gt *gt = to_gt(dev_priv); - struct intel_rps *rps = >->rps; - - return sysfs_emit(buf, "%d\n", intel_rps_get_max_frequency(rps)); -} - -static ssize_t gt_max_freq_mhz_store(struct device *kdev, - struct device_attribute *attr, - const char *buf, size_t count) -{ - struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); - struct intel_gt *gt = to_gt(dev_priv); - struct intel_rps *rps = >->rps; - ssize_t ret; - u32 val; - - ret = kstrtou32(buf, 0, &val); - if (ret) - return ret; - - ret = intel_rps_set_max_frequency(rps, val); - - return ret ?: count; -} - -static ssize_t gt_min_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *i915 = kdev_minor_to_i915(kdev); - struct intel_gt *gt = to_gt(i915); - struct intel_rps *rps = >->rps; - - return sysfs_emit(buf, "%d\n", intel_rps_get_min_frequency(rps)); -} - -static ssize_t gt_min_freq_mhz_store(struct device *kdev, - struct device_attribute *attr, - const char *buf, size_t count) -{ - struct drm_i915_private *i915 = kdev_minor_to_i915(kdev); - struct intel_rps *rps = &to_gt(i915)->rps; - ssize_t ret; - u32 val; - - ret = kstrtou32(buf, 0, &val); - if (ret) - return ret; - - ret = intel_rps_set_min_frequency(rps, val); - - return ret ?: count; -} - -static DEVICE_ATTR_RO(gt_act_freq_mhz); -static DEVICE_ATTR_RO(gt_cur_freq_mhz); -static DEVICE_ATTR_RW(gt_boost_freq_mhz); -static DEVICE_ATTR_RW(gt_max_freq_mhz); -static DEVICE_ATTR_RW(gt_min_freq_mhz); - -static DEVICE_ATTR_RO(vlv_rpe_freq_mhz); - -static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf); -static DEVICE_ATTR(gt_RP0_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL); -static DEVICE_ATTR(gt_RP1_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL); -static DEVICE_ATTR(gt_RPn_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL); - -/* For now we have a static number of RP states */ -static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{ - struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev); - struct intel_rps *rps = &to_gt(dev_priv)->rps; - u32 val; - - if (attr == &dev_attr_gt_RP0_freq_mhz) - val = intel_rps_get_rp0_frequency(rps); - else if (attr == &dev_attr_gt_RP1_freq_mhz) - val = intel_rps_get_rp1_frequency(rps); - else if (attr == &dev_attr_gt_RPn_freq_mhz) - val = intel_rps_get_rpn_frequency(rps); - else - BUG(); - - return sysfs_emit(buf, "%d\n", val); -} - -static const struct attribute * const gen6_attrs[] = { - &dev_attr_gt_act_freq_mhz.attr, - &dev_attr_gt_cur_freq_mhz.attr, - &dev_attr_gt_boost_freq_mhz.attr, - &dev_attr_gt_max_freq_mhz.attr, - &dev_attr_gt_min_freq_mhz.attr, - &dev_attr_gt_RP0_freq_mhz.attr, - &dev_attr_gt_RP1_freq_mhz.attr, - &dev_attr_gt_RPn_freq_mhz.attr, - NULL, -}; - -static const struct attribute * const vlv_attrs[] = { - &dev_attr_gt_act_freq_mhz.attr, - &dev_attr_gt_cur_freq_mhz.attr, - &dev_attr_gt_boost_freq_mhz.attr, - &dev_attr_gt_max_freq_mhz.attr, - &dev_attr_gt_min_freq_mhz.attr, - &dev_attr_gt_RP0_freq_mhz.attr, - &dev_attr_gt_RP1_freq_mhz.attr, - &dev_attr_gt_RPn_freq_mhz.attr, - &dev_attr_vlv_rpe_freq_mhz.attr, - NULL, -}; - #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
static ssize_t error_state_read(struct file *filp, struct kobject *kobj, @@ -486,34 +220,16 @@ static void i915_setup_error_capture(struct device *kdev) {} static void i915_teardown_error_capture(struct device *kdev) {} #endif
+static struct kobject *i915_setup_gt_sysfs(struct kobject *parent) +{ + return kobject_create_and_add("gt", parent); +} + void i915_setup_sysfs(struct drm_i915_private *dev_priv) { struct device *kdev = dev_priv->drm.primary->kdev; int ret;
-#ifdef CONFIG_PM - if (HAS_RC6(dev_priv)) { - ret = sysfs_merge_group(&kdev->kobj, - &rc6_attr_group); - if (ret) - drm_err(&dev_priv->drm, - "RC6 residency sysfs setup failed\n"); - } - if (HAS_RC6p(dev_priv)) { - ret = sysfs_merge_group(&kdev->kobj, - &rc6p_attr_group); - if (ret) - drm_err(&dev_priv->drm, - "RC6p residency sysfs setup failed\n"); - } - if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { - ret = sysfs_merge_group(&kdev->kobj, - &media_rc6_attr_group); - if (ret) - drm_err(&dev_priv->drm, - "Media RC6 residency sysfs setup failed\n"); - } -#endif if (HAS_L3_DPF(dev_priv)) { ret = device_create_bin_file(kdev, &dpf_attrs); if (ret) @@ -529,13 +245,10 @@ void i915_setup_sysfs(struct drm_i915_private *dev_priv) } }
- ret = 0; - if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) - ret = sysfs_create_files(&kdev->kobj, vlv_attrs); - else if (GRAPHICS_VER(dev_priv) >= 6) - ret = sysfs_create_files(&kdev->kobj, gen6_attrs); - if (ret) - drm_err(&dev_priv->drm, "RPS sysfs setup failed\n"); + dev_priv->sysfs_gt = i915_setup_gt_sysfs(&kdev->kobj); + if (!dev_priv->sysfs_gt) + drm_err(&dev_priv->drm, + "failed to register GT sysfs directory\n");
i915_setup_error_capture(kdev);
@@ -548,14 +261,6 @@ void i915_teardown_sysfs(struct drm_i915_private *dev_priv)
i915_teardown_error_capture(kdev);
- if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) - sysfs_remove_files(&kdev->kobj, vlv_attrs); - else - sysfs_remove_files(&kdev->kobj, gen6_attrs); device_remove_bin_file(kdev, &dpf_attrs_1); device_remove_bin_file(kdev, &dpf_attrs); -#ifdef CONFIG_PM - sysfs_unmerge_group(&kdev->kobj, &rc6_attr_group); - sysfs_unmerge_group(&kdev->kobj, &rc6p_attr_group); -#endif } diff --git a/drivers/gpu/drm/i915/i915_sysfs.h b/drivers/gpu/drm/i915/i915_sysfs.h index 41afd4366416..243a17741e3f 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.h +++ b/drivers/gpu/drm/i915/i915_sysfs.h @@ -6,8 +6,11 @@ #ifndef __I915_SYSFS_H__ #define __I915_SYSFS_H__
+struct device; struct drm_i915_private;
+struct drm_i915_private *kdev_minor_to_i915(struct device *kdev); + void i915_setup_sysfs(struct drm_i915_private *i915); void i915_teardown_sysfs(struct drm_i915_private *i915);
On 17/01/2022 15:09, Andi Shyti wrote:
The GT has its own properties and in sysfs they should be grouped in the 'gt/' directory.
Create a 'gt/' directory in sysfs which will contain gt0...gtN directories related to each tile configured in the GPU. Move the power management files inside those directories.
The previous power management files are kept in their original root directory to avoid breaking the ABI. They point to the tile '0' and a warning message is printed whenever accessed to. The deprecated interface needs for the CONFIG_SYSFS_DEPRECATED_V2 flag in order to be generated.
CONFIG_SYSFS_DEPRECATED_V2 idea was abandoned, no? This patch at least does not appear to contain it so please update the commit message to reflect current state.
Adding Joonas to help address the question of how strict are userspace requirements for sysfs additions. Personally sysadmin use sounds fine to me, although it needs to be mentioned/documented as Matt requested, but I fear it may not be enough to upstream. Is Level0 at the stage where we can upstream for it I am also not sure.
While I am here I also left some nits below (not full review).
The new sysfs structure will have a similar layout for the 4 tile case:
/sys/.../card0 ├── gt │ ├── gt0 │ │ ├── id │ │ ├── rc6_enable │ │ ├── rc6_residency_ms │ │ ├── rps_act_freq_mhz │ │ ├── rps_boost_freq_mhz │ │ ├── rps_cur_freq_mhz │ │ ├── rps_max_freq_mhz │ │ ├── rps_min_freq_mhz │ │ ├── rps_RP0_freq_mhz │ │ ├── rps_RP1_freq_mhz │ │ └── rps_RPn_freq_mhz . . . . . . │ └── gt3 │ ├── id │ ├── rc6_enable │ ├── rc6_residency_ms │ ├── rps_act_freq_mhz │ ├── rps_boost_freq_mhz │ ├── rps_cur_freq_mhz │ ├── rps_max_freq_mhz │ ├── rps_min_freq_mhz │ ├── rps_RP0_freq_mhz │ ├── rps_RP1_freq_mhz │ └── rps_RPn_freq_mhz ├── gt_act_freq_mhz -+ ├── gt_boost_freq_mhz | ├── gt_cur_freq_mhz | Original interface ├── gt_max_freq_mhz +─-> kept as existing ABI; ├── gt_min_freq_mhz | it points to gt0/ ├── gt_RP0_freq_mhz | └── gt_RP1_freq_mhz | └── gt_RPn_freq_mhz -+
As soon as multitile platforms will start being supported, this interface will allow to control the power (either manually or with tools) on each tile, instead of affecting only tile 0 and getting incomplete results.
Signed-off-by: Andi Shyti andi.shyti@linux.intel.com Signed-off-by: Lucas De Marchi lucas.demarchi@intel.com Cc: Matt Roper matthew.d.roper@intel.com Cc: Sujaritha Sundaresan sujaritha.sundaresan@intel.com Cc: Tvrtko Ursulin tvrtko.ursulin@intel.com Reviewed-by: Sujaritha Sundaresan sujaritha.sundaresan@intel.com
drivers/gpu/drm/i915/Makefile | 4 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 + drivers/gpu/drm/i915/gt/sysfs_gt.c | 126 +++++++++ drivers/gpu/drm/i915/gt/sysfs_gt.h | 44 +++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.c | 393 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.h | 16 ++ drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/i915_sysfs.c | 315 +-------------------- drivers/gpu/drm/i915/i915_sysfs.h | 3 + 10 files changed, 600 insertions(+), 306 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt.c create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt.h create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt_pm.c create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt_pm.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index aa86ac33effc..5fd203c626fc 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -121,7 +121,9 @@ gt-y += \ gt/intel_timeline.o \ gt/intel_workarounds.o \ gt/shmem_utils.o \
- gt/sysfs_engines.o
- gt/sysfs_engines.o \
- gt/sysfs_gt.o \
- gt/sysfs_gt_pm.o # autogenerated null render state gt-y += \ gt/gen6_renderstate.o \
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index 17927da9e23e..2584c51c1c14 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -25,6 +25,7 @@ #include "intel_rps.h" #include "intel_uncore.h" #include "shmem_utils.h" +#include "sysfs_gt.h" #include "pxp/intel_pxp.h"
static void @@ -453,6 +454,7 @@ void intel_gt_driver_register(struct intel_gt *gt) intel_rps_driver_register(>->rps);
intel_gt_debugfs_register(gt);
intel_gt_sysfs_register(gt); }
static int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)
diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt.c b/drivers/gpu/drm/i915/gt/sysfs_gt.c new file mode 100644 index 000000000000..46cf033a53ec --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt.c @@ -0,0 +1,126 @@ +// SPDX-License-Identifier: MIT +/*
- Copyright © 2020 Intel Corporation
- */
+#include <drm/drm_device.h> +#include <linux/device.h> +#include <linux/kobject.h> +#include <linux/printk.h> +#include <linux/sysfs.h>
+#include "i915_drv.h" +#include "i915_sysfs.h" +#include "intel_gt.h" +#include "intel_gt_types.h" +#include "intel_rc6.h"
+#include "sysfs_gt.h" +#include "sysfs_gt_pm.h"
+struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev,
const char *name)+{
- struct kobject *kobj = &dev->kobj;
- /*
* We are interested at knowing from where the interface* has been called, whether it's called from gt/ or from* the parent directory.* From the interface position it depends also the value of* the private data.* If the interface is called from gt/ then private data is* of the "struct intel_gt *" type, otherwise it's * a* "struct drm_i915_private *" type.*/- if (!is_object_gt(kobj)) {
struct drm_i915_private *i915 = kdev_minor_to_i915(dev);pr_devel_ratelimited(DEPRECATED"%s (pid %d) is trying to access deprecated %s ""sysfs control, please use gt/gt<n>/%s instead\n",
Maybe reword "is trying to access" to "is accesing" to remove any doubt whether something is failing or not?
current->comm, task_pid_nr(current), name, name);return to_gt(i915);- }
- return kobj_to_gt(kobj);
+}
+static struct kobject *gt_get_parent_obj(struct intel_gt *gt) +{
- return >->i915->drm.primary->kdev->kobj;
+}
+static ssize_t id_show(struct device *dev,
struct device_attribute *attr,char *buf)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- return sysfs_emit(buf, "%u\n", gt->info.id);
+}
+static DEVICE_ATTR_RO(id);
+static void kobj_gt_release(struct kobject *kobj) +{
- kfree(kobj);
+}
+static struct kobj_type kobj_gt_type = {
- .release = kobj_gt_release,
- .sysfs_ops = &kobj_sysfs_ops
+};
+struct kobject * +intel_gt_create_kobj(struct intel_gt *gt, struct kobject *dir, const char *name) +{
- struct kobj_gt *kg;
- kg = kzalloc(sizeof(*kg), GFP_KERNEL);
- if (!kg)
return NULL;- kobject_init(&kg->base, &kobj_gt_type);
- kg->gt = gt;
- /* xfer ownership to sysfs tree */
- if (kobject_add(&kg->base, dir, "%s", name)) {
kobject_put(&kg->base);return NULL;- }
- return &kg->base; /* borrowed ref */
+}
+void intel_gt_sysfs_register(struct intel_gt *gt) +{
- struct kobject *dir;
- char name[80];
- /*
* We need to make things right with the* ABI compatibility. The files were originally* generated under the parent directory.** We generate the files only for gt 0* to avoid duplicates.*/- if (!gt->info.id)
intel_gt_sysfs_pm_init(gt, gt_get_parent_obj(gt));- snprintf(name, sizeof(name), "gt%d", gt->info.id);
- dir = intel_gt_create_kobj(gt, gt->i915->sysfs_gt, name);
- if (!dir) {
drm_err(>->i915->drm,"failed to initialize %s sysfs root\n", name);return;- }
- if (sysfs_create_file(dir, &dev_attr_id.attr))
drm_err(>->i915->drm,"failed to create sysfs %s info files\n", name);
These drm_err could maybe be warn or notice, to reflect the fact driver is most likely completely functional? But only maybe since I haven't checked what we do for other sysfs failures. If rest are drm_err then I guess consistency trumps it.
- intel_gt_sysfs_pm_init(gt, dir);
+} diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt.h b/drivers/gpu/drm/i915/gt/sysfs_gt.h new file mode 100644 index 000000000000..cd80a14bb14d --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: MIT */ +/*
- Copyright © 2020 Intel Corporation
- */
+#ifndef __SYSFS_GT_H__ +#define __SYSFS_GT_H__
+#include <linux/ctype.h> +#include <linux/kobject.h>
+#include "i915_gem.h" /* GEM_BUG_ON() */
+struct intel_gt;
+struct kobj_gt {
- struct kobject base;
- struct intel_gt *gt;
+};
+static inline bool is_object_gt(struct kobject *kobj) +{
- bool b = !strncmp(kobj->name, "gt", 2);
- GEM_BUG_ON(b && !isdigit(kobj->name[2]));
1) Not sure what is the point of this GEM_BUG_ON? Checking strncmp works feels like an overkill.
2) With the recent trend of "static inline considered harmful" perhaps consider moving it out of line.
- return b;
+}
+struct kobject * +intel_gt_create_kobj(struct intel_gt *gt,
struct kobject *dir,const char *name);+static inline struct intel_gt *kobj_to_gt(struct kobject *kobj) +{
- return container_of(kobj, struct kobj_gt, base)->gt;
+}
+void intel_gt_sysfs_register(struct intel_gt *gt); +struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev,
const char *name);+#endif /* SYSFS_GT_H */ diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt_pm.c b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file mode 100644 index 000000000000..6f4424be42d1 --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.c @@ -0,0 +1,393 @@ +// SPDX-License-Identifier: MIT +/*
- Copyright © 2020 Intel Corporation
- */
+#include <drm/drm_device.h> +#include <linux/sysfs.h> +#include <linux/printk.h>
+#include "i915_drv.h" +#include "intel_gt.h" +#include "intel_rc6.h" +#include "intel_rps.h" +#include "sysfs_gt.h" +#include "sysfs_gt_pm.h"
+#ifdef CONFIG_PM +static u32 get_residency(struct intel_gt *gt, i915_reg_t reg) +{
- intel_wakeref_t wakeref;
- u64 res = 0;
- with_intel_runtime_pm(gt->uncore->rpm, wakeref)
res = intel_rc6_residency_us(>->rc6, reg);- return DIV_ROUND_CLOSEST_ULL(res, 1000);
+}
+static ssize_t rc6_enable_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- u8 mask = 0;
- if (HAS_RC6(gt->i915))
mask |= BIT(0);- if (HAS_RC6p(gt->i915))
mask |= BIT(1);- if (HAS_RC6pp(gt->i915))
mask |= BIT(2);- return scnprintf(buff, PAGE_SIZE, "%x\n", mask);
+}
+static ssize_t rc6_residency_ms_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- u32 rc6_residency = get_residency(gt, GEN6_GT_GFX_RC6);
- return scnprintf(buff, PAGE_SIZE, "%u\n", rc6_residency);
+}
+static ssize_t rc6p_residency_ms_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- u32 rc6p_residency = get_residency(gt, GEN6_GT_GFX_RC6p);
- return scnprintf(buff, PAGE_SIZE, "%u\n", rc6p_residency);
+}
+static ssize_t rc6pp_residency_ms_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- u32 rc6pp_residency = get_residency(gt, GEN6_GT_GFX_RC6pp);
- return scnprintf(buff, PAGE_SIZE, "%u\n", rc6pp_residency);
+}
+static ssize_t media_rc6_residency_ms_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- u32 rc6_residency = get_residency(gt, VLV_GT_MEDIA_RC6);
- return scnprintf(buff, PAGE_SIZE, "%u\n", rc6_residency);
+}
+static DEVICE_ATTR_RO(rc6_enable); +static DEVICE_ATTR_RO(rc6_residency_ms); +static DEVICE_ATTR_RO(rc6p_residency_ms); +static DEVICE_ATTR_RO(rc6pp_residency_ms); +static DEVICE_ATTR_RO(media_rc6_residency_ms);
+static struct attribute *rc6_attrs[] = {
- &dev_attr_rc6_enable.attr,
- &dev_attr_rc6_residency_ms.attr,
- NULL
+};
+static struct attribute *rc6p_attrs[] = {
- &dev_attr_rc6p_residency_ms.attr,
- &dev_attr_rc6pp_residency_ms.attr,
- NULL
+};
+static struct attribute *media_rc6_attrs[] = {
- &dev_attr_media_rc6_residency_ms.attr,
- NULL
+};
+static const struct attribute_group rc6_attr_group[] = {
- { .name = power_group_name, .attrs = rc6_attrs },
- { .attrs = rc6_attrs }
+};
+static const struct attribute_group rc6p_attr_group[] = {
- { .name = power_group_name, .attrs = rc6p_attrs },
- { .attrs = rc6p_attrs }
+};
+static const struct attribute_group media_rc6_attr_group[] = {
- { .name = power_group_name, .attrs = media_rc6_attrs },
- { .attrs = media_rc6_attrs }
+};
+static int __intel_gt_sysfs_create_group(struct kobject *kobj,
const struct attribute_group *grp)+{
- int i = is_object_gt(kobj);
Is_object_gt returns a bool so can I be pedantic? :) Maybe just omit the local and solve it like that.
- return i ? sysfs_create_group(kobj, &grp[i]) :
sysfs_merge_group(kobj, &grp[i]);+}
+static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj) +{
- int ret;
- if (!HAS_RC6(gt->i915))
return;- ret = __intel_gt_sysfs_create_group(kobj, rc6_attr_group);
- if (ret)
drm_err(>->i915->drm,"failed to create gt%u RC6 sysfs files\n", gt->info.id);- if (HAS_RC6p(gt->i915)) {
ret = __intel_gt_sysfs_create_group(kobj, rc6p_attr_group);if (ret)drm_err(>->i915->drm,"failed to create gt%u RC6p sysfs files\n",gt->info.id);- }
- if (IS_VALLEYVIEW(gt->i915) || IS_CHERRYVIEW(gt->i915)) {
ret = __intel_gt_sysfs_create_group(kobj, media_rc6_attr_group);if (ret)drm_err(>->i915->drm,"failed to create media %u RC6 sysfs files\n",gt->info.id);- }
+} +#else +static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj) +{ +} +#endif /* CONFIG_PM */
+static ssize_t act_freq_mhz_show(struct device *dev,
struct device_attribute *attr, char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- return scnprintf(buff, PAGE_SIZE, "%d\n",
intel_rps_read_actual_frequency(>->rps));+}
+static ssize_t cur_freq_mhz_show(struct device *dev,
struct device_attribute *attr, char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- struct intel_rps *rps = >->rps;
- return scnprintf(buff, PAGE_SIZE, "%d\n",
intel_rps_get_requested_frequency(rps));+}
+static ssize_t boost_freq_mhz_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- struct intel_rps *rps = >->rps;
- return scnprintf(buff, PAGE_SIZE, "%d\n",
intel_rps_get_boost_frequency(rps));+}
+static ssize_t boost_freq_mhz_store(struct device *dev,
struct device_attribute *attr,const char *buff, size_t count)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- struct intel_rps *rps = >->rps;
- bool boost = false;
- ssize_t ret;
- u32 val;
- ret = kstrtou32(buff, 0, &val);
- if (ret)
return ret;- /* Validate against (static) hardware limits */
- val = intel_freq_opcode(rps, val);
- if (val < rps->min_freq || val > rps->max_freq)
return -EINVAL;- mutex_lock(&rps->lock);
- if (val != rps->boost_freq) {
rps->boost_freq = val;boost = atomic_read(&rps->num_waiters);- }
- mutex_unlock(&rps->lock);
- if (boost)
schedule_work(&rps->work);- return count;
+}
+static ssize_t vlv_rpe_freq_mhz_show(struct device *dev,
struct device_attribute *attr, char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- struct intel_rps *rps = >->rps;
- return scnprintf(buff, PAGE_SIZE, "%d\n",
intel_gpu_freq(rps, rps->efficient_freq));+}
+static ssize_t max_freq_mhz_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- struct intel_rps *rps = >->rps;
- return sysfs_emit(buff, "%d\n", intel_rps_get_max_frequency(rps));
+}
+static ssize_t max_freq_mhz_store(struct device *dev,
struct device_attribute *attr,const char *buff, size_t count)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- struct intel_rps *rps = >->rps;
- ssize_t ret;
- u32 val;
- ret = kstrtou32(buff, 0, &val);
- if (ret)
return ret;- ret = intel_rps_set_max_frequency(rps, val);
- return ret ?: count;
+}
+static ssize_t min_freq_mhz_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- struct intel_rps *rps = >->rps;
- return sysfs_emit(buff, "%d\n", intel_rps_get_min_frequency(rps));
+}
+static ssize_t min_freq_mhz_store(struct device *dev,
struct device_attribute *attr,const char *buff, size_t count)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- struct intel_rps *rps = >->rps;
- ssize_t ret;
- u32 val;
- ret = kstrtou32(buff, 0, &val);
- if (ret)
return ret;- ret = intel_rps_set_min_frequency(rps, val);
- return ret ?: count;
+}
+#define INTEL_GT_RPS_SYSFS_ATTR(_name, _mode, _show, _store) \
- struct device_attribute dev_attr_gt_##_name = __ATTR(gt_##_name, _mode, _show, _store); \
- struct device_attribute dev_attr_rps_##_name = __ATTR(rps_##_name, _mode, _show, _store)
+#define INTEL_GT_RPS_SYSFS_ATTR_RO(_name) \
INTEL_GT_RPS_SYSFS_ATTR(_name, 0444, _name##_show, NULL)+#define INTEL_GT_RPS_SYSFS_ATTR_RW(_name) \
INTEL_GT_RPS_SYSFS_ATTR(_name, 0644, _name##_show, _name##_store)+static INTEL_GT_RPS_SYSFS_ATTR_RO(act_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RO(cur_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RW(boost_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RW(max_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RW(min_freq_mhz);
+static DEVICE_ATTR_RO(vlv_rpe_freq_mhz);
+static ssize_t rps_rp_mhz_show(struct device *dev,
struct device_attribute *attr,char *buff);+static INTEL_GT_RPS_SYSFS_ATTR(RP0_freq_mhz, 0444, rps_rp_mhz_show, NULL); +static INTEL_GT_RPS_SYSFS_ATTR(RP1_freq_mhz, 0444, rps_rp_mhz_show, NULL); +static INTEL_GT_RPS_SYSFS_ATTR(RPn_freq_mhz, 0444, rps_rp_mhz_show, NULL);
+#define GEN6_ATTR(s) { \
&dev_attr_##s##_act_freq_mhz.attr, \&dev_attr_##s##_cur_freq_mhz.attr, \&dev_attr_##s##_boost_freq_mhz.attr, \&dev_attr_##s##_max_freq_mhz.attr, \&dev_attr_##s##_min_freq_mhz.attr, \&dev_attr_##s##_RP0_freq_mhz.attr, \&dev_attr_##s##_RP1_freq_mhz.attr, \&dev_attr_##s##_RPn_freq_mhz.attr, \NULL, \- }
+#define GEN6_RPS_ATTR GEN6_ATTR(rps) +#define GEN6_GT_ATTR GEN6_ATTR(gt)
+/* For now we have a static number of RP states */ +static ssize_t rps_rp_mhz_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
- struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);
- struct intel_rps *rps = >->rps;
- u32 val;
- if (attr == &dev_attr_gt_RP0_freq_mhz ||
attr == &dev_attr_rps_RP0_freq_mhz) {val = intel_rps_get_rp0_frequency(rps);- } else if (attr == &dev_attr_gt_RP1_freq_mhz ||
attr == &dev_attr_rps_RP1_freq_mhz) {val = intel_rps_get_rp1_frequency(rps);- } else if (attr == &dev_attr_gt_RPn_freq_mhz ||
attr == &dev_attr_rps_RPn_freq_mhz) {val = intel_rps_get_rpn_frequency(rps);- } else {
GEM_WARN_ON(1);return -ENODEV;- }
- return scnprintf(buff, PAGE_SIZE, "%d\n", val);
+}
+static const struct attribute * const gen6_rps_attrs[] = GEN6_RPS_ATTR; +static const struct attribute * const gen6_gt_attrs[] = GEN6_GT_ATTR;
+static int intel_sysfs_rps_init(struct intel_gt *gt, struct kobject *kobj,
const struct attribute * const *attrs)+{
- int ret;
- if (GRAPHICS_VER(gt->i915) < 6)
return 0;- ret = sysfs_create_files(kobj, attrs);
- if (ret)
return ret;- if (IS_VALLEYVIEW(gt->i915) || IS_CHERRYVIEW(gt->i915))
ret = sysfs_create_file(kobj, &dev_attr_vlv_rpe_freq_mhz.attr);- return ret;
+}
+void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj) +{
- int ret;
- intel_sysfs_rc6_init(gt, kobj);
- ret = is_object_gt(kobj) ?
intel_sysfs_rps_init(gt, kobj, gen6_rps_attrs) :intel_sysfs_rps_init(gt, kobj, gen6_gt_attrs);- if (ret)
drm_err(>->i915->drm,"failed to create gt%u RPS sysfs files", gt->info.id);+} diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt_pm.h b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.h new file mode 100644 index 000000000000..18c60d929e6d --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: MIT */ +/*
- Copyright © 2020 Intel Corporation
- */
+#ifndef __SYSFS_GT_PM_H__ +#define __SYSFS_GT_PM_H__
+#include <linux/kobject.h>
+#include "intel_gt_types.h"
+void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj); +void intel_gt_sysfs_pm_remove(struct intel_gt *gt, struct kobject *kobj);
+#endif /* SYSFS_RC6_H */ diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index ec76011366fb..f11acbc0990b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -989,6 +989,8 @@ struct drm_i915_private { #define I915_MAX_GT 4 struct intel_gt *gt[I915_MAX_GT];
- struct kobject *sysfs_gt;
- struct { struct i915_gem_contexts { spinlock_t lock; /* locks list */
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index ef6bc8180073..5153b3ff41e9 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -8480,6 +8480,7 @@ enum { #define GEN6_AGGRESSIVE_TURBO (0 << 15) #define GEN9_SW_REQ_UNSLICE_RATIO_SHIFT 23 #define GEN9_IGNORE_SLICE_RATIO (0 << 0) +#define GEN12_SW_REQ_UNSLICE_RATIO_SHIFT 23
Stray something?
#define GEN6_RC_VIDEO_FREQ _MMIO(0xA00C) #define GEN6_RC_CONTROL _MMIO(0xA090) diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index fae4d1f4f275..d6687e33f29d 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -38,113 +38,12 @@ #include "i915_sysfs.h" #include "intel_pm.h"
-static inline struct drm_i915_private *kdev_minor_to_i915(struct device *kdev) +struct drm_i915_private *kdev_minor_to_i915(struct device *kdev) { struct drm_minor *minor = dev_get_drvdata(kdev); return to_i915(minor->dev); }
-#ifdef CONFIG_PM -static u32 calc_residency(struct drm_i915_private *dev_priv,
i915_reg_t reg)-{
- intel_wakeref_t wakeref;
- u64 res = 0;
- with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref)
res = intel_rc6_residency_us(&to_gt(dev_priv)->rc6, reg);- return DIV_ROUND_CLOSEST_ULL(res, 1000);
-}
-static ssize_t rc6_enable_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
- struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);
- unsigned int mask;
- mask = 0;
- if (HAS_RC6(dev_priv))
mask |= BIT(0);- if (HAS_RC6p(dev_priv))
mask |= BIT(1);- if (HAS_RC6pp(dev_priv))
mask |= BIT(2);- return sysfs_emit(buf, "%x\n", mask);
-}
-static ssize_t rc6_residency_ms_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
- struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);
- u32 rc6_residency = calc_residency(dev_priv, GEN6_GT_GFX_RC6);
- return sysfs_emit(buf, "%u\n", rc6_residency);
-}
-static ssize_t rc6p_residency_ms_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
- struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);
- u32 rc6p_residency = calc_residency(dev_priv, GEN6_GT_GFX_RC6p);
- return sysfs_emit(buf, "%u\n", rc6p_residency);
-}
-static ssize_t rc6pp_residency_ms_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
- struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);
- u32 rc6pp_residency = calc_residency(dev_priv, GEN6_GT_GFX_RC6pp);
- return sysfs_emit(buf, "%u\n", rc6pp_residency);
-}
-static ssize_t media_rc6_residency_ms_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
- struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);
- u32 rc6_residency = calc_residency(dev_priv, VLV_GT_MEDIA_RC6);
- return sysfs_emit(buf, "%u\n", rc6_residency);
-}
-static DEVICE_ATTR_RO(rc6_enable); -static DEVICE_ATTR_RO(rc6_residency_ms); -static DEVICE_ATTR_RO(rc6p_residency_ms); -static DEVICE_ATTR_RO(rc6pp_residency_ms); -static DEVICE_ATTR_RO(media_rc6_residency_ms);
-static struct attribute *rc6_attrs[] = {
- &dev_attr_rc6_enable.attr,
- &dev_attr_rc6_residency_ms.attr,
- NULL
-};
-static const struct attribute_group rc6_attr_group = {
- .name = power_group_name,
- .attrs = rc6_attrs
-};
-static struct attribute *rc6p_attrs[] = {
- &dev_attr_rc6p_residency_ms.attr,
- &dev_attr_rc6pp_residency_ms.attr,
- NULL
-};
-static const struct attribute_group rc6p_attr_group = {
- .name = power_group_name,
- .attrs = rc6p_attrs
-};
-static struct attribute *media_rc6_attrs[] = {
- &dev_attr_media_rc6_residency_ms.attr,
- NULL
-};
-static const struct attribute_group media_rc6_attr_group = {
- .name = power_group_name,
- .attrs = media_rc6_attrs
-}; -#endif
- static int l3_access_valid(struct drm_i915_private *i915, loff_t offset) { if (!HAS_L3_DPF(i915))
@@ -256,171 +155,6 @@ static const struct bin_attribute dpf_attrs_1 = { .private = (void *)1 };
-static ssize_t gt_act_freq_mhz_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
- struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);
- struct intel_rps *rps = &to_gt(i915)->rps;
- return sysfs_emit(buf, "%d\n", intel_rps_read_actual_frequency(rps));
-}
-static ssize_t gt_cur_freq_mhz_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
- struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);
- struct intel_rps *rps = &to_gt(i915)->rps;
- return sysfs_emit(buf, "%d\n", intel_rps_get_requested_frequency(rps));
-}
-static ssize_t gt_boost_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{
- struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);
- struct intel_rps *rps = &to_gt(i915)->rps;
- return sysfs_emit(buf, "%d\n", intel_rps_get_boost_frequency(rps));
-}
-static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
struct device_attribute *attr,const char *buf, size_t count)-{
- struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);
- struct intel_rps *rps = &to_gt(dev_priv)->rps;
- ssize_t ret;
- u32 val;
- ret = kstrtou32(buf, 0, &val);
- if (ret)
return ret;- ret = intel_rps_set_boost_frequency(rps, val);
- return ret ?: count;
-}
-static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
- struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);
- struct intel_rps *rps = &to_gt(dev_priv)->rps;
- return sysfs_emit(buf, "%d\n", intel_gpu_freq(rps, rps->efficient_freq));
-}
-static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{
- struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);
- struct intel_gt *gt = to_gt(dev_priv);
- struct intel_rps *rps = >->rps;
- return sysfs_emit(buf, "%d\n", intel_rps_get_max_frequency(rps));
-}
-static ssize_t gt_max_freq_mhz_store(struct device *kdev,
struct device_attribute *attr,const char *buf, size_t count)-{
- struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);
- struct intel_gt *gt = to_gt(dev_priv);
- struct intel_rps *rps = >->rps;
- ssize_t ret;
- u32 val;
- ret = kstrtou32(buf, 0, &val);
- if (ret)
return ret;- ret = intel_rps_set_max_frequency(rps, val);
- return ret ?: count;
-}
-static ssize_t gt_min_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{
- struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);
- struct intel_gt *gt = to_gt(i915);
- struct intel_rps *rps = >->rps;
- return sysfs_emit(buf, "%d\n", intel_rps_get_min_frequency(rps));
-}
-static ssize_t gt_min_freq_mhz_store(struct device *kdev,
struct device_attribute *attr,const char *buf, size_t count)-{
- struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);
- struct intel_rps *rps = &to_gt(i915)->rps;
- ssize_t ret;
- u32 val;
- ret = kstrtou32(buf, 0, &val);
- if (ret)
return ret;- ret = intel_rps_set_min_frequency(rps, val);
- return ret ?: count;
-}
-static DEVICE_ATTR_RO(gt_act_freq_mhz); -static DEVICE_ATTR_RO(gt_cur_freq_mhz); -static DEVICE_ATTR_RW(gt_boost_freq_mhz); -static DEVICE_ATTR_RW(gt_max_freq_mhz); -static DEVICE_ATTR_RW(gt_min_freq_mhz);
-static DEVICE_ATTR_RO(vlv_rpe_freq_mhz);
-static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf); -static DEVICE_ATTR(gt_RP0_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL); -static DEVICE_ATTR(gt_RP1_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL); -static DEVICE_ATTR(gt_RPn_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL);
-/* For now we have a static number of RP states */ -static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{
- struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);
- struct intel_rps *rps = &to_gt(dev_priv)->rps;
- u32 val;
- if (attr == &dev_attr_gt_RP0_freq_mhz)
val = intel_rps_get_rp0_frequency(rps);- else if (attr == &dev_attr_gt_RP1_freq_mhz)
val = intel_rps_get_rp1_frequency(rps);- else if (attr == &dev_attr_gt_RPn_freq_mhz)
val = intel_rps_get_rpn_frequency(rps);- else
BUG();- return sysfs_emit(buf, "%d\n", val);
-}
-static const struct attribute * const gen6_attrs[] = {
- &dev_attr_gt_act_freq_mhz.attr,
- &dev_attr_gt_cur_freq_mhz.attr,
- &dev_attr_gt_boost_freq_mhz.attr,
- &dev_attr_gt_max_freq_mhz.attr,
- &dev_attr_gt_min_freq_mhz.attr,
- &dev_attr_gt_RP0_freq_mhz.attr,
- &dev_attr_gt_RP1_freq_mhz.attr,
- &dev_attr_gt_RPn_freq_mhz.attr,
- NULL,
-};
-static const struct attribute * const vlv_attrs[] = {
- &dev_attr_gt_act_freq_mhz.attr,
- &dev_attr_gt_cur_freq_mhz.attr,
- &dev_attr_gt_boost_freq_mhz.attr,
- &dev_attr_gt_max_freq_mhz.attr,
- &dev_attr_gt_min_freq_mhz.attr,
- &dev_attr_gt_RP0_freq_mhz.attr,
- &dev_attr_gt_RP1_freq_mhz.attr,
- &dev_attr_gt_RPn_freq_mhz.attr,
- &dev_attr_vlv_rpe_freq_mhz.attr,
- NULL,
-};
#if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
static ssize_t error_state_read(struct file *filp, struct kobject *kobj,
@@ -486,34 +220,16 @@ static void i915_setup_error_capture(struct device *kdev) {} static void i915_teardown_error_capture(struct device *kdev) {} #endif
+static struct kobject *i915_setup_gt_sysfs(struct kobject *parent) +{
- return kobject_create_and_add("gt", parent);
+}
- void i915_setup_sysfs(struct drm_i915_private *dev_priv) { struct device *kdev = dev_priv->drm.primary->kdev; int ret;
-#ifdef CONFIG_PM
- if (HAS_RC6(dev_priv)) {
ret = sysfs_merge_group(&kdev->kobj,&rc6_attr_group);if (ret)drm_err(&dev_priv->drm,"RC6 residency sysfs setup failed\n");- }
- if (HAS_RC6p(dev_priv)) {
ret = sysfs_merge_group(&kdev->kobj,&rc6p_attr_group);if (ret)drm_err(&dev_priv->drm,"RC6p residency sysfs setup failed\n");- }
- if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
ret = sysfs_merge_group(&kdev->kobj,&media_rc6_attr_group);if (ret)drm_err(&dev_priv->drm,"Media RC6 residency sysfs setup failed\n");- }
-#endif if (HAS_L3_DPF(dev_priv)) { ret = device_create_bin_file(kdev, &dpf_attrs); if (ret) @@ -529,13 +245,10 @@ void i915_setup_sysfs(struct drm_i915_private *dev_priv) } }
- ret = 0;
- if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
ret = sysfs_create_files(&kdev->kobj, vlv_attrs);- else if (GRAPHICS_VER(dev_priv) >= 6)
ret = sysfs_create_files(&kdev->kobj, gen6_attrs);- if (ret)
drm_err(&dev_priv->drm, "RPS sysfs setup failed\n");
dev_priv->sysfs_gt = i915_setup_gt_sysfs(&kdev->kobj);
if (!dev_priv->sysfs_gt)
drm_err(&dev_priv->drm,"failed to register GT sysfs directory\n");i915_setup_error_capture(kdev);
@@ -548,14 +261,6 @@ void i915_teardown_sysfs(struct drm_i915_private *dev_priv)
i915_teardown_error_capture(kdev);
- if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
sysfs_remove_files(&kdev->kobj, vlv_attrs);- else
sysfs_remove_files(&kdev->kobj, gen6_attrs);-#ifdef CONFIG_PM
- sysfs_unmerge_group(&kdev->kobj, &rc6_attr_group);
- sysfs_unmerge_group(&kdev->kobj, &rc6p_attr_group);
-#endif } diff --git a/drivers/gpu/drm/i915/i915_sysfs.h b/drivers/gpu/drm/i915/i915_sysfs.h index 41afd4366416..243a17741e3f 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.h +++ b/drivers/gpu/drm/i915/i915_sysfs.h @@ -6,8 +6,11 @@ #ifndef __I915_SYSFS_H__ #define __I915_SYSFS_H__
+struct device; struct drm_i915_private;
+struct drm_i915_private *kdev_minor_to_i915(struct device *kdev);
- void i915_setup_sysfs(struct drm_i915_private *i915); void i915_teardown_sysfs(struct drm_i915_private *i915);
Regards,
Tvrtko
Hi Tvrtko,
The previous power management files are kept in their original root directory to avoid breaking the ABI. They point to the tile '0' and a warning message is printed whenever accessed to. The deprecated interface needs for the CONFIG_SYSFS_DEPRECATED_V2 flag in order to be generated.
CONFIG_SYSFS_DEPRECATED_V2 idea was abandoned, no? This patch at least does not appear to contain it so please update the commit message to reflect current state.
Adding Joonas to help address the question of how strict are userspace requirements for sysfs additions. Personally sysadmin use sounds fine to me, although it needs to be mentioned/documented as Matt requested, but I fear it may not be enough to upstream. Is Level0 at the stage where we can upstream for it I am also not sure.
no need... it's a leftover in the commit message. The deprecated was removed a year ago, maybe. Thanks!
[...]
pr_devel_ratelimited(DEPRECATED"%s (pid %d) is trying to access deprecated %s ""sysfs control, please use gt/gt<n>/%s instead\n",Maybe reword "is trying to access" to "is accesing" to remove any doubt whether something is failing or not?
OK
[...]
- if (sysfs_create_file(dir, &dev_attr_id.attr))
drm_err(>->i915->drm,"failed to create sysfs %s info files\n", name);These drm_err could maybe be warn or notice, to reflect the fact driver is most likely completely functional? But only maybe since I haven't checked what we do for other sysfs failures. If rest are drm_err then I guess consistency trumps it.
yes, I agree with you and indeed they whould be treated as warnings because the driver probes correctly if sysfs fails.
I will change this to drm_warn and fixx all the others. Thanks!
[...]
+static inline bool is_object_gt(struct kobject *kobj) +{
- bool b = !strncmp(kobj->name, "gt", 2);
- GEM_BUG_ON(b && !isdigit(kobj->name[2]));
Not sure what is the point of this GEM_BUG_ON? Checking strncmp works feels like an overkill.
With the recent trend of "static inline considered harmful" perhaps consider moving it out of line.
OK
[...]
+static const struct attribute_group rc6_attr_group[] = {
- { .name = power_group_name, .attrs = rc6_attrs },
- { .attrs = rc6_attrs }
+};
+static const struct attribute_group rc6p_attr_group[] = {
- { .name = power_group_name, .attrs = rc6p_attrs },
- { .attrs = rc6p_attrs }
+};
+static const struct attribute_group media_rc6_attr_group[] = {
- { .name = power_group_name, .attrs = media_rc6_attrs },
- { .attrs = media_rc6_attrs }
+};
+static int __intel_gt_sysfs_create_group(struct kobject *kobj,
const struct attribute_group *grp)+{
- int i = is_object_gt(kobj);
Is_object_gt returns a bool so can I be pedantic? :) Maybe just omit the local and solve it like that.
'i' is used also as an array index here, and callse merge/create depending on what kind of object kobj is.
Maybe it's a bit of an ugly trick, but perhaps to mark the fact I can do it like
i = !!is_object_gt(kobj);
- return i ? sysfs_create_group(kobj, &grp[i]) :
sysfs_merge_group(kobj, &grp[i]);+}
+static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj) +{
- int ret;
- if (!HAS_RC6(gt->i915))
return;- ret = __intel_gt_sysfs_create_group(kobj, rc6_attr_group);
- if (ret)
drm_err(>->i915->drm,"failed to create gt%u RC6 sysfs files\n", gt->info.id);- if (HAS_RC6p(gt->i915)) {
ret = __intel_gt_sysfs_create_group(kobj, rc6p_attr_group);if (ret)drm_err(>->i915->drm,"failed to create gt%u RC6p sysfs files\n",gt->info.id);- }
- if (IS_VALLEYVIEW(gt->i915) || IS_CHERRYVIEW(gt->i915)) {
ret = __intel_gt_sysfs_create_group(kobj, media_rc6_attr_group);if (ret)drm_err(>->i915->drm,"failed to create media %u RC6 sysfs files\n",gt->info.id);- }
+}
[...]
+++ b/drivers/gpu/drm/i915/i915_reg.h @@ -8480,6 +8480,7 @@ enum { #define GEN6_AGGRESSIVE_TURBO (0 << 15) #define GEN9_SW_REQ_UNSLICE_RATIO_SHIFT 23 #define GEN9_IGNORE_SLICE_RATIO (0 << 0) +#define GEN12_SW_REQ_UNSLICE_RATIO_SHIFT 23
Stray something?
I don't know how this ended up here... scary!
Regards,
Tvrtko
Thanks a lot for looking again into this!
Andi
Quoting Tvrtko Ursulin (2022-01-17 18:02:50)
On 17/01/2022 15:09, Andi Shyti wrote:
The GT has its own properties and in sysfs they should be grouped in the 'gt/' directory.
Create a 'gt/' directory in sysfs which will contain gt0...gtN directories related to each tile configured in the GPU. Move the power management files inside those directories.
The previous power management files are kept in their original root directory to avoid breaking the ABI. They point to the tile '0' and a warning message is printed whenever accessed to.
This is wrong. They should act as multiplexers to all the tiles.
Needs to be fixed before merging.
The deprecated interface needs for the CONFIG_SYSFS_DEPRECATED_V2 flag in order to be generated.
CONFIG_SYSFS_DEPRECATED_V2 idea was abandoned, no? This patch at least does not appear to contain it so please update the commit message to reflect current state.
Adding Joonas to help address the question of how strict are userspace requirements for sysfs additions. Personally sysadmin use sounds fine to me, although it needs to be mentioned/documented as Matt requested, but I fear it may not be enough to upstream. Is Level0 at the stage where we can upstream for it I am also not sure.
Sysadmin usage is fine for the simple interfaces that can truly be used from the command line. This patch seems to just expose the existing interface in per-tile manner, so should not be a concern.
However, the controls not under gt directories, need to be converted to apply to all tiles. (I've definitely given that feedback multiple times). Otherwise it will be very unexpected to the end user when what previously applied to whole device would only apply to part of it.
Regards, Joonas
While I am here I also left some nits below (not full review).
The new sysfs structure will have a similar layout for the 4 tile case:
/sys/.../card0 \u251c\u2500\u2500 gt \u2502 \u251c\u2500\u2500 gt0 \u2502 \u2502 \u251c\u2500\u2500 id \u2502 \u2502 \u251c\u2500\u2500 rc6_enable \u2502 \u2502 \u251c\u2500\u2500 rc6_residency_ms \u2502 \u2502 \u251c\u2500\u2500 rps_act_freq_mhz \u2502 \u2502 \u251c\u2500\u2500 rps_boost_freq_mhz \u2502 \u2502 \u251c\u2500\u2500 rps_cur_freq_mhz \u2502 \u2502 \u251c\u2500\u2500 rps_max_freq_mhz \u2502 \u2502 \u251c\u2500\u2500 rps_min_freq_mhz \u2502 \u2502 \u251c\u2500\u2500 rps_RP0_freq_mhz \u2502 \u2502 \u251c\u2500\u2500 rps_RP1_freq_mhz \u2502 \u2502 \u2514\u2500\u2500 rps_RPn_freq_mhz . . . . . . \u2502 \u2514\u2500\u2500 gt3 \u2502 \u251c\u2500\u2500 id \u2502 \u251c\u2500\u2500 rc6_enable \u2502 \u251c\u2500\u2500 rc6_residency_ms \u2502 \u251c\u2500\u2500 rps_act_freq_mhz \u2502 \u251c\u2500\u2500 rps_boost_freq_mhz \u2502 \u251c\u2500\u2500 rps_cur_freq_mhz \u2502 \u251c\u2500\u2500 rps_max_freq_mhz \u2502 \u251c\u2500\u2500 rps_min_freq_mhz \u2502 \u251c\u2500\u2500 rps_RP0_freq_mhz \u2502 \u251c\u2500\u2500 rps_RP1_freq_mhz \u2502 \u2514\u2500\u2500 rps_RPn_freq_mhz \u251c\u2500\u2500 gt_act_freq_mhz -+ \u251c\u2500\u2500 gt_boost_freq_mhz | \u251c\u2500\u2500 gt_cur_freq_mhz | Original interface \u251c\u2500\u2500 gt_max_freq_mhz +\u2500-> kept as existing ABI; \u251c\u2500\u2500 gt_min_freq_mhz | it points to gt0/ \u251c\u2500\u2500 gt_RP0_freq_mhz | \u2514\u2500\u2500 gt_RP1_freq_mhz | \u2514\u2500\u2500 gt_RPn_freq_mhz -+
As soon as multitile platforms will start being supported, this interface will allow to control the power (either manually or with tools) on each tile, instead of affecting only tile 0 and getting incomplete results.
Signed-off-by: Andi Shyti andi.shyti@linux.intel.com Signed-off-by: Lucas De Marchi lucas.demarchi@intel.com Cc: Matt Roper matthew.d.roper@intel.com Cc: Sujaritha Sundaresan sujaritha.sundaresan@intel.com Cc: Tvrtko Ursulin tvrtko.ursulin@intel.com Reviewed-by: Sujaritha Sundaresan sujaritha.sundaresan@intel.com
drivers/gpu/drm/i915/Makefile | 4 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 + drivers/gpu/drm/i915/gt/sysfs_gt.c | 126 +++++++++ drivers/gpu/drm/i915/gt/sysfs_gt.h | 44 +++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.c | 393 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.h | 16 ++ drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/i915_sysfs.c | 315 +-------------------- drivers/gpu/drm/i915/i915_sysfs.h | 3 + 10 files changed, 600 insertions(+), 306 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt.c create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt.h create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt_pm.c create mode 100644 drivers/gpu/drm/i915/gt/sysfs_gt_pm.h
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index aa86ac33effc..5fd203c626fc 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -121,7 +121,9 @@ gt-y += \ gt/intel_timeline.o \ gt/intel_workarounds.o \ gt/shmem_utils.o \
gt/sysfs_engines.o
gt/sysfs_engines.o \gt/sysfs_gt.o \gt/sysfs_gt_pm.odiff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index 17927da9e23e..2584c51c1c14 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -25,6 +25,7 @@ #include "intel_rps.h" #include "intel_uncore.h" #include "shmem_utils.h" +#include "sysfs_gt.h" #include "pxp/intel_pxp.h"
static void @@ -453,6 +454,7 @@ void intel_gt_driver_register(struct intel_gt *gt) intel_rps_driver_register(>->rps);
intel_gt_debugfs_register(gt);
intel_gt_sysfs_register(gt);}
static int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)
diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt.c b/drivers/gpu/drm/i915/gt/sysfs_gt.c new file mode 100644 index 000000000000..46cf033a53ec --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt.c @@ -0,0 +1,126 @@ +// SPDX-License-Identifier: MIT +/*
- Copyright © 2020 Intel Corporation
- */
+#include <drm/drm_device.h> +#include <linux/device.h> +#include <linux/kobject.h> +#include <linux/printk.h> +#include <linux/sysfs.h>
+#include "i915_drv.h" +#include "i915_sysfs.h" +#include "intel_gt.h" +#include "intel_gt_types.h" +#include "intel_rc6.h"
+#include "sysfs_gt.h" +#include "sysfs_gt_pm.h"
+struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev,
const char *name)+{
struct kobject *kobj = &dev->kobj;/** We are interested at knowing from where the interface* has been called, whether it's called from gt/ or from* the parent directory.* From the interface position it depends also the value of* the private data.* If the interface is called from gt/ then private data is* of the "struct intel_gt *" type, otherwise it's * a* "struct drm_i915_private *" type.*/if (!is_object_gt(kobj)) {struct drm_i915_private *i915 = kdev_minor_to_i915(dev);pr_devel_ratelimited(DEPRECATED"%s (pid %d) is trying to access deprecated %s ""sysfs control, please use gt/gt<n>/%s instead\n",Maybe reword "is trying to access" to "is accesing" to remove any doubt whether something is failing or not?
current->comm, task_pid_nr(current), name, name);return to_gt(i915);}return kobj_to_gt(kobj);+}
+static struct kobject *gt_get_parent_obj(struct intel_gt *gt) +{
return >->i915->drm.primary->kdev->kobj;+}
+static ssize_t id_show(struct device *dev,
struct device_attribute *attr,char *buf)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);return sysfs_emit(buf, "%u\n", gt->info.id);+}
+static DEVICE_ATTR_RO(id);
+static void kobj_gt_release(struct kobject *kobj) +{
kfree(kobj);+}
+static struct kobj_type kobj_gt_type = {
.release = kobj_gt_release,.sysfs_ops = &kobj_sysfs_ops+};
+struct kobject * +intel_gt_create_kobj(struct intel_gt *gt, struct kobject *dir, const char *name) +{
struct kobj_gt *kg;kg = kzalloc(sizeof(*kg), GFP_KERNEL);if (!kg)return NULL;kobject_init(&kg->base, &kobj_gt_type);kg->gt = gt;/* xfer ownership to sysfs tree */if (kobject_add(&kg->base, dir, "%s", name)) {kobject_put(&kg->base);return NULL;}return &kg->base; /* borrowed ref */+}
+void intel_gt_sysfs_register(struct intel_gt *gt) +{
struct kobject *dir;char name[80];/** We need to make things right with the* ABI compatibility. The files were originally* generated under the parent directory.** We generate the files only for gt 0* to avoid duplicates.*/if (!gt->info.id)intel_gt_sysfs_pm_init(gt, gt_get_parent_obj(gt));snprintf(name, sizeof(name), "gt%d", gt->info.id);dir = intel_gt_create_kobj(gt, gt->i915->sysfs_gt, name);if (!dir) {drm_err(>->i915->drm,"failed to initialize %s sysfs root\n", name);return;}if (sysfs_create_file(dir, &dev_attr_id.attr))drm_err(>->i915->drm,"failed to create sysfs %s info files\n", name);These drm_err could maybe be warn or notice, to reflect the fact driver is most likely completely functional? But only maybe since I haven't checked what we do for other sysfs failures. If rest are drm_err then I guess consistency trumps it.
intel_gt_sysfs_pm_init(gt, dir);+} diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt.h b/drivers/gpu/drm/i915/gt/sysfs_gt.h new file mode 100644 index 000000000000..cd80a14bb14d --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: MIT */ +/*
- Copyright © 2020 Intel Corporation
- */
+#ifndef __SYSFS_GT_H__ +#define __SYSFS_GT_H__
+#include <linux/ctype.h> +#include <linux/kobject.h>
+#include "i915_gem.h" /* GEM_BUG_ON() */
+struct intel_gt;
+struct kobj_gt {
struct kobject base;struct intel_gt *gt;+};
+static inline bool is_object_gt(struct kobject *kobj) +{
bool b = !strncmp(kobj->name, "gt", 2);GEM_BUG_ON(b && !isdigit(kobj->name[2]));
Not sure what is the point of this GEM_BUG_ON? Checking strncmp works feels like an overkill.
With the recent trend of "static inline considered harmful" perhaps consider moving it out of line.
return b;+}
+struct kobject * +intel_gt_create_kobj(struct intel_gt *gt,
struct kobject *dir,const char *name);+static inline struct intel_gt *kobj_to_gt(struct kobject *kobj) +{
return container_of(kobj, struct kobj_gt, base)->gt;+}
+void intel_gt_sysfs_register(struct intel_gt *gt); +struct intel_gt *intel_gt_sysfs_get_drvdata(struct device *dev,
const char *name);+#endif /* SYSFS_GT_H */ diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt_pm.c b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file mode 100644 index 000000000000..6f4424be42d1 --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.c @@ -0,0 +1,393 @@ +// SPDX-License-Identifier: MIT +/*
- Copyright © 2020 Intel Corporation
- */
+#include <drm/drm_device.h> +#include <linux/sysfs.h> +#include <linux/printk.h>
+#include "i915_drv.h" +#include "intel_gt.h" +#include "intel_rc6.h" +#include "intel_rps.h" +#include "sysfs_gt.h" +#include "sysfs_gt_pm.h"
+#ifdef CONFIG_PM +static u32 get_residency(struct intel_gt *gt, i915_reg_t reg) +{
intel_wakeref_t wakeref;u64 res = 0;with_intel_runtime_pm(gt->uncore->rpm, wakeref)res = intel_rc6_residency_us(>->rc6, reg);return DIV_ROUND_CLOSEST_ULL(res, 1000);+}
+static ssize_t rc6_enable_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);u8 mask = 0;if (HAS_RC6(gt->i915))mask |= BIT(0);if (HAS_RC6p(gt->i915))mask |= BIT(1);if (HAS_RC6pp(gt->i915))mask |= BIT(2);return scnprintf(buff, PAGE_SIZE, "%x\n", mask);+}
+static ssize_t rc6_residency_ms_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);u32 rc6_residency = get_residency(gt, GEN6_GT_GFX_RC6);return scnprintf(buff, PAGE_SIZE, "%u\n", rc6_residency);+}
+static ssize_t rc6p_residency_ms_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);u32 rc6p_residency = get_residency(gt, GEN6_GT_GFX_RC6p);return scnprintf(buff, PAGE_SIZE, "%u\n", rc6p_residency);+}
+static ssize_t rc6pp_residency_ms_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);u32 rc6pp_residency = get_residency(gt, GEN6_GT_GFX_RC6pp);return scnprintf(buff, PAGE_SIZE, "%u\n", rc6pp_residency);+}
+static ssize_t media_rc6_residency_ms_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);u32 rc6_residency = get_residency(gt, VLV_GT_MEDIA_RC6);return scnprintf(buff, PAGE_SIZE, "%u\n", rc6_residency);+}
+static DEVICE_ATTR_RO(rc6_enable); +static DEVICE_ATTR_RO(rc6_residency_ms); +static DEVICE_ATTR_RO(rc6p_residency_ms); +static DEVICE_ATTR_RO(rc6pp_residency_ms); +static DEVICE_ATTR_RO(media_rc6_residency_ms);
+static struct attribute *rc6_attrs[] = {
&dev_attr_rc6_enable.attr,&dev_attr_rc6_residency_ms.attr,NULL+};
+static struct attribute *rc6p_attrs[] = {
&dev_attr_rc6p_residency_ms.attr,&dev_attr_rc6pp_residency_ms.attr,NULL+};
+static struct attribute *media_rc6_attrs[] = {
&dev_attr_media_rc6_residency_ms.attr,NULL+};
+static const struct attribute_group rc6_attr_group[] = {
{ .name = power_group_name, .attrs = rc6_attrs },{ .attrs = rc6_attrs }+};
+static const struct attribute_group rc6p_attr_group[] = {
{ .name = power_group_name, .attrs = rc6p_attrs },{ .attrs = rc6p_attrs }+};
+static const struct attribute_group media_rc6_attr_group[] = {
{ .name = power_group_name, .attrs = media_rc6_attrs },{ .attrs = media_rc6_attrs }+};
+static int __intel_gt_sysfs_create_group(struct kobject *kobj,
const struct attribute_group *grp)+{
int i = is_object_gt(kobj);Is_object_gt returns a bool so can I be pedantic? :) Maybe just omit the local and solve it like that.
return i ? sysfs_create_group(kobj, &grp[i]) :sysfs_merge_group(kobj, &grp[i]);+}
+static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj) +{
int ret;if (!HAS_RC6(gt->i915))return;ret = __intel_gt_sysfs_create_group(kobj, rc6_attr_group);if (ret)drm_err(>->i915->drm,"failed to create gt%u RC6 sysfs files\n", gt->info.id);if (HAS_RC6p(gt->i915)) {ret = __intel_gt_sysfs_create_group(kobj, rc6p_attr_group);if (ret)drm_err(>->i915->drm,"failed to create gt%u RC6p sysfs files\n",gt->info.id);}if (IS_VALLEYVIEW(gt->i915) || IS_CHERRYVIEW(gt->i915)) {ret = __intel_gt_sysfs_create_group(kobj, media_rc6_attr_group);if (ret)drm_err(>->i915->drm,"failed to create media %u RC6 sysfs files\n",gt->info.id);}+} +#else +static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj) +{ +} +#endif /* CONFIG_PM */
+static ssize_t act_freq_mhz_show(struct device *dev,
struct device_attribute *attr, char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);return scnprintf(buff, PAGE_SIZE, "%d\n",intel_rps_read_actual_frequency(>->rps));+}
+static ssize_t cur_freq_mhz_show(struct device *dev,
struct device_attribute *attr, char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);struct intel_rps *rps = >->rps;return scnprintf(buff, PAGE_SIZE, "%d\n",intel_rps_get_requested_frequency(rps));+}
+static ssize_t boost_freq_mhz_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);struct intel_rps *rps = >->rps;return scnprintf(buff, PAGE_SIZE, "%d\n",intel_rps_get_boost_frequency(rps));+}
+static ssize_t boost_freq_mhz_store(struct device *dev,
struct device_attribute *attr,const char *buff, size_t count)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);struct intel_rps *rps = >->rps;bool boost = false;ssize_t ret;u32 val;ret = kstrtou32(buff, 0, &val);if (ret)return ret;/* Validate against (static) hardware limits */val = intel_freq_opcode(rps, val);if (val < rps->min_freq || val > rps->max_freq)return -EINVAL;mutex_lock(&rps->lock);if (val != rps->boost_freq) {rps->boost_freq = val;boost = atomic_read(&rps->num_waiters);}mutex_unlock(&rps->lock);if (boost)schedule_work(&rps->work);return count;+}
+static ssize_t vlv_rpe_freq_mhz_show(struct device *dev,
struct device_attribute *attr, char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);struct intel_rps *rps = >->rps;return scnprintf(buff, PAGE_SIZE, "%d\n",intel_gpu_freq(rps, rps->efficient_freq));+}
+static ssize_t max_freq_mhz_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);struct intel_rps *rps = >->rps;return sysfs_emit(buff, "%d\n", intel_rps_get_max_frequency(rps));+}
+static ssize_t max_freq_mhz_store(struct device *dev,
struct device_attribute *attr,const char *buff, size_t count)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);struct intel_rps *rps = >->rps;ssize_t ret;u32 val;ret = kstrtou32(buff, 0, &val);if (ret)return ret;ret = intel_rps_set_max_frequency(rps, val);return ret ?: count;+}
+static ssize_t min_freq_mhz_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);struct intel_rps *rps = >->rps;return sysfs_emit(buff, "%d\n", intel_rps_get_min_frequency(rps));+}
+static ssize_t min_freq_mhz_store(struct device *dev,
struct device_attribute *attr,const char *buff, size_t count)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);struct intel_rps *rps = >->rps;ssize_t ret;u32 val;ret = kstrtou32(buff, 0, &val);if (ret)return ret;ret = intel_rps_set_min_frequency(rps, val);return ret ?: count;+}
+#define INTEL_GT_RPS_SYSFS_ATTR(_name, _mode, _show, _store) \
struct device_attribute dev_attr_gt_##_name = __ATTR(gt_##_name, _mode, _show, _store); \struct device_attribute dev_attr_rps_##_name = __ATTR(rps_##_name, _mode, _show, _store)+#define INTEL_GT_RPS_SYSFS_ATTR_RO(_name) \
INTEL_GT_RPS_SYSFS_ATTR(_name, 0444, _name##_show, NULL)+#define INTEL_GT_RPS_SYSFS_ATTR_RW(_name) \
INTEL_GT_RPS_SYSFS_ATTR(_name, 0644, _name##_show, _name##_store)+static INTEL_GT_RPS_SYSFS_ATTR_RO(act_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RO(cur_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RW(boost_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RW(max_freq_mhz); +static INTEL_GT_RPS_SYSFS_ATTR_RW(min_freq_mhz);
+static DEVICE_ATTR_RO(vlv_rpe_freq_mhz);
+static ssize_t rps_rp_mhz_show(struct device *dev,
struct device_attribute *attr,char *buff);+static INTEL_GT_RPS_SYSFS_ATTR(RP0_freq_mhz, 0444, rps_rp_mhz_show, NULL); +static INTEL_GT_RPS_SYSFS_ATTR(RP1_freq_mhz, 0444, rps_rp_mhz_show, NULL); +static INTEL_GT_RPS_SYSFS_ATTR(RPn_freq_mhz, 0444, rps_rp_mhz_show, NULL);
+#define GEN6_ATTR(s) { \
&dev_attr_##s##_act_freq_mhz.attr, \&dev_attr_##s##_cur_freq_mhz.attr, \&dev_attr_##s##_boost_freq_mhz.attr, \&dev_attr_##s##_max_freq_mhz.attr, \&dev_attr_##s##_min_freq_mhz.attr, \&dev_attr_##s##_RP0_freq_mhz.attr, \&dev_attr_##s##_RP1_freq_mhz.attr, \&dev_attr_##s##_RPn_freq_mhz.attr, \NULL, \}+#define GEN6_RPS_ATTR GEN6_ATTR(rps) +#define GEN6_GT_ATTR GEN6_ATTR(gt)
+/* For now we have a static number of RP states */ +static ssize_t rps_rp_mhz_show(struct device *dev,
struct device_attribute *attr,char *buff)+{
struct intel_gt *gt = intel_gt_sysfs_get_drvdata(dev, attr->attr.name);struct intel_rps *rps = >->rps;u32 val;if (attr == &dev_attr_gt_RP0_freq_mhz ||attr == &dev_attr_rps_RP0_freq_mhz) {val = intel_rps_get_rp0_frequency(rps);} else if (attr == &dev_attr_gt_RP1_freq_mhz ||attr == &dev_attr_rps_RP1_freq_mhz) {val = intel_rps_get_rp1_frequency(rps);} else if (attr == &dev_attr_gt_RPn_freq_mhz ||attr == &dev_attr_rps_RPn_freq_mhz) {val = intel_rps_get_rpn_frequency(rps);} else {GEM_WARN_ON(1);return -ENODEV;}return scnprintf(buff, PAGE_SIZE, "%d\n", val);+}
+static const struct attribute * const gen6_rps_attrs[] = GEN6_RPS_ATTR; +static const struct attribute * const gen6_gt_attrs[] = GEN6_GT_ATTR;
+static int intel_sysfs_rps_init(struct intel_gt *gt, struct kobject *kobj,
const struct attribute * const *attrs)+{
int ret;if (GRAPHICS_VER(gt->i915) < 6)return 0;ret = sysfs_create_files(kobj, attrs);if (ret)return ret;if (IS_VALLEYVIEW(gt->i915) || IS_CHERRYVIEW(gt->i915))ret = sysfs_create_file(kobj, &dev_attr_vlv_rpe_freq_mhz.attr);return ret;+}
+void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj) +{
int ret;intel_sysfs_rc6_init(gt, kobj);ret = is_object_gt(kobj) ?intel_sysfs_rps_init(gt, kobj, gen6_rps_attrs) :intel_sysfs_rps_init(gt, kobj, gen6_gt_attrs);if (ret)drm_err(>->i915->drm,"failed to create gt%u RPS sysfs files", gt->info.id);+} diff --git a/drivers/gpu/drm/i915/gt/sysfs_gt_pm.h b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.h new file mode 100644 index 000000000000..18c60d929e6d --- /dev/null +++ b/drivers/gpu/drm/i915/gt/sysfs_gt_pm.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: MIT */ +/*
- Copyright © 2020 Intel Corporation
- */
+#ifndef __SYSFS_GT_PM_H__ +#define __SYSFS_GT_PM_H__
+#include <linux/kobject.h>
+#include "intel_gt_types.h"
+void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj); +void intel_gt_sysfs_pm_remove(struct intel_gt *gt, struct kobject *kobj);
+#endif /* SYSFS_RC6_H */ diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index ec76011366fb..f11acbc0990b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -989,6 +989,8 @@ struct drm_i915_private { #define I915_MAX_GT 4 struct intel_gt *gt[I915_MAX_GT];
struct kobject *sysfs_gt;struct { struct i915_gem_contexts { spinlock_t lock; /* locks list */diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index ef6bc8180073..5153b3ff41e9 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -8480,6 +8480,7 @@ enum { #define GEN6_AGGRESSIVE_TURBO (0 << 15) #define GEN9_SW_REQ_UNSLICE_RATIO_SHIFT 23 #define GEN9_IGNORE_SLICE_RATIO (0 << 0) +#define GEN12_SW_REQ_UNSLICE_RATIO_SHIFT 23
Stray something?
#define GEN6_RC_VIDEO_FREQ _MMIO(0xA00C) #define GEN6_RC_CONTROL _MMIO(0xA090) diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index fae4d1f4f275..d6687e33f29d 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -38,113 +38,12 @@ #include "i915_sysfs.h" #include "intel_pm.h"
-static inline struct drm_i915_private *kdev_minor_to_i915(struct device *kdev) +struct drm_i915_private *kdev_minor_to_i915(struct device *kdev) { struct drm_minor *minor = dev_get_drvdata(kdev); return to_i915(minor->dev); }
-#ifdef CONFIG_PM -static u32 calc_residency(struct drm_i915_private *dev_priv,
i915_reg_t reg)-{
intel_wakeref_t wakeref;u64 res = 0;with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref)res = intel_rc6_residency_us(&to_gt(dev_priv)->rc6, reg);return DIV_ROUND_CLOSEST_ULL(res, 1000);-}
-static ssize_t rc6_enable_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);unsigned int mask;mask = 0;if (HAS_RC6(dev_priv))mask |= BIT(0);if (HAS_RC6p(dev_priv))mask |= BIT(1);if (HAS_RC6pp(dev_priv))mask |= BIT(2);return sysfs_emit(buf, "%x\n", mask);-}
-static ssize_t rc6_residency_ms_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);u32 rc6_residency = calc_residency(dev_priv, GEN6_GT_GFX_RC6);return sysfs_emit(buf, "%u\n", rc6_residency);-}
-static ssize_t rc6p_residency_ms_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);u32 rc6p_residency = calc_residency(dev_priv, GEN6_GT_GFX_RC6p);return sysfs_emit(buf, "%u\n", rc6p_residency);-}
-static ssize_t rc6pp_residency_ms_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);u32 rc6pp_residency = calc_residency(dev_priv, GEN6_GT_GFX_RC6pp);return sysfs_emit(buf, "%u\n", rc6pp_residency);-}
-static ssize_t media_rc6_residency_ms_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);u32 rc6_residency = calc_residency(dev_priv, VLV_GT_MEDIA_RC6);return sysfs_emit(buf, "%u\n", rc6_residency);-}
-static DEVICE_ATTR_RO(rc6_enable); -static DEVICE_ATTR_RO(rc6_residency_ms); -static DEVICE_ATTR_RO(rc6p_residency_ms); -static DEVICE_ATTR_RO(rc6pp_residency_ms); -static DEVICE_ATTR_RO(media_rc6_residency_ms);
-static struct attribute *rc6_attrs[] = {
&dev_attr_rc6_enable.attr,&dev_attr_rc6_residency_ms.attr,NULL-};
-static const struct attribute_group rc6_attr_group = {
.name = power_group_name,.attrs = rc6_attrs-};
-static struct attribute *rc6p_attrs[] = {
&dev_attr_rc6p_residency_ms.attr,&dev_attr_rc6pp_residency_ms.attr,NULL-};
-static const struct attribute_group rc6p_attr_group = {
.name = power_group_name,.attrs = rc6p_attrs-};
-static struct attribute *media_rc6_attrs[] = {
&dev_attr_media_rc6_residency_ms.attr,NULL-};
-static const struct attribute_group media_rc6_attr_group = {
.name = power_group_name,.attrs = media_rc6_attrs-}; -#endif
- static int l3_access_valid(struct drm_i915_private *i915, loff_t offset) { if (!HAS_L3_DPF(i915))
@@ -256,171 +155,6 @@ static const struct bin_attribute dpf_attrs_1 = { .private = (void *)1 };
-static ssize_t gt_act_freq_mhz_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);struct intel_rps *rps = &to_gt(i915)->rps;return sysfs_emit(buf, "%d\n", intel_rps_read_actual_frequency(rps));-}
-static ssize_t gt_cur_freq_mhz_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);struct intel_rps *rps = &to_gt(i915)->rps;return sysfs_emit(buf, "%d\n", intel_rps_get_requested_frequency(rps));-}
-static ssize_t gt_boost_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{
struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);struct intel_rps *rps = &to_gt(i915)->rps;return sysfs_emit(buf, "%d\n", intel_rps_get_boost_frequency(rps));-}
-static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
struct device_attribute *attr,const char *buf, size_t count)-{
struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);struct intel_rps *rps = &to_gt(dev_priv)->rps;ssize_t ret;u32 val;ret = kstrtou32(buf, 0, &val);if (ret)return ret;ret = intel_rps_set_boost_frequency(rps, val);return ret ?: count;-}
-static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,
struct device_attribute *attr, char *buf)-{
struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);struct intel_rps *rps = &to_gt(dev_priv)->rps;return sysfs_emit(buf, "%d\n", intel_gpu_freq(rps, rps->efficient_freq));-}
-static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{
struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);struct intel_gt *gt = to_gt(dev_priv);struct intel_rps *rps = >->rps;return sysfs_emit(buf, "%d\n", intel_rps_get_max_frequency(rps));-}
-static ssize_t gt_max_freq_mhz_store(struct device *kdev,
struct device_attribute *attr,const char *buf, size_t count)-{
struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);struct intel_gt *gt = to_gt(dev_priv);struct intel_rps *rps = >->rps;ssize_t ret;u32 val;ret = kstrtou32(buf, 0, &val);if (ret)return ret;ret = intel_rps_set_max_frequency(rps, val);return ret ?: count;-}
-static ssize_t gt_min_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{
struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);struct intel_gt *gt = to_gt(i915);struct intel_rps *rps = >->rps;return sysfs_emit(buf, "%d\n", intel_rps_get_min_frequency(rps));-}
-static ssize_t gt_min_freq_mhz_store(struct device *kdev,
struct device_attribute *attr,const char *buf, size_t count)-{
struct drm_i915_private *i915 = kdev_minor_to_i915(kdev);struct intel_rps *rps = &to_gt(i915)->rps;ssize_t ret;u32 val;ret = kstrtou32(buf, 0, &val);if (ret)return ret;ret = intel_rps_set_min_frequency(rps, val);return ret ?: count;-}
-static DEVICE_ATTR_RO(gt_act_freq_mhz); -static DEVICE_ATTR_RO(gt_cur_freq_mhz); -static DEVICE_ATTR_RW(gt_boost_freq_mhz); -static DEVICE_ATTR_RW(gt_max_freq_mhz); -static DEVICE_ATTR_RW(gt_min_freq_mhz);
-static DEVICE_ATTR_RO(vlv_rpe_freq_mhz);
-static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf); -static DEVICE_ATTR(gt_RP0_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL); -static DEVICE_ATTR(gt_RP1_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL); -static DEVICE_ATTR(gt_RPn_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL);
-/* For now we have a static number of RP states */ -static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) -{
struct drm_i915_private *dev_priv = kdev_minor_to_i915(kdev);struct intel_rps *rps = &to_gt(dev_priv)->rps;u32 val;if (attr == &dev_attr_gt_RP0_freq_mhz)val = intel_rps_get_rp0_frequency(rps);else if (attr == &dev_attr_gt_RP1_freq_mhz)val = intel_rps_get_rp1_frequency(rps);else if (attr == &dev_attr_gt_RPn_freq_mhz)val = intel_rps_get_rpn_frequency(rps);elseBUG();return sysfs_emit(buf, "%d\n", val);-}
-static const struct attribute * const gen6_attrs[] = {
&dev_attr_gt_act_freq_mhz.attr,&dev_attr_gt_cur_freq_mhz.attr,&dev_attr_gt_boost_freq_mhz.attr,&dev_attr_gt_max_freq_mhz.attr,&dev_attr_gt_min_freq_mhz.attr,&dev_attr_gt_RP0_freq_mhz.attr,&dev_attr_gt_RP1_freq_mhz.attr,&dev_attr_gt_RPn_freq_mhz.attr,NULL,-};
-static const struct attribute * const vlv_attrs[] = {
&dev_attr_gt_act_freq_mhz.attr,&dev_attr_gt_cur_freq_mhz.attr,&dev_attr_gt_boost_freq_mhz.attr,&dev_attr_gt_max_freq_mhz.attr,&dev_attr_gt_min_freq_mhz.attr,&dev_attr_gt_RP0_freq_mhz.attr,&dev_attr_gt_RP1_freq_mhz.attr,&dev_attr_gt_RPn_freq_mhz.attr,&dev_attr_vlv_rpe_freq_mhz.attr,NULL,-};
#if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)
static ssize_t error_state_read(struct file *filp, struct kobject *kobj,
@@ -486,34 +220,16 @@ static void i915_setup_error_capture(struct device *kdev) {} static void i915_teardown_error_capture(struct device *kdev) {} #endif
+static struct kobject *i915_setup_gt_sysfs(struct kobject *parent) +{
return kobject_create_and_add("gt", parent);+}
- void i915_setup_sysfs(struct drm_i915_private *dev_priv) { struct device *kdev = dev_priv->drm.primary->kdev; int ret;
-#ifdef CONFIG_PM
if (HAS_RC6(dev_priv)) {ret = sysfs_merge_group(&kdev->kobj,&rc6_attr_group);if (ret)drm_err(&dev_priv->drm,"RC6 residency sysfs setup failed\n");}if (HAS_RC6p(dev_priv)) {ret = sysfs_merge_group(&kdev->kobj,&rc6p_attr_group);if (ret)drm_err(&dev_priv->drm,"RC6p residency sysfs setup failed\n");}if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {ret = sysfs_merge_group(&kdev->kobj,&media_rc6_attr_group);if (ret)drm_err(&dev_priv->drm,"Media RC6 residency sysfs setup failed\n");}-#endif if (HAS_L3_DPF(dev_priv)) { ret = device_create_bin_file(kdev, &dpf_attrs); if (ret) @@ -529,13 +245,10 @@ void i915_setup_sysfs(struct drm_i915_private *dev_priv) } }
ret = 0;if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))ret = sysfs_create_files(&kdev->kobj, vlv_attrs);else if (GRAPHICS_VER(dev_priv) >= 6)ret = sysfs_create_files(&kdev->kobj, gen6_attrs);if (ret)drm_err(&dev_priv->drm, "RPS sysfs setup failed\n");
dev_priv->sysfs_gt = i915_setup_gt_sysfs(&kdev->kobj);if (!dev_priv->sysfs_gt)drm_err(&dev_priv->drm,"failed to register GT sysfs directory\n"); i915_setup_error_capture(kdev);@@ -548,14 +261,6 @@ void i915_teardown_sysfs(struct drm_i915_private *dev_priv)
i915_teardown_error_capture(kdev);
if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))sysfs_remove_files(&kdev->kobj, vlv_attrs);elsesysfs_remove_files(&kdev->kobj, gen6_attrs); device_remove_bin_file(kdev, &dpf_attrs_1); device_remove_bin_file(kdev, &dpf_attrs);-#ifdef CONFIG_PM
sysfs_unmerge_group(&kdev->kobj, &rc6_attr_group);sysfs_unmerge_group(&kdev->kobj, &rc6p_attr_group);-#endif } diff --git a/drivers/gpu/drm/i915/i915_sysfs.h b/drivers/gpu/drm/i915/i915_sysfs.h index 41afd4366416..243a17741e3f 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.h +++ b/drivers/gpu/drm/i915/i915_sysfs.h @@ -6,8 +6,11 @@ #ifndef __I915_SYSFS_H__ #define __I915_SYSFS_H__
+struct device; struct drm_i915_private;
+struct drm_i915_private *kdev_minor_to_i915(struct device *kdev);
- void i915_setup_sysfs(struct drm_i915_private *i915); void i915_teardown_sysfs(struct drm_i915_private *i915);
Regards,
Tvrtko
Hi Joonas,
The GT has its own properties and in sysfs they should be grouped in the 'gt/' directory.
Create a 'gt/' directory in sysfs which will contain gt0...gtN directories related to each tile configured in the GPU. Move the power management files inside those directories.
The previous power management files are kept in their original root directory to avoid breaking the ABI. They point to the tile '0' and a warning message is printed whenever accessed to.
This is wrong. They should act as multiplexers to all the tiles.
Needs to be fixed before merging.
I have a patch for this and I planned to send it later. I have even been asked to split this one in more chunks as the review is a bit difficult.
The deprecated interface needs for the CONFIG_SYSFS_DEPRECATED_V2 flag in order to be generated.
CONFIG_SYSFS_DEPRECATED_V2 idea was abandoned, no? This patch at least does not appear to contain it so please update the commit message to reflect current state.
Adding Joonas to help address the question of how strict are userspace requirements for sysfs additions. Personally sysadmin use sounds fine to me, although it needs to be mentioned/documented as Matt requested, but I fear it may not be enough to upstream. Is Level0 at the stage where we can upstream for it I am also not sure.
Sysadmin usage is fine for the simple interfaces that can truly be used from the command line. This patch seems to just expose the existing interface in per-tile manner, so should not be a concern.
This will definitely help this patch (series) to get in, but I my understanding is that Level0 is a bit behind for upstreaming.
However, the controls not under gt directories, need to be converted to apply to all tiles. (I've definitely given that feedback multiple times). Otherwise it will be very unexpected to the end user when what previously applied to whole device would only apply to part of it.
It's not forgotten :)
Regards, Joonas
Thank you, Andi
dri-devel@lists.freedesktop.org
-
Andi Shyti -
Joonas Lahtinen -
Tvrtko Ursulin