Introduce multitile support
Subsystems (2)
v4 cover Introduce multitile support
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
=========
v3 -> v4
- fixed Tvrtko's review:
- remove the SYSFS_DEPRECATED_V2 mention from the commit log
- reworded the error message when accessing deprecated files
- errors in sysfs are printed as warnings as they are not fatal
- the inline functions are moved to be out of line.
and some other minor refactoring.
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 | 136 ++++++ drivers/gpu/drm/i915/gt/sysfs_gt.h | 32 ++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.c | 392 ++++++++++++++++++ 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_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 +- 17 files changed, 781 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
Signature · 1 line
2.34.1
PATCH v4 1/2 drm/i915: Prepare for multiple GTs
From: Tvrtko Ursulin <[email protected]>
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.
--- 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(-)
drivers/gpu/drm/i915/gt/intel_gt.c +129 -10
@@ -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) {
drivers/gpu/drm/i915/gt/intel_gt.h +11 -3
@@ -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);
drivers/gpu/drm/i915/gt/intel_gt_pm.c +8 -1
@@ -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); }
drivers/gpu/drm/i915/gt/intel_gt_types.h +7 -0
@@ -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;
drivers/gpu/drm/i915/i915_driver.c +13 -16
@@ -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);
drivers/gpu/drm/i915/i915_drv.h +6 -0
@@ -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 */
drivers/gpu/drm/i915/intel_memory_region.h +3 -0
@@ -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 */
drivers/gpu/drm/i915/intel_uncore.c +4 -8
@@ -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,
drivers/gpu/drm/i915/intel_uncore.h +2 -1
@@ -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);
drivers/gpu/drm/i915/selftests/mock_gem_device.c +2 -3
@@ -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);
Signature · 1 line
2.34.1
Re: [PATCH v4 1/2] drm/i915: Prepare for multiple GTs
Hi Andi,
please find few late nits below
Quoted 6 lines · Andi Shyti
From: Tvrtko Ursulin <[email protected]>
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
s/gts/GTs (to match as below)
Quoted 36 lines
shadowing the existing
i915->gt0to enable source compatibility with legacy driver paths. Afor_each_gtmacro 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 <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Matt Roper <[email protected]>Signed-off-by Andi Shyti <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Matthew Auld <[email protected]>Reviewed-by Matt Roper <[email protected]>--- 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(-)drivers/gpu/drm/i915/gt/intel_gt.c +0
-0
drivers/gpu/drm/i915/gt/intel_gt.c line 31
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_gt.c +2
-1@@ -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)
no need to split line
drivers/gpu/drm/i915/gt/intel_gt.c void __intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915) · line 51
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gt.c +1
-0{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 */
maybe:
void intel_gts_init_early(struct drm_i915_private *i915)
{
struct intel_gt *gt = &i915->gt0;
...Quoted 36 lines
drivers/gpu/drm/i915/gt/intel_gt.c +9
-3void 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);
drivers/gpu/drm/i915/gt/intel_gt.c void intel_gt_driver_release(struct intel_gt *gt) · line 802
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt.c +1
-1@@ -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)
as breaks naming style maybe there should be different helper like:
void intel_gts_driver_late_release(struct drm_i915_private *i915)
{
struct intel_gt *gt;
unsigned int id;
for_each_gt(gt, i915, id)
intel_gt_driver_late_release(gt);
}then we can use "intel_gts" prefix to indicate that we want to operate on all GTs, not just single "intel_gt"
Quoted 23 lines
drivers/gpu/drm/i915/gt/intel_gt.c +10
-5{ +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); + } }/**
drivers/gpu/drm/i915/gt/intel_gt.c u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg) · line 926
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt.c +2
-0@@ -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)
no need to split lines
drivers/gpu/drm/i915/gt/intel_gt.c u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg) · line 928
Quoted 2 lines
drivers/gpu/drm/i915/gt/intel_gt.c +2
-0+{ +struct drm_i915_private *i915 = gt->i915;
can be moved to "if" below
drivers/gpu/drm/i915/gt/intel_gt.c u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg) · line 939
Quoted 11 lines
drivers/gpu/drm/i915/gt/intel_gt.c +11
-0+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 ;
we don't use here BAR0 so maybe we can move this check to intel_gt_probe_all() where we look for BAR phys_addr ?
Quoted 30 lines
drivers/gpu/drm/i915/gt/intel_gt.c +30
-0+ + 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)
drivers/gpu/drm/i915/gt/intel_gt.c u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg) · line 979
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_gt.c +10
-0+{ +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)
s/intel_gt_probe_all/intel_gts_probe ?
Quoted 16 lines
drivers/gpu/drm/i915/gt/intel_gt.c +16
-0+{ +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);
drivers/gpu/drm/i915/gt/intel_gt.c u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg) · line 1005
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_gt.c +10
-0+if (ret) +return ret; + + i915->gt[0 ] = gt; + +/* TODO: add more tiles */ +return 0 ; +} + +int intel_gt_tiles_init (struct drm_i915_private *i915)
s/intel_gt_tiles_init/intel_gts_init
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt.c +5
-0+{ +struct intel_gt *gt; +unsigned int id; +int ret; +
drivers/gpu/drm/i915/gt/intel_gt.c u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg) · line 1020
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_gt.c +10
-0+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)
s/intel_gt_release_all/intel_gts_release
Quoted 223 lines
drivers/gpu/drm/i915/gt/intel_gt.c +10
-0+{ +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) {drivers/gpu/drm/i915/gt/intel_gt.h +11
-3@@ -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);drivers/gpu/drm/i915/gt/intel_gt_pm.c +8
-1@@ -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); }drivers/gpu/drm/i915/gt/intel_gt_types.h +7
-0@@ -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;drivers/gpu/drm/i915/i915_driver.c +13
-16@@ -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);drivers/gpu/drm/i915/i915_drv.h +6
-0@@ -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 */drivers/gpu/drm/i915/intel_memory_region.h +0
-0
drivers/gpu/drm/i915/intel_memory_region.h enum intel_memory_type { · line 32
Quoted 3 lines
drivers/gpu/drm/i915/intel_memory_region.h +0
-0@@ -30,6 +30,9 @@ enum intel_memory_type {enum intel_region_id {INTEL_REGION_SMEM =0 ,INTEL_REGION_LMEM ,
for completeness we should have:
INTEL_REGION_LMEM_0 = INTEL_REGION_LMEM,
drivers/gpu/drm/i915/intel_memory_region.h enum intel_memory_type { · line 35
Quoted 3 lines
drivers/gpu/drm/i915/intel_memory_region.h +3
-0+INTEL_REGION_LMEM1 , +INTEL_REGION_LMEM2 , + INTEL_REGION_LMEM3,
but likely not needed any of them since all we need is:
INTEL_REGION_LMEM_n = INTEL_REGION_LMEM + I915_MAX_GT - 1,
but I'm not sure that I915_MAX_GT is available here, maybe it should defined in separate header not in i915_drv.h or we should have
#define I915_MAX_LMEM 4
and then somewhere
BUILD_BUG_ON(I915_MAX_LMEM != I915_MAX_GT);
~Michal
Quoted 95 lines
drivers/gpu/drm/i915/intel_memory_region.h +0
-0INTEL_REGION_STOLEN_SMEM ,INTEL_REGION_STOLEN_LMEM , INTEL_REGION_UNKNOWN, /* Should be last */drivers/gpu/drm/i915/intel_uncore.c +4
-8@@ -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,drivers/gpu/drm/i915/intel_uncore.h +2
-1@@ -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);drivers/gpu/drm/i915/selftests/mock_gem_device.c +2
-3@@ -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);
Re: [PATCH v4 1/2] drm/i915: Prepare for multiple GTs
Hi Michal,
Quoted 1 line
please find few late nits below
thanks for the comments!
Quoted 6 lines
Quoted 4 lines
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
s/gts/GTs (to match as below)
OK!
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gt.c +0
-0@@ -27,7 +27,8 @@#include "shmem_utils.h" #include "pxp/intel_pxp.h"
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt.c line 31
Quoted 3 lines
drivers/gpu/drm/i915/gt/intel_gt.c +2
-1-void __intel_gt_init_early (struct intel_gt *gt,struct drm_i915_private *i915) +static void +__intel_gt_init_early (struct intel_gt *gt)no need to split line
yeah... this was a change I was always very tempted to do but decided to leave it as it is because the patch is not mine. Will do!
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_gt.c +0
-0{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); }
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt.c void __intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915) · line 51
Quoted 1 line
drivers/gpu/drm/i915/gt/intel_gt.c +1
-0+/* Preliminary initialization of Tile 0 */ maybe:
void
intel_gts_init_early(struct drm_i915_private *i915)
We had a discussion about the use of 'gts' vs 'gt' and all the previous refactoring patches[*] where coming because the use of 'gts' brings confusion: what does gts mean? GTS or GTs? So that we decided to just use gt in its singular form and if needed, perhaps, use 'multi_gt' for plural.
The function below is indeed used only during probe so that we can remove the first parameter and have it as you suggest.
[*] /i915->gt/i915->gt0/ and /i915->gts[]/i915->gt[]/
Quoted 11 lines
{ struct intel_gt *gt = &i915->gt0; ...Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_gt.c +2
-0void 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); }
[...]
Quoted 14 lines
drivers/gpu/drm/i915/gt/intel_gt.c void intel_gt_driver_release(struct intel_gt *gt) · line 802
Quoted 2 lines
drivers/gpu/drm/i915/gt/intel_gt.c +1
-1-void intel_gt_driver_late_release (struct intel_gt *gt) +void intel_gt_driver_late_release (struct drm_i915_private *i915)as breaks naming style maybe there should be different helper like:
void
intel_gts_driver_late_release(struct drm_i915_private *i915){ struct intel_gt *gt; unsigned int id; for_each_gt(gt, i915, id) intel_gt_driver_late_release(gt); }
Quoted 2 lines
then we can use "
intel_gts" prefix to indicate that we want to operate on all GTs, not just single "intel_gt"
As I explained earlier, the 'gts' name brings confusion. Perhaps we can call it something like 'intel_gt_all_driver_late_release()', but it looks a bit forced.
Open for suggestions.
Quoted 26 lines
Quoted 26 lines
{
drivers/gpu/drm/i915/gt/intel_gt.c +10
-5+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); }
Quoted 4 lines
drivers/gpu/drm/i915/gt/intel_gt.c u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg) · line 926
Quoted 2 lines
drivers/gpu/drm/i915/gt/intel_gt.c +2
-0+static int +intel_gt_tile_setup (struct intel_gt *gt,phys_addr_t phys_addr)no need to split lines
Yep!
Quoted 4 lines
drivers/gpu/drm/i915/gt/intel_gt.c u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg) · line 928
Quoted 2 lines
drivers/gpu/drm/i915/gt/intel_gt.c +2
-0+{ +struct drm_i915_private *i915 = gt->i915;can be moved to "if" below
OK
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_gt.c +6
-0+unsigned int id = gt->info.id; +int ret; + +if (id) { +struct intel_uncore_mmio_debug *mmio_debug; +struct intel_uncore *uncore;
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_gt.c u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg) · line 939
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_gt.c +5
-0+ +/* 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 ;we don't use here BAR0 so maybe we can move this check to
intel_gt_probe_all()where we look for BARphys_addr?
OK, then I will remove it from this patch and I will add it in the next series where we add the first multitile machine support.
In intel_gt_probe_all(), right now, I don't know yet whether the platform is single tile or multitile and consequently check BAR0 or not.
Quoted 20 lines
Quoted 14 lines
drivers/gpu/drm/i915/gt/intel_gt.c +6
-0+/* +* 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 */drivers/gpu/drm/i915/intel_memory_region.h +0
-0drivers/gpu/drm/i915/intel_memory_region.h enum intel_memory_type { · line 32
Quoted 3 lines
drivers/gpu/drm/i915/intel_memory_region.h +0
-0@@ -30,6 +30,9 @@ enum intel_memory_type {enum intel_region_id {INTEL_REGION_SMEM =0 ,INTEL_REGION_LMEM ,for completeness we should have:
Quoted 1 line
INTEL_REGION_LMEM_0=INTEL_REGION_LMEM,
Makes sense, fortunately this is used only 15 times, won't be as painful as it was for /i915->gt/i915->gt0/.
Quoted 10 lines
drivers/gpu/drm/i915/intel_memory_region.h enum intel_memory_type { · line 35
Quoted 3 lines
drivers/gpu/drm/i915/intel_memory_region.h +3
-0+INTEL_REGION_LMEM1 , +INTEL_REGION_LMEM2 , + INTEL_REGION_LMEM3,but likely not needed any of them since all we need is:
INTEL_REGION_LMEM_n=INTEL_REGION_LMEM+I915_MAX_GT- 1,but I'm not sure that
I915_MAX_GTis available here, maybe it should defined in separate header not ini915_drv.hor we should have
I915_MAX_GT is available here, but to do something like you say we need to shift all the id's:
enum intel_region_id {
INTEL_REGION_SMEM = 0,
INTEL_REGION_LMEM,
INTEL_REGION_STOLEN_SMEM = INTEL_REGION_LMEM + I915_MAX_GT,
...
}
#define INTEL_REGION_LMEM(n) (INTEL_REGION_LMEM + I915_MAX_GT - n + 1)Otherwise we would have some inconsistent ID.
But it doesn't look very pretty to me, though.
Quoted 5 lines
#define
I915_MAX_LMEM4and then somewhere
BUILD_BUG_ON(I915_MAX_LMEM != I915_MAX_GT);
To be honest I'm not a big fan of I915_MAX_GT and when I will find some time I will try to get rid of it, as I think that the maximum number of gt's should be calculated during probe and stored somewhere in i915->max_gt, but this is a different story.
Quoted 1 line
~Michal
Thanks a lot for your review!
Andi
PATCH v4 2/2 drm/i915/gt: make a gt sysfs group and move power management files
In reply to Andi ShytiThe 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. A warning will be issued if the old interfaces will be accessed.
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.
--- drivers/gpu/drm/i915/Makefile | 4 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 + drivers/gpu/drm/i915/gt/sysfs_gt.c | 136 +++++++++ drivers/gpu/drm/i915/gt/sysfs_gt.h | 32 +++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.c | 392 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.h | 16 ++ drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_sysfs.c | 315 +-------------------- drivers/gpu/drm/i915/i915_sysfs.h | 3 + 9 files changed, 596 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
drivers/gpu/drm/i915/Makefile +3 -1
@@ -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 \
drivers/gpu/drm/i915/gt/intel_gt.c +2 -0
@@ -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)
drivers/gpu/drm/i915/gt/sysfs_gt.c new file +136 -0
136 lines not on this page · raw message
drivers/gpu/drm/i915/gt/sysfs_gt.h new file +32 -0
@@ -0,0 +1,32 @@ +/* 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; +}; + +bool is_object_gt (struct kobject *kobj); + +struct kobject * +intel_gt_create_kobj (struct intel_gt *gt, +struct kobject *dir, +const char *name); + +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 */
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +392 -0
392 lines not on this page · raw message
drivers/gpu/drm/i915/gt/sysfs_gt_pm.h new file +16 -0
@@ -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 */
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -989,6 +989,8 @@ struct drm_i915_private {#define I915_MAX_GT 4struct intel_gt *gt[I915_MAX_GT ]; +struct kobject *sysfs_gt; + struct { struct i915_gem_contexts { spinlock_t lock; /* locks list */
drivers/gpu/drm/i915/i915_sysfs.c +10 -305
355 lines not on this page · raw message
drivers/gpu/drm/i915/i915_sysfs.h +3 -0
@@ -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);
Signature · 1 line
2.34.1
Re: [PATCH v4 2/2] drm/i915/gt: make a gt sysfs group and move power management files
Hi Andi,
few more late nits below
Quoted 25 lines · Andi Shyti
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. A warning will be issued if the old interfaces will be accessed.
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
Quoted 8 lines
│ │ ├── rps_min_freq_mhz
│ │ ├── rps_RP0_freq_mhz
│ │ ├── rps_RP1_freq_mhz
│ │ └── rps_RPn_freq_mhz
. .
. .
. .
│ └── gt3gtN ?
Quoted 52 lines
│ ├── 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 <[email protected]>Signed-off-by Lucas De Marchi <[email protected]>Cc Matt Roper <[email protected]>Cc Sujaritha Sundaresan <[email protected]>Cc Tvrtko Ursulin <[email protected]>Reviewed-by Sujaritha Sundaresan <[email protected]>--- drivers/gpu/drm/i915/Makefile | 4 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 + drivers/gpu/drm/i915/gt/sysfs_gt.c | 136 +++++++++ drivers/gpu/drm/i915/gt/sysfs_gt.h | 32 +++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.c | 392 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.h | 16 ++ drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_sysfs.c | 315 +-------------------- drivers/gpu/drm/i915/i915_sysfs.h | 3 + 9 files changed, 596 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.hdrivers/gpu/drm/i915/Makefile +0
-0
drivers/gpu/drm/i915/Makefile gt-y += \ · line 126
Quoted 7 lines
drivers/gpu/drm/i915/Makefile +3
-1@@ -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
shouldn't these be named as
Quoted 32 lines
drivers/gpu/drm/i915/Makefile +2
-0+ gt/intel_gt_sysfs.o \ + gt/intel_gt_pm_sysfs.o # autogenerated null render state gt-y += \ gt/gen6_renderstate.o \drivers/gpu/drm/i915/gt/intel_gt.c +2
-0@@ -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)drivers/gpu/drm/i915/gt/sysfs_gt.c new file +0
-0
drivers/gpu/drm/i915/gt/sysfs_gt.c line 3
Quoted 3 lines
drivers/gpu/drm/i915/gt/sysfs_gt.c new file +3
-0@@ -0,0 +1,136 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2020 Intel Corporation
2022 ?
Quoted 106 lines
drivers/gpu/drm/i915/gt/sysfs_gt.c new file +106
-0+*/ + +#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" + +bool is_object_gt (struct kobject *kobj) +{ +return !strncmp (kobj->name,"gt" ,2 ); +} + +static struct intel_gt *kobj_to_gt (struct kobject *kobj) +{ + return container_of(kobj, struct kobj_gt, base)->gt; +} + +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 accessing 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 ];
drivers/gpu/drm/i915/gt/sysfs_gt.c line 119
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt.c new file +10
-0+ +/* +* 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)
maybe we should have gt_is_root(gt) helper ?
Quoted 4 lines
drivers/gpu/drm/i915/gt/sysfs_gt.c new file +4
-0+intel_gt_sysfs_pm_init (gt,gt_get_parent_obj (gt)); + +snprintf (name,sizeof (name),"gt%d" , gt->info.id); +
drivers/gpu/drm/i915/gt/sysfs_gt.c line 133
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt.c new file +10
-0+ dir =intel_gt_create_kobj (gt, gt->i915->sysfs_gt, name); +if (!dir) { +drm_warn (>->i915->drm, +"failed to initialize %s sysfs root\n" , name); +return ; + } + +if (sysfs_create_file (dir, &dev_attr_id.attr)) +drm_warn (>->i915->drm, +"failed to create sysfs %s info files\n" , name);
can't we use default_groups in kobj_type ?
drivers/gpu/drm/i915/gt/sysfs_gt.h line 3
Quoted 12 lines
drivers/gpu/drm/i915/gt/sysfs_gt.c new file +3
-0+ +intel_gt_sysfs_pm_init (gt, dir); +}drivers/gpu/drm/i915/gt/sysfs_gt.h new file +3
-0@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation
2022 ?
Quoted 35 lines
drivers/gpu/drm/i915/gt/sysfs_gt.h new file +29
-0+*/ + +#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; +}; + +bool is_object_gt (struct kobject *kobj); + +struct kobject * +intel_gt_create_kobj (struct intel_gt *gt, +struct kobject *dir, +const char *name); + +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 */ drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +0
-0
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c line 3
Quoted 3 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +3
-0@@ -0,0 +1,392 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2020 Intel Corporation
2022 ?
Quoted 30 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +30
-0+*/ + +#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);
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c line 43
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +10
-0+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);
sysfs_emit ?
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c line 53
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +10
-0+} + +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);
sysfs_emit ?
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c line 63
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +10
-0+} + +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);
ditto
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c line 73
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +10
-0+} + +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);
ditto
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c line 83
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +10
-0+} + +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);
ditto
Quoted 65 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +65
-0+} + +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) +{ +return is_object_gt (kobj) ? +sysfs_create_group (kobj, &grp[1 ]) : +sysfs_merge_group (kobj, &grp[0 ]); +} + +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",
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c line 158
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +10
-0+ 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); + }
did you consider using attribute_group.is_visible instead adding groups manually ?
Quoted 4 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +4
-0+} +#else +static void intel_sysfs_rc6_init (struct intel_gt *gt,struct kobject *kobj) +{
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c line 172
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +10
-0+} +#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));
sysfs_emit
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c line 182
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +10
-0+} + +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));
ditto
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c line 193
Quoted 11 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +11
-0+} + +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));
ditto
Quoted 31 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +31
-0+} + +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;
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c line 234
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +10
-0+} + +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));
ditto
Quoted 164 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +158
-0+} + +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_warn (>->i915->drm, +"failed to create gt%u RPS sysfs files" , gt->info.id); +}drivers/gpu/drm/i915/gt/sysfs_gt_pm.h new file +0
-0
drivers/gpu/drm/i915/gt/sysfs_gt_pm.h line 3
Quoted 3 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.h new file +3
-0@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2020 Intel Corporation
2022
Quoted 304 lines
drivers/gpu/drm/i915/gt/sysfs_gt_pm.h new file +13
-0+*/ + +#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 */ drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -989,6 +989,8 @@ struct drm_i915_private {#define I915_MAX_GT 4struct intel_gt *gt[I915_MAX_GT ]; +struct kobject *sysfs_gt; + struct { struct i915_gem_contexts { spinlock_t lock; /* locks list */drivers/gpu/drm/i915/i915_sysfs.c +1
-257@@ -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,
drivers/gpu/drm/i915/i915_sysfs.c static const struct bin_attribute dpf_attrs_1 = { · line 423
Quoted 10 lines
drivers/gpu/drm/i915/i915_sysfs.c +0
-10- &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, -}; -
maybe this large but simple code movement should be done in a separate patch so we could then apply smaller and easier to review fixes ?
~Michal
Quoted 92 lines
drivers/gpu/drm/i915/i915_sysfs.c +9
-38#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 }drivers/gpu/drm/i915/i915_sysfs.h +3
-0@@ -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);
Re: [PATCH v4 2/2] drm/i915/gt: make a gt sysfs group and move power management files
Hi Michal,
Quoted 19 lines
Quoted 10 lines
/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_mhzQuoted 8 lines
│ │ ├── rps_min_freq_mhz │ │ ├── rps_RP0_freq_mhz │ │ ├── rps_RP1_freq_mhz │ │ └── rps_RPn_freq_mhz . . . . . . │ └── gt3
Quoted 1 line
gtN ?
yep!
Quoted 15 lines
drivers/gpu/drm/i915/Makefile gt-y += \ · line 126
Quoted 12 lines
drivers/gpu/drm/i915/Makefile +3
-1@@ -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.oshouldn't these be named as
Quoted 2 lines
drivers/gpu/drm/i915/Makefile gt-y += \ · line 128
Quoted 2 lines
drivers/gpu/drm/i915/Makefile +2
-0+ gt/intel_gt_sysfs.o \ + gt/intel_gt_pm_sysfs.o
You are right with wanting a coherent prefix, but I kept the trend of starting with sysfs_gt*. We already have sysfs_engine.c.
And, because I wouldn't like to have part of it sysfs_gt* and part of it intel_gt_sysfs*, then we either rename all or we leave it as it is.
On the other hand if we are under i915/gt/... I don't expect it to be the sysfs of another system.
To be honest, I don't have a strong opinion on this. If you do, then I will change everything intel_gt_sysfs*.
[...]
Quoted 7 lines
drivers/gpu/drm/i915/Makefile line 3
Quoted 5 lines
drivers/gpu/drm/i915/Makefile +4
-0+++ b/drivers/gpu/drm/i915/gt/sysfs_gt.c@@ -0,0 +1,136 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright © 2020 Intel Corporation2022 ?
Time flies... huh? :)
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/Makefile +8
-0+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
Quoted 8 lines
drivers/gpu/drm/i915/Makefile line 17
Quoted 6 lines
drivers/gpu/drm/i915/Makefile +6
-0+ * generated under the parent directory. + * + * We generate the files only for gt 0 + * to avoid duplicates. + */ + if (!gt->info.id)maybe we should have
gt_is_root(gt)helper ?
yes, makes sense.
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/Makefile +8
-0+ 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_warn(>->i915->drm, + "failed to initialize %s sysfs root\n", name);
Quoted 8 lines
drivers/gpu/drm/i915/Makefile line 31
Quoted 6 lines
drivers/gpu/drm/i915/Makefile +6
-0+ return; + } + + if (sysfs_create_file(dir, &dev_attr_id.attr)) + drm_warn(>->i915->drm, + "failed to create sysfs %s info files\n", name);can't we use
default_groupsinkobj_type?
yeah... I'll try that.
[...]
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/i915/Makefile +9
-0+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);
Quoted 8 lines
drivers/gpu/drm/i915/Makefile line 46
Quoted 6 lines
drivers/gpu/drm/i915/Makefile +6
-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);
sysfs_emit?
OK
[...]
Quoted 15 lines
Quoted 15 lines
drivers/gpu/drm/i915/Makefile +15
-0+ 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);
Quoted 8 lines
drivers/gpu/drm/i915/Makefile line 66
Quoted 5 lines
drivers/gpu/drm/i915/Makefile +5
-0+ if (ret) + drm_err(>->i915->drm, + "failed to create media %u RC6 sysfs files\n", + gt->info.id); + }did you consider using attribute_group.is_visible instead adding groups manually ?
I can try this, as well.
[...]
Quoted 2 lines
maybe this large but simple code movement should be done in a separate patch so we could then apply smaller and easier to review fixes ?
I can try to split it, even though most of it is basically a copy/paste.
Quoted 1 line
~Michal
Thanks a lot for this review, as well!
Andi
Re: [Intel-gfx] [PATCH v4 2/2] drm/i915/gt: make a gt sysfs group and move power management files
In reply to Andi ShytiQuoted 132 lines · Andi Shyti
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. A warning will be issued if the old interfaces will be accessed.
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 <[email protected]>Signed-off-by Lucas De Marchi <[email protected]>Cc Matt Roper <[email protected]>Cc Sujaritha Sundaresan <[email protected]>Cc Tvrtko Ursulin <[email protected]>Reviewed-by Sujaritha Sundaresan <[email protected]>--- drivers/gpu/drm/i915/Makefile | 4 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 + drivers/gpu/drm/i915/gt/sysfs_gt.c | 136 +++++++++ drivers/gpu/drm/i915/gt/sysfs_gt.h | 32 +++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.c | 392 ++++++++++++++++++++++++++ drivers/gpu/drm/i915/gt/sysfs_gt_pm.h | 16 ++ drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_sysfs.c | 315 +-------------------- drivers/gpu/drm/i915/i915_sysfs.h | 3 + 9 files changed, 596 insertions(+), 306 deletions(-)create mode 100644
drivers/gpu/drm/i915/gt/sysfs_gt.ccreate mode 100644drivers/gpu/drm/i915/gt/sysfs_gt.hcreate mode 100644drivers/gpu/drm/i915/gt/sysfs_gt_pm.ccreate mode 100644drivers/gpu/drm/i915/gt/sysfs_gt_pm.hdrivers/gpu/drm/i915/Makefile +3
-1@@ -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 \drivers/gpu/drm/i915/gt/intel_gt.c +2
-0@@ -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)drivers/gpu/drm/i915/gt/sysfs_gt.c new file +11
-0@@ -0,0 +1,136 @@ +// 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> +
drivers/gpu/drm/i915/gt/sysfs_gt.c line 21
Quoted 10 lines
drivers/gpu/drm/i915/gt/sysfs_gt.c new file +10
-0+#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" + +bool is_object_gt (struct kobject *kobj)
Not sure if you will need it exported in a later patch but for now it seems only users are local to this file.
Regards,
Tvrtko
Quoted 967 lines
drivers/gpu/drm/i915/gt/sysfs_gt.c new file +115
-0+{ +return !strncmp (kobj->name,"gt" ,2 ); +} + +static struct intel_gt *kobj_to_gt (struct kobject *kobj) +{ + return container_of(kobj, struct kobj_gt, base)->gt; +} + +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 accessing 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_warn (>->i915->drm, +"failed to initialize %s sysfs root\n" , name); +return ; + } + +if (sysfs_create_file (dir, &dev_attr_id.attr)) +drm_warn (>->i915->drm, +"failed to create sysfs %s info files\n" , name); + +intel_gt_sysfs_pm_init (gt, dir); +}drivers/gpu/drm/i915/gt/sysfs_gt.h new file +32
-0@@ -0,0 +1,32 @@ +/* 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; +}; + +bool is_object_gt (struct kobject *kobj); + +struct kobject * +intel_gt_create_kobj (struct intel_gt *gt, +struct kobject *dir, +const char *name); + +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 */ drivers/gpu/drm/i915/gt/sysfs_gt_pm.c new file +392
-0@@ -0,0 +1,392 @@ +// 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) +{ +return is_object_gt (kobj) ? +sysfs_create_group (kobj, &grp[1 ]) : +sysfs_merge_group (kobj, &grp[0 ]); +} + +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_warn (>->i915->drm, +"failed to create gt%u RPS sysfs files" , gt->info.id); +}drivers/gpu/drm/i915/gt/sysfs_gt_pm.h new file +16
-0@@ -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 */ drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -989,6 +989,8 @@ struct drm_i915_private {#define I915_MAX_GT 4struct intel_gt *gt[I915_MAX_GT ]; +struct kobject *sysfs_gt; + struct { struct i915_gem_contexts { spinlock_t lock; /* locks list */drivers/gpu/drm/i915/i915_sysfs.c +10
-305@@ -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 }drivers/gpu/drm/i915/i915_sysfs.h +3
-0@@ -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);
Re: [Intel-gfx] [PATCH v4 2/2] drm/i915/gt: make a gt sysfs group and move power management files
Hi Tvrtko,
Quoted 4 lines
Quoted 1 line
+bool
is_object_gt(struct kobject *kobj)Not sure if you will need it exported in a later patch but for now it seems only users are local to this file.
it is actually used by sysfs_gt.c and sysfs_gt_pm.c.
Thank you,
Andi
PS. in this v4 I forgot to replace many drm_err() with
drm_warn(), will do it properly in the next version.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Introduce multitile support
In reply to Andi Shyti== Series Details ==
== Series Details ==
Series: Introduce multitile support
URL : https://patchwork.freedesktop.org/series/98958/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 3a9bf34c3413 drm/i915: Prepare for multiple GTs -:255: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'id__' - possible side-effects? #255: FILE: drivers/gpu/drm/i915/gt/intel_gt.h:91: +#define for_each_gt(gt__, i915__, id__) \ + for ((id__) = 0; \ + (id__) < I915_MAX_GT; \ + (id__)++) \ + for_each_if(((gt__) = (i915__)->gt[(id__)]))
total: 0 errors, 0 warnings, 1 checks, 436 lines checked19cc34444270 drm/i915/gt: make a gt sysfs group and move power management files -:111: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #111:
new file mode 100644
-:588: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_mode' - possible side-effects? #588: FILE: drivers/gpu/drm/i915/gt/sysfs_gt_pm.c:293:
+#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)
-:588: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_show' - possible side-effects? #588: FILE: drivers/gpu/drm/i915/gt/sysfs_gt_pm.c:293:
+#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)
-:588: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_store' - possible side-effects? #588: FILE: drivers/gpu/drm/i915/gt/sysfs_gt_pm.c:293:
+#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)
-:611: CHECK:CAMELCASE: Avoid CamelCase: <RPn_freq_mhz>
#611: FILE: drivers/gpu/drm/i915/gt/sysfs_gt_pm.c:316:
+static INTEL_GT_RPS_SYSFS_ATTR(RPn_freq_mhz, 0444, rps_rp_mhz_show, NULL);
-:621: CHECK:CAMELCASE: Avoid CamelCase: <dev_attr_##s##_RPn_freq_mhz> #621: FILE: drivers/gpu/drm/i915/gt/sysfs_gt_pm.c:326:
+ &dev_attr_##s##_RPn_freq_mhz.attr, \
-:640: WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (8, 19) #640: FILE: drivers/gpu/drm/i915/gt/sysfs_gt_pm.c:345:
+ } else if (attr == &dev_attr_gt_RP1_freq_mhz ||
[...]
+ val = intel_rps_get_rp1_frequency(rps);
-:643: WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (8, 19) #643: FILE: drivers/gpu/drm/i915/gt/sysfs_gt_pm.c:348:
+ } else if (attr == &dev_attr_gt_RPn_freq_mhz ||
[...]
+ val = intel_rps_get_rpn_frequency(rps);
-:643: CHECK:CAMELCASE: Avoid CamelCase: <dev_attr_gt_RPn_freq_mhz> #643: FILE: drivers/gpu/drm/i915/gt/sysfs_gt_pm.c:348:
+ } else if (attr == &dev_attr_gt_RPn_freq_mhz ||
-:644: CHECK:CAMELCASE: Avoid CamelCase: <dev_attr_rps_RPn_freq_mhz> #644: FILE: drivers/gpu/drm/i915/gt/sysfs_gt_pm.c:349:
+ attr == &dev_attr_rps_RPn_freq_mhz) {
total: 0 errors, 3 warnings, 7 checks, 974 lines checked
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Introduce multitile support
In reply to Andi Shyti== Series Details ==
== Series Details ==
Series: Introduce multitile support
URL : https://patchwork.freedesktop.org/series/98958/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Introduce multitile support
In reply to Andi Shyti== Series Details ==
== Series Details ==
Series: Introduce multitile support
URL : https://patchwork.freedesktop.org/series/98958/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11092 -> Patchwork_22009
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/index.html
Participating hosts (47 -> 42)
------------------------------
Additional (1): fi-icl-u2
Missing (6): fi-kbl-soraka shard-tglu fi-bsw-cyan shard-rkl shard-dg1 fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_22009:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_selftest@live@reset:
- {bat-adlp-6}: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/bat-adlp-6/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/bat-adlp-6/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_22009 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@fork-gfx0:
- fi-icl-u2: NOTRUN -> [SKIP][3] ([fdo#109315]) +17 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/fi-icl-u2/igt@amdgpu/[email protected]
* igt@gem_exec_suspend@basic-s0@smem:
- fi-tgl-1115g4: [PASS][4] -> [FAIL][5] ([i915#1888])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/fi-tgl-1115g4/igt@gem_exec_suspend@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/fi-tgl-1115g4/igt@gem_exec_suspend@[email protected]
* igt@gem_exec_suspend@basic-s3@smem:
- fi-bdw-5557u: [PASS][6] -> [INCOMPLETE][7] ([i915#146])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/fi-bdw-5557u/igt@gem_exec_suspend@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/fi-bdw-5557u/igt@gem_exec_suspend@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-icl-u2: NOTRUN -> [SKIP][8] ([i915#2190])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/fi-icl-u2/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-icl-u2: NOTRUN -> [SKIP][9] ([i915#4613]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/fi-icl-u2/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: NOTRUN -> [SKIP][10] ([fdo#111827]) +8 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/fi-icl-u2/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-icl-u2: NOTRUN -> [SKIP][11] ([fdo#109278]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/fi-icl-u2/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-icl-u2: NOTRUN -> [SKIP][12] ([fdo#109285])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/fi-icl-u2/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- fi-icl-u2: NOTRUN -> [SKIP][13] ([i915#3301])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/fi-icl-u2/igt@[email protected]
#### Warnings ####
* igt@kms_psr@primary_page_flip:
- fi-skl-6600u: [FAIL][14] ([i915#4547]) -> [INCOMPLETE][15] ([i915#4838])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/fi-skl-6600u/igt@kms_psr@primary_page_flip.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/fi-skl-6600u/igt@kms_psr@primary_page_flip.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#146]: https://gitlab.freedesktop.org/drm/intel/issues/146
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4838]: https://gitlab.freedesktop.org/drm/intel/issues/4838
[i915#4897]: https://gitlab.freedesktop.org/drm/intel/issues/4897
Build changes
-------------
* Linux: CI_DRM_11092 -> Patchwork_22009
CI-20190529: 20190529
CI_DRM_11092: e20161a37d76ea1707961c320bb3218b2a368a63 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6327: 0d559158c2d3b5723abbfc2cb4b04532e28663b2 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22009: 19cc3444427011b704776e93cff7c6d1377124fd @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
19cc34444270 drm/i915/gt: make a gt sysfs group and move power management files 3a9bf34c3413 drm/i915: Prepare for multiple GTs
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for Introduce multitile support
In reply to Andi Shyti== Series Details ==
== Series Details ==
Series: Introduce multitile support
URL : https://patchwork.freedesktop.org/series/98958/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11092_full -> Patchwork_22009_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_22009_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_22009_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Participating hosts (13 -> 13)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_22009_full:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@mock@requests:
- shard-kbl: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-kbl4/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl3/igt@i915_selftest@[email protected]
- shard-apl: [PASS][3] -> [DMESG-FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-apl3/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl3/igt@i915_selftest@[email protected]
- shard-glk: [PASS][5] -> [DMESG-FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-glk8/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-glk6/igt@i915_selftest@[email protected]
- shard-snb: [PASS][7] -> [DMESG-FAIL][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-snb5/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-snb4/igt@i915_selftest@[email protected]
* igt@kms_flip@flip-vs-suspend@a-edp1:
- shard-skl: [PASS][9] -> [INCOMPLETE][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-skl9/igt@kms_flip@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl2/igt@kms_flip@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_fenced_exec_thrash@no-spare-fences-interruptible:
- {shard-rkl}: NOTRUN -> [INCOMPLETE][11]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-5/igt@[email protected]
* igt@gem_mmap_offset@open-flood:
- {shard-rkl}: [PASS][12] -> [INCOMPLETE][13] +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-2/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-5/igt@[email protected]
* igt@i915_selftest@mock@requests:
- {shard-rkl}: NOTRUN -> ([DMESG-FAIL][14], [DMESG-FAIL][15])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-4/igt@i915_selftest@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-5/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_22009_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@smoketest:
- shard-iclb: [PASS][16] -> [FAIL][17] ([i915#2896])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-iclb6/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-iclb3/igt@[email protected]
* igt@gem_exec_capture@pi@rcs0:
- shard-skl: NOTRUN -> [INCOMPLETE][18] ([i915#4547])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl2/igt@gem_exec_capture@[email protected]
* igt@gem_exec_endless@dispatch@vcs1:
- shard-tglb: [PASS][19] -> [INCOMPLETE][20] ([i915#3778])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-tglb3/igt@gem_exec_endless@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-tglb6/igt@gem_exec_endless@[email protected]
* igt@gem_exec_fair@basic-deadline:
- shard-glk: [PASS][21] -> [FAIL][22] ([i915#2846])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-glk7/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-glk3/igt@[email protected]
* igt@gem_exec_fair@basic-none@vcs0:
- shard-apl: NOTRUN -> [FAIL][23] ([i915#2842])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl7/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none@vcs1:
- shard-kbl: NOTRUN -> [FAIL][24] ([i915#2842]) +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-kbl: [PASS][25] -> [FAIL][26] ([i915#2842])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-kbl7/igt@gem_exec_fair@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl3/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-iclb: NOTRUN -> [FAIL][27] ([i915#2842])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-iclb1/igt@gem_exec_fair@[email protected]
* igt@gem_huc_copy@huc-copy:
- shard-apl: NOTRUN -> [SKIP][28] ([fdo#109271] / [i915#2190])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl2/igt@[email protected]
- shard-kbl: NOTRUN -> [SKIP][29] ([fdo#109271] / [i915#2190])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl4/igt@[email protected]
* igt@gem_lmem_swapping@verify:
- shard-kbl: NOTRUN -> [SKIP][30] ([fdo#109271] / [i915#4613])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl7/igt@[email protected]
* igt@gem_lmem_swapping@verify-random:
- shard-skl: NOTRUN -> [SKIP][31] ([fdo#109271] / [i915#4613]) +4 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl10/igt@[email protected]
* igt@gem_pread@exhaustion:
- shard-kbl: NOTRUN -> [WARN][32] ([i915#2658])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl7/igt@[email protected]
* igt@gem_pwrite@basic-exhaustion:
- shard-skl: NOTRUN -> [WARN][33] ([i915#2658])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl7/igt@[email protected]
* igt@gem_render_copy@x-tiled-to-vebox-yf-tiled:
- shard-kbl: NOTRUN -> [SKIP][34] ([fdo#109271]) +159 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl7/igt@[email protected]
* igt@gem_softpin@allocator-evict-all-engines:
- shard-glk: [PASS][35] -> [DMESG-WARN][36] ([i915#118]) +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-glk8/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-glk6/igt@[email protected]
* igt@gem_softpin@noreloc-s3:
- shard-kbl: NOTRUN -> [DMESG-WARN][37] ([i915#180])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl4/igt@[email protected]
* igt@gem_userptr_blits@dmabuf-sync:
- shard-kbl: NOTRUN -> [SKIP][38] ([fdo#109271] / [i915#3323])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl6/igt@[email protected]
* igt@gem_userptr_blits@vma-merge:
- shard-apl: NOTRUN -> [FAIL][39] ([i915#3318])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl4/igt@[email protected]
- shard-kbl: NOTRUN -> [FAIL][40] ([i915#3318])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl1/igt@[email protected]
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-skl: NOTRUN -> [SKIP][41] ([fdo#109271] / [i915#658]) +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl7/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-skl: [PASS][42] -> [FAIL][43] ([i915#454])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-skl6/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl10/igt@[email protected]
* igt@i915_pm_rpm@modeset-lpsp-stress:
- shard-apl: NOTRUN -> [SKIP][44] ([fdo#109271]) +81 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl7/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- shard-snb: [PASS][45] -> [INCOMPLETE][46] ([i915#3921])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-snb5/igt@i915_selftest@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-snb4/igt@i915_selftest@[email protected]
* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-async-flip:
- shard-skl: NOTRUN -> [FAIL][47] ([i915#3743]) +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl7/igt@[email protected]
* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip:
- shard-skl: NOTRUN -> [SKIP][48] ([fdo#109271] / [i915#3777]) +2 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl3/igt@[email protected]
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-hflip:
- shard-kbl: NOTRUN -> [SKIP][49] ([fdo#109271] / [i915#3777])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl1/igt@[email protected]
* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][50] ([fdo#109271] / [i915#3777])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl2/igt@[email protected]
* igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs_cc:
- shard-kbl: NOTRUN -> [SKIP][51] ([fdo#109271] / [i915#3886]) +5 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl7/igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][52] ([fdo#109271] / [i915#3886]) +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl2/igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs:
- shard-skl: NOTRUN -> [SKIP][53] ([fdo#109271] / [i915#3886]) +16 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl8/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html
* igt@kms_chamelium@dp-crc-multiple:
- shard-skl: NOTRUN -> [SKIP][54] ([fdo#109271] / [fdo#111827]) +26 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl7/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-ctm-0-25:
- shard-kbl: NOTRUN -> [SKIP][55] ([fdo#109271] / [fdo#111827]) +12 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl1/igt@[email protected]
* igt@kms_color_chamelium@pipe-c-ctm-max:
- shard-apl: NOTRUN -> [SKIP][56] ([fdo#109271] / [fdo#111827]) +6 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl7/igt@[email protected]
* igt@kms_content_protection@srm:
- shard-kbl: NOTRUN -> [TIMEOUT][57] ([i915#1319])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl1/igt@[email protected]
- shard-apl: NOTRUN -> [TIMEOUT][58] ([i915#1319])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl4/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-toggle:
- shard-iclb: [PASS][59] -> [FAIL][60] ([i915#2346])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-iclb8/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-iclb7/igt@[email protected]
- shard-skl: [PASS][61] -> [FAIL][62] ([i915#2346])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-skl7/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl3/igt@[email protected]
* igt@kms_flip@plain-flip-fb-recreate@c-edp1:
- shard-skl: NOTRUN -> [FAIL][63] ([i915#2122]) +2 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl2/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling:
- shard-glk: [PASS][64] -> [FAIL][65] ([i915#4911])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-glk2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-glk8/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling:
- shard-skl: NOTRUN -> [SKIP][66] ([fdo#109271] / [i915#1888])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl10/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-downscaling:
- shard-iclb: [PASS][67] -> [SKIP][68] ([i915#3701])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-iclb7/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-downscaling.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-downscaling.html
* igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt:
- shard-skl: NOTRUN -> [SKIP][69] ([fdo#109271]) +307 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl3/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- shard-apl: NOTRUN -> [SKIP][70] ([fdo#109271] / [i915#533]) +1 similar issue
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl7/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-d:
- shard-kbl: NOTRUN -> [SKIP][71] ([fdo#109271] / [i915#533])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl7/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: [PASS][72] -> [DMESG-WARN][73] ([i915#180]) +1 similar issue
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-kbl6/igt@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
- shard-skl: NOTRUN -> [FAIL][74] ([fdo#108145] / [i915#265]) +8 similar issues
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-kbl: NOTRUN -> [FAIL][75] ([fdo#108145] / [i915#265])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb:
- shard-skl: NOTRUN -> [FAIL][76] ([i915#265])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl8/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [PASS][77] -> [FAIL][78] ([fdo#108145] / [i915#265])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-skl4/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl6/igt@[email protected]
* igt@kms_psr2_sf@plane-move-sf-dmg-area:
- shard-kbl: NOTRUN -> [SKIP][79] ([fdo#109271] / [i915#658])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl1/igt@[email protected]
- shard-apl: NOTRUN -> [SKIP][80] ([fdo#109271] / [i915#658])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl4/igt@[email protected]
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [PASS][81] -> [SKIP][82] ([fdo#109441]) +3 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-iclb4/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_setmode@basic:
- shard-glk: [PASS][83] -> [FAIL][84] ([i915#31])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-glk5/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-glk1/igt@[email protected]
* igt@kms_vblank@pipe-b-ts-continuation-suspend:
- shard-tglb: [PASS][85] -> [INCOMPLETE][86] ([i915#2828] / [i915#456])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-tglb8/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-tglb2/igt@[email protected]
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-apl: [PASS][87] -> [DMESG-WARN][88] ([i915#180]) +1 similar issue
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-apl6/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl1/igt@[email protected]
* igt@kms_vblank@pipe-d-wait-idle:
- shard-skl: NOTRUN -> [SKIP][89] ([fdo#109271] / [i915#533]) +2 similar issues
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl10/igt@[email protected]
* igt@kms_writeback@writeback-check-output:
- shard-skl: NOTRUN -> [SKIP][90] ([fdo#109271] / [i915#2437])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl7/igt@[email protected]
* igt@kms_writeback@writeback-pixel-formats:
- shard-kbl: NOTRUN -> [SKIP][91] ([fdo#109271] / [i915#2437])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl1/igt@[email protected]
* igt@perf@polling-parameterized:
- shard-skl: NOTRUN -> [FAIL][92] ([i915#1542])
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl2/igt@[email protected]
* igt@sysfs_clients@fair-0:
- shard-skl: NOTRUN -> [SKIP][93] ([fdo#109271] / [i915#2994]) +4 similar issues
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl5/igt@[email protected]
* igt@sysfs_clients@split-50:
- shard-kbl: NOTRUN -> [SKIP][94] ([fdo#109271] / [i915#2994]) +1 similar issue
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl7/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: [FAIL][95] ([i915#2842]) -> [PASS][96]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-tglb5/igt@gem_exec_fair@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-tglb8/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-kbl: [FAIL][97] ([i915#2842]) -> [PASS][98]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-kbl7/igt@gem_exec_fair@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl3/igt@gem_exec_fair@[email protected]
* igt@gem_exec_schedule@wide@rcs0:
- {shard-rkl}: [INCOMPLETE][99] -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-5/igt@gem_exec_schedule@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-5/igt@gem_exec_schedule@[email protected]
* igt@gem_exec_whisper@basic-contexts-forked-all:
- {shard-tglu}: [INCOMPLETE][101] -> [PASS][102]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-tglu-7/igt@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-tglu-2/igt@[email protected]
* igt@gem_exec_whisper@basic-queues-forked-all:
- shard-glk: [DMESG-WARN][103] ([i915#118]) -> [PASS][104] +3 similar issues
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-glk4/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-glk3/igt@[email protected]
* igt@gem_linear_blits@normal:
- {shard-tglu}: [FAIL][105] -> [PASS][106]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-tglu-7/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-tglu-1/igt@[email protected]
* igt@gem_ppgtt@blt-vs-render-ctxn:
- {shard-tglu}: [INCOMPLETE][107] ([i915#750]) -> [PASS][108] +1 similar issue
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-tglu-7/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-tglu-4/igt@[email protected]
* igt@i915_pm_dc@dc9-dpms:
- shard-iclb: [SKIP][109] ([i915#4281]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-iclb3/igt@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-iclb6/igt@[email protected]
* igt@i915_pm_rpm@dpms-lpsp:
- {shard-rkl}: [SKIP][111] ([i915#1397]) -> [PASS][112]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-4/igt@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-6/igt@[email protected]
* igt@i915_pm_rpm@drm-resources-equal:
- {shard-rkl}: ([SKIP][113], [SKIP][114]) ([fdo#109308]) -> [PASS][115]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-2/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-4/igt@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-6/igt@[email protected]
* igt@i915_selftest@live@gt_pm:
- {shard-tglu}: [DMESG-FAIL][116] ([i915#3987]) -> [PASS][117]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-tglu-1/igt@i915_selftest@live@gt_pm.html
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-tglu-4/igt@i915_selftest@live@gt_pm.html
* igt@i915_suspend@sysfs-reader:
- shard-apl: [DMESG-WARN][118] ([i915#180]) -> [PASS][119] +2 similar issues
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-apl2/igt@[email protected]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-apl4/igt@[email protected]
* igt@kms_atomic@atomic_plane_damage:
- {shard-rkl}: [SKIP][120] ([i915#4098]) -> [PASS][121] +5 similar issues
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-2/igt@kms_atomic@atomic_plane_damage.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-6/igt@kms_atomic@atomic_plane_damage.html
* igt@kms_atomic@test-only:
- {shard-rkl}: [SKIP][122] ([i915#1845]) -> [PASS][123] +14 similar issues
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-2/igt@[email protected]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-6/igt@[email protected]
* igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs:
- {shard-rkl}: [SKIP][124] ([i915#1845] / [i915#4098]) -> [PASS][125] +1 similar issue
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-2/igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs.html
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-6/igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs.html
* igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_rc_ccs:
- {shard-rkl}: ([SKIP][126], [SKIP][127]) ([i915#1845] / [i915#4098]) -> [PASS][128]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-2/igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_rc_ccs.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-4/igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_rc_ccs.html
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-6/igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_rc_ccs.html
* igt@kms_color@pipe-c-invalid-gamma-lut-sizes:
- {shard-rkl}: [SKIP][129] ([i915#4070]) -> [PASS][130]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-1/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-4/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-256x256-rapid-movement:
- {shard-rkl}: [SKIP][131] ([fdo#112022] / [i915#4070]) -> [PASS][132] +4 similar issues
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-2/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-alpha-transparent:
- {shard-rkl}: ([SKIP][133], [SKIP][134]) ([fdo#112022] / [i915#4070]) -> [PASS][135]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-2/igt@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-4/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-kbl: [INCOMPLETE][136] -> [PASS][137]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-kbl4/igt@[email protected]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-kbl1/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-a-128x128-top-edge:
- {shard-rkl}: [SKIP][138] ([i915#1849] / [i915#4070]) -> [PASS][139] +3 similar issues
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-2/igt@[email protected]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_legacy@cursora-vs-flipa-atomic-transitions-varying-size:
- {shard-rkl}: ([SKIP][140], [SKIP][141]) ([fdo#111825] / [i915#4070]) -> [PASS][142]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-2/igt@kms_cursor_legacy@cursora-vs-flipa-atomic-transitions-varying-size.html
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-4/igt@kms_cursor_legacy@cursora-vs-flipa-atomic-transitions-varying-size.html
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-rkl-6/igt@kms_cursor_legacy@cursora-vs-flipa-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic:
- shard-skl: [FAIL][143] ([i915#2346]) -> [PASS][144]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-skl2/igt@[email protected]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/shard-skl9/igt@[email protected]
* igt@kms_draw_crc@draw-method-rgb565-blt-xtiled:
- {shard-rkl}: [SKIP][145] ([fdo#111314]) -> [PASS][146] +1 similar issue
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11092/shard-rkl-2/igt@[email protected]
[146]: https:/
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22009/index.html