* [Intel-gfx] [PATCH] drm/i915/gt: Use i915 instead of dev_priv as name for the private device
@ 2023-02-10 15:03 Andi Shyti
2023-02-10 19:02 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Andi Shyti @ 2023-02-10 15:03 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
It is becoming a strong habit to call the drm_i915_private
structures "i915", but there are still many left that are called
dev_priv.
Sometimes this makes grepping a bit challenging and anyway it
keeps a coherent style.
Rename all the "dev_priv" structures in the gt/* directory to
"i915".
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
---
Hi,
just checking if we want something similar. I have this same
replicated patch for the rest of i915 but I want to make sure we
actually want it.
Andi
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 18 +++++++++---------
drivers/gpu/drm/i915/gt/intel_gsc.h | 2 +-
drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 2 +-
drivers/gpu/drm/i915/gt/intel_reset_types.h | 2 +-
.../gpu/drm/i915/gt/intel_ring_submission.c | 4 ++--
drivers/gpu/drm/i915/gt/intel_rps_types.h | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 18 +++++++++---------
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index d4e29da74612d..c6271440afbd3 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -1939,13 +1939,13 @@ static const char *repr_timer(const struct timer_list *t)
static void intel_engine_print_registers(struct intel_engine_cs *engine,
struct drm_printer *m)
{
- struct drm_i915_private *dev_priv = engine->i915;
+ struct drm_i915_private *i915 = engine->i915;
struct intel_engine_execlists * const execlists = &engine->execlists;
u64 addr;
- if (engine->id == RENDER_CLASS && IS_GRAPHICS_VER(dev_priv, 4, 7))
+ if (engine->id == RENDER_CLASS && IS_GRAPHICS_VER(i915, 4, 7))
drm_printf(m, "\tCCID: 0x%08x\n", ENGINE_READ(engine, CCID));
- if (HAS_EXECLISTS(dev_priv)) {
+ if (HAS_EXECLISTS(i915)) {
drm_printf(m, "\tEL_STAT_HI: 0x%08x\n",
ENGINE_READ(engine, RING_EXECLIST_STATUS_HI));
drm_printf(m, "\tEL_STAT_LO: 0x%08x\n",
@@ -1966,7 +1966,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,
ENGINE_READ(engine, RING_MI_MODE) & (MODE_IDLE) ? " [idle]" : "");
}
- if (GRAPHICS_VER(dev_priv) >= 6) {
+ if (GRAPHICS_VER(i915) >= 6) {
drm_printf(m, "\tRING_IMR: 0x%08x\n",
ENGINE_READ(engine, RING_IMR));
drm_printf(m, "\tRING_ESR: 0x%08x\n",
@@ -1983,15 +1983,15 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,
addr = intel_engine_get_last_batch_head(engine);
drm_printf(m, "\tBBADDR: 0x%08x_%08x\n",
upper_32_bits(addr), lower_32_bits(addr));
- if (GRAPHICS_VER(dev_priv) >= 8)
+ if (GRAPHICS_VER(i915) >= 8)
addr = ENGINE_READ64(engine, RING_DMA_FADD, RING_DMA_FADD_UDW);
- else if (GRAPHICS_VER(dev_priv) >= 4)
+ else if (GRAPHICS_VER(i915) >= 4)
addr = ENGINE_READ(engine, RING_DMA_FADD);
else
addr = ENGINE_READ(engine, DMA_FADD_I8XX);
drm_printf(m, "\tDMA_FADDR: 0x%08x_%08x\n",
upper_32_bits(addr), lower_32_bits(addr));
- if (GRAPHICS_VER(dev_priv) >= 4) {
+ if (GRAPHICS_VER(i915) >= 4) {
drm_printf(m, "\tIPEIR: 0x%08x\n",
ENGINE_READ(engine, RING_IPEIR));
drm_printf(m, "\tIPEHR: 0x%08x\n",
@@ -2001,7 +2001,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,
drm_printf(m, "\tIPEHR: 0x%08x\n", ENGINE_READ(engine, IPEHR));
}
- if (HAS_EXECLISTS(dev_priv) && !intel_engine_uses_guc(engine)) {
+ if (HAS_EXECLISTS(i915) && !intel_engine_uses_guc(engine)) {
struct i915_request * const *port, *rq;
const u32 *hws =
&engine->status_page.addr[I915_HWS_CSB_BUF0_INDEX];
@@ -2067,7 +2067,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,
}
rcu_read_unlock();
i915_sched_engine_active_unlock_bh(engine->sched_engine);
- } else if (GRAPHICS_VER(dev_priv) > 6) {
+ } else if (GRAPHICS_VER(i915) > 6) {
drm_printf(m, "\tPP_DIR_BASE: 0x%08x\n",
ENGINE_READ(engine, RING_PP_DIR_BASE));
drm_printf(m, "\tPP_DIR_BASE_READ: 0x%08x\n",
diff --git a/drivers/gpu/drm/i915/gt/intel_gsc.h b/drivers/gpu/drm/i915/gt/intel_gsc.h
index fcac1775e9c39..7ab3ca0f9f268 100644
--- a/drivers/gpu/drm/i915/gt/intel_gsc.h
+++ b/drivers/gpu/drm/i915/gt/intel_gsc.h
@@ -33,7 +33,7 @@ struct intel_gsc {
} intf[INTEL_GSC_NUM_INTERFACES];
};
-void intel_gsc_init(struct intel_gsc *gsc, struct drm_i915_private *dev_priv);
+void intel_gsc_init(struct intel_gsc *gsc, struct drm_i915_private *i915);
void intel_gsc_fini(struct intel_gsc *gsc);
void intel_gsc_irq_handler(struct intel_gt *gt, u32 iir);
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
index a4a8b8bc5737e..53e6396b53eeb 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
@@ -35,7 +35,7 @@
* ignored.
*/
-#define HAS_MSLICE_STEERING(dev_priv) (INTEL_INFO(dev_priv)->has_mslice_steering)
+#define HAS_MSLICE_STEERING(i915) (INTEL_INFO(i915)->has_mslice_steering)
static const char * const intel_steering_types[] = {
"L3BANK",
diff --git a/drivers/gpu/drm/i915/gt/intel_reset_types.h b/drivers/gpu/drm/i915/gt/intel_reset_types.h
index 9312b29f5a97b..80351f0a856c9 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_reset_types.h
@@ -51,7 +51,7 @@ struct intel_reset {
/**
* Waitqueue to signal when the reset has completed. Used by clients
- * that wait for dev_priv->mm.wedged to settle.
+ * that wait for i915->mm.wedged to settle.
*/
wait_queue_head_t queue;
diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
index 827adb0cfaea6..3fd795c3263fd 100644
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -1052,9 +1052,9 @@ static void gen6_bsd_set_default_submission(struct intel_engine_cs *engine)
static void ring_release(struct intel_engine_cs *engine)
{
- struct drm_i915_private *dev_priv = engine->i915;
+ struct drm_i915_private *i915 = engine->i915;
- drm_WARN_ON(&dev_priv->drm, GRAPHICS_VER(dev_priv) > 2 &&
+ drm_WARN_ON(&i915->drm, GRAPHICS_VER(i915) > 2 &&
(ENGINE_READ(engine, RING_MI_MODE) & MODE_IDLE) == 0);
intel_engine_cleanup_common(engine);
diff --git a/drivers/gpu/drm/i915/gt/intel_rps_types.h b/drivers/gpu/drm/i915/gt/intel_rps_types.h
index 9173ec75f2b87..6507fa3f6d1e8 100644
--- a/drivers/gpu/drm/i915/gt/intel_rps_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_rps_types.h
@@ -57,7 +57,7 @@ struct intel_rps {
/*
* work, interrupts_enabled and pm_iir are protected by
- * dev_priv->irq_lock
+ * i915->irq_lock
*/
struct timer_list timer;
struct work_struct work;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
index 818e9e0e66a83..195db8c9d4200 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
@@ -520,7 +520,7 @@ void intel_guc_log_init_early(struct intel_guc_log *log)
static int guc_log_relay_create(struct intel_guc_log *log)
{
struct intel_guc *guc = log_to_guc(log);
- struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;
+ struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
struct rchan *guc_log_relay_chan;
size_t n_subbufs, subbuf_size;
int ret;
@@ -543,9 +543,9 @@ static int guc_log_relay_create(struct intel_guc_log *log)
n_subbufs = 8;
guc_log_relay_chan = relay_open("guc_log",
- dev_priv->drm.primary->debugfs_root,
+ i915->drm.primary->debugfs_root,
subbuf_size, n_subbufs,
- &relay_callbacks, dev_priv);
+ &relay_callbacks, i915);
if (!guc_log_relay_chan) {
guc_err(guc, "Couldn't create relay channel for logging\n");
@@ -570,7 +570,7 @@ static void guc_log_relay_destroy(struct intel_guc_log *log)
static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log)
{
struct intel_guc *guc = log_to_guc(log);
- struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;
+ struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
intel_wakeref_t wakeref;
_guc_log_copy_debuglogs_for_relay(log);
@@ -579,7 +579,7 @@ static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log)
* Generally device is expected to be active only at this
* time, so get/put should be really quick.
*/
- with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref)
+ with_intel_runtime_pm(&i915->runtime_pm, wakeref)
guc_action_flush_log_complete(guc);
}
@@ -661,7 +661,7 @@ void intel_guc_log_destroy(struct intel_guc_log *log)
int intel_guc_log_set_level(struct intel_guc_log *log, u32 level)
{
struct intel_guc *guc = log_to_guc(log);
- struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;
+ struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
intel_wakeref_t wakeref;
int ret = 0;
@@ -675,12 +675,12 @@ int intel_guc_log_set_level(struct intel_guc_log *log, u32 level)
if (level < GUC_LOG_LEVEL_DISABLED || level > GUC_LOG_LEVEL_MAX)
return -EINVAL;
- mutex_lock(&dev_priv->drm.struct_mutex);
+ mutex_lock(&i915->drm.struct_mutex);
if (log->level == level)
goto out_unlock;
- with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref)
+ with_intel_runtime_pm(&i915->runtime_pm, wakeref)
ret = guc_action_control_log(guc,
GUC_LOG_LEVEL_IS_VERBOSE(level),
GUC_LOG_LEVEL_IS_ENABLED(level),
@@ -693,7 +693,7 @@ int intel_guc_log_set_level(struct intel_guc_log *log, u32 level)
log->level = level;
out_unlock:
- mutex_unlock(&dev_priv->drm.struct_mutex);
+ mutex_unlock(&i915->drm.struct_mutex);
return ret;
}
--
2.39.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Use i915 instead of dev_priv as name for the private device
2023-02-10 15:03 [Intel-gfx] [PATCH] drm/i915/gt: Use i915 instead of dev_priv as name for the private device Andi Shyti
@ 2023-02-10 19:02 ` Patchwork
2023-02-11 13:31 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-02-13 13:11 ` [Intel-gfx] [PATCH] " Das, Nirmoy
2 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-02-10 19:02 UTC (permalink / raw)
To: Andi Shyti; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 2629 bytes --]
== Series Details ==
Series: drm/i915/gt: Use i915 instead of dev_priv as name for the private device
URL : https://patchwork.freedesktop.org/series/113899/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12729 -> Patchwork_113899v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/index.html
Participating hosts (41 -> 39)
------------------------------
Missing (2): fi-kbl-soraka fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_113899v1 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@i915_pm_rpm@basic-rte:
- {bat-adlp-6}: [ABORT][1] ([i915#7977]) -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/bat-adlp-6/igt@i915_pm_rpm@basic-rte.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/bat-adlp-6/igt@i915_pm_rpm@basic-rte.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6997]: https://gitlab.freedesktop.org/drm/intel/issues/6997
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7911]: https://gitlab.freedesktop.org/drm/intel/issues/7911
[i915#7977]: https://gitlab.freedesktop.org/drm/intel/issues/7977
[i915#7982]: https://gitlab.freedesktop.org/drm/intel/issues/7982
Build changes
-------------
* Linux: CI_DRM_12729 -> Patchwork_113899v1
CI-20190529: 20190529
CI_DRM_12729: d09b2cf01d8c5bf0a3a2b544dad1ac987727d9d8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7157: 96d12fdc942cee9526a951b377b195ca9c8276b1 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113899v1: d09b2cf01d8c5bf0a3a2b544dad1ac987727d9d8 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
90c7802fa830 drm/i915/gt: Use i915 instead of dev_priv as name for the private device
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/index.html
[-- Attachment #2: Type: text/html, Size: 2486 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/gt: Use i915 instead of dev_priv as name for the private device
2023-02-10 15:03 [Intel-gfx] [PATCH] drm/i915/gt: Use i915 instead of dev_priv as name for the private device Andi Shyti
2023-02-10 19:02 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2023-02-11 13:31 ` Patchwork
2023-02-13 13:11 ` [Intel-gfx] [PATCH] " Das, Nirmoy
2 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-02-11 13:31 UTC (permalink / raw)
To: Andi Shyti; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 21408 bytes --]
== Series Details ==
Series: drm/i915/gt: Use i915 instead of dev_priv as name for the private device
URL : https://patchwork.freedesktop.org/series/113899/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12729_full -> Patchwork_113899v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/index.html
Participating hosts (9 -> 10)
------------------------------
Additional (1): shard-rkl0
Known issues
------------
Here are the changes found in Patchwork_113899v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#2842])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-glk5/igt@gem_exec_fair@basic-pace-share@rcs0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-glk8/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_lmem_swapping@random:
- shard-glk: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#4613])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-glk8/igt@gem_lmem_swapping@random.html
* igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#3886])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-glk8/igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_color@ctm-0-25@pipe-b-vga-1:
- shard-snb: NOTRUN -> [SKIP][5] ([fdo#109271]) +11 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-snb6/igt@kms_color@ctm-0-25@pipe-b-vga-1.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-gtt:
- shard-glk: NOTRUN -> [SKIP][6] ([fdo#109271]) +19 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-glk8/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_plane_alpha_blend@alpha-transparent-fb@pipe-b-hdmi-a-2:
- shard-glk: NOTRUN -> [FAIL][7] ([i915#4573]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-glk8/igt@kms_plane_alpha_blend@alpha-transparent-fb@pipe-b-hdmi-a-2.html
#### Possible fixes ####
* igt@gem_exec_fair@basic-none@vcs0:
- shard-glk: [FAIL][8] ([i915#2842]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-glk2/igt@gem_exec_fair@basic-none@vcs0.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-glk3/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-pace@rcs0:
- {shard-rkl}: [FAIL][10] ([i915#2842]) -> [PASS][11] +3 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-6/igt@gem_exec_fair@basic-pace@rcs0.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-5/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@gem_exec_reloc@basic-gtt-wc-noreloc:
- {shard-rkl}: [SKIP][12] ([i915#3281]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-6/igt@gem_exec_reloc@basic-gtt-wc-noreloc.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-5/igt@gem_exec_reloc@basic-gtt-wc-noreloc.html
* igt@gem_readwrite@write-bad-handle:
- {shard-rkl}: [SKIP][14] ([i915#3282]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-6/igt@gem_readwrite@write-bad-handle.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-5/igt@gem_readwrite@write-bad-handle.html
* igt@gem_softpin@noreloc-s3:
- shard-glk: [TIMEOUT][16] -> [PASS][17] +1 similar issue
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-glk6/igt@gem_softpin@noreloc-s3.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-glk8/igt@gem_softpin@noreloc-s3.html
* igt@gen9_exec_parse@bb-start-far:
- {shard-rkl}: [SKIP][18] ([i915#2527]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-6/igt@gen9_exec_parse@bb-start-far.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-5/igt@gen9_exec_parse@bb-start-far.html
* igt@i915_pm_rpm@dpms-lpsp:
- {shard-rkl}: [SKIP][20] ([i915#1397]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-3/igt@i915_pm_rpm@dpms-lpsp.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-6/igt@i915_pm_rpm@dpms-lpsp.html
* igt@i915_pm_rpm@dpms-mode-unset-lpsp:
- {shard-tglu}: [SKIP][22] ([i915#1397]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-tglu-6/igt@i915_pm_rpm@dpms-mode-unset-lpsp.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-tglu-1/igt@i915_pm_rpm@dpms-mode-unset-lpsp.html
* igt@i915_pm_rpm@system-suspend-modeset:
- {shard-tglu}: [SKIP][24] ([i915#3547]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-tglu-6/igt@i915_pm_rpm@system-suspend-modeset.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-tglu-1/igt@i915_pm_rpm@system-suspend-modeset.html
* igt@kms_big_fb@linear-8bpp-rotate-180:
- {shard-tglu}: [SKIP][26] ([i915#7651]) -> [PASS][27] +8 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-tglu-6/igt@kms_big_fb@linear-8bpp-rotate-180.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-tglu-1/igt@kms_big_fb@linear-8bpp-rotate-180.html
* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip:
- {shard-tglu}: [SKIP][28] ([i915#1845] / [i915#7651]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-tglu-6/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-tglu-1/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html
* igt@kms_draw_crc@fill-fb:
- {shard-tglu}: [SKIP][30] ([i915#1845]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-tglu-6/igt@kms_draw_crc@fill-fb.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-tglu-1/igt@kms_draw_crc@fill-fb.html
* igt@kms_fbcon_fbt@fbc:
- {shard-rkl}: [SKIP][32] ([i915#4098]) -> [PASS][33] +1 similar issue
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-3/igt@kms_fbcon_fbt@fbc.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-6/igt@kms_fbcon_fbt@fbc.html
* igt@kms_flip@plain-flip-ts-check-interruptible@c-hdmi-a1:
- shard-glk: [FAIL][34] ([i915#2122]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-glk3/igt@kms_flip@plain-flip-ts-check-interruptible@c-hdmi-a1.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-glk5/igt@kms_flip@plain-flip-ts-check-interruptible@c-hdmi-a1.html
* igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw:
- {shard-tglu}: [SKIP][36] ([i915#1849]) -> [PASS][37] +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-tglu-6/igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-tglu-1/igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw.html
* igt@kms_frontbuffer_tracking@fbc-tiling-linear:
- {shard-rkl}: [SKIP][38] ([i915#1849] / [i915#4098]) -> [PASS][39] +13 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-3/igt@kms_frontbuffer_tracking@fbc-tiling-linear.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-6/igt@kms_frontbuffer_tracking@fbc-tiling-linear.html
* igt@kms_plane@plane-position-hole@pipe-b-planes:
- {shard-rkl}: [SKIP][40] ([i915#1849]) -> [PASS][41] +3 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-1/igt@kms_plane@plane-position-hole@pipe-b-planes.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-6/igt@kms_plane@plane-position-hole@pipe-b-planes.html
* igt@kms_psr@cursor_render:
- {shard-rkl}: [SKIP][42] ([i915#1072]) -> [PASS][43] +1 similar issue
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-1/igt@kms_psr@cursor_render.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-6/igt@kms_psr@cursor_render.html
* igt@kms_psr_stress_test@invalidate-primary-flip-overlay:
- {shard-rkl}: [SKIP][44] ([i915#5461]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-3/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-6/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html
* igt@kms_universal_plane@cursor-fb-leak-pipe-a:
- {shard-rkl}: [SKIP][46] ([i915#1845] / [i915#4070] / [i915#4098]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-1/igt@kms_universal_plane@cursor-fb-leak-pipe-a.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-6/igt@kms_universal_plane@cursor-fb-leak-pipe-a.html
* igt@kms_vblank@pipe-b-accuracy-idle:
- {shard-rkl}: [SKIP][48] ([i915#1845] / [i915#4098]) -> [PASS][49] +26 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-3/igt@kms_vblank@pipe-b-accuracy-idle.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-6/igt@kms_vblank@pipe-b-accuracy-idle.html
* igt@perf@non-zero-reason:
- shard-glk: [TIMEOUT][50] ([i915#6943]) -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-glk6/igt@perf@non-zero-reason.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-glk8/igt@perf@non-zero-reason.html
* igt@prime_vgem@basic-fence-flip:
- {shard-rkl}: [SKIP][52] ([fdo#109295] / [i915#3708] / [i915#4098]) -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12729/shard-rkl-3/igt@prime_vgem@basic-fence-flip.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/shard-rkl-6/igt@prime_vgem@basic-fence-flip.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3547]: https://gitlab.freedesktop.org/drm/intel/issues/3547
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3936]: https://gitlab.freedesktop.org/drm/intel/issues/3936
[i915#3952]: https://gitlab.freedesktop.org/drm/intel/issues/3952
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#426]: https://gitlab.freedesktop.org/drm/intel/issues/426
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#433]: https://gitlab.freedesktop.org/drm/intel/issues/433
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565
[i915#4573]: https://gitlab.freedesktop.org/drm/intel/issues/4573
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4771]: https://gitlab.freedesktop.org/drm/intel/issues/4771
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4859]: https://gitlab.freedesktop.org/drm/intel/issues/4859
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880
[i915#4884]: https://gitlab.freedesktop.org/drm/intel/issues/4884
[i915#5030]: https://gitlab.freedesktop.org/drm/intel/issues/5030
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247
[i915#6259]: https://gitlab.freedesktop.org/drm/intel/issues/6259
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6943]: https://gitlab.freedesktop.org/drm/intel/issues/6943
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#7037]: https://gitlab.freedesktop.org/drm/intel/issues/7037
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7582]: https://gitlab.freedesktop.org/drm/intel/issues/7582
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7707]: https://gitlab.freedesktop.org/drm/intel/issues/7707
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7949]: https://gitlab.freedesktop.org/drm/intel/issues/7949
[i915#7957]: https://gitlab.freedesktop.org/drm/intel/issues/7957
[i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
Build changes
-------------
* Linux: CI_DRM_12729 -> Patchwork_113899v1
CI-20190529: 20190529
CI_DRM_12729: d09b2cf01d8c5bf0a3a2b544dad1ac987727d9d8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7157: 96d12fdc942cee9526a951b377b195ca9c8276b1 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113899v1: d09b2cf01d8c5bf0a3a2b544dad1ac987727d9d8 @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113899v1/index.html
[-- Attachment #2: Type: text/html, Size: 15313 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Use i915 instead of dev_priv as name for the private device
2023-02-10 15:03 [Intel-gfx] [PATCH] drm/i915/gt: Use i915 instead of dev_priv as name for the private device Andi Shyti
2023-02-10 19:02 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2023-02-11 13:31 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
@ 2023-02-13 13:11 ` Das, Nirmoy
2023-02-13 15:31 ` Jani Nikula
2023-02-13 23:36 ` Lucas De Marchi
2 siblings, 2 replies; 9+ messages in thread
From: Das, Nirmoy @ 2023-02-13 13:11 UTC (permalink / raw)
To: Andi Shyti, intel-gfx; +Cc: Rodrigo Vivi
On 2/10/2023 4:03 PM, Andi Shyti wrote:
> It is becoming a strong habit to call the drm_i915_private
> structures "i915", but there are still many left that are called
> dev_priv.
>
> Sometimes this makes grepping a bit challenging and anyway it
> keeps a coherent style.
>
> Rename all the "dev_priv" structures in the gt/* directory to
> "i915".
>
> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
> ---
> Hi,
>
> just checking if we want something similar. I have this same
> replicated patch for the rest of i915 but I want to make sure we
> actually want it.
I might be lacking historical context here but I assumption is we are
moving towards replacing dev_priv with i915 everywhere.
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
>
> Andi
>
> drivers/gpu/drm/i915/gt/intel_engine_cs.c | 18 +++++++++---------
> drivers/gpu/drm/i915/gt/intel_gsc.h | 2 +-
> drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 2 +-
> drivers/gpu/drm/i915/gt/intel_reset_types.h | 2 +-
> .../gpu/drm/i915/gt/intel_ring_submission.c | 4 ++--
> drivers/gpu/drm/i915/gt/intel_rps_types.h | 2 +-
> drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 18 +++++++++---------
> 7 files changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> index d4e29da74612d..c6271440afbd3 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
> @@ -1939,13 +1939,13 @@ static const char *repr_timer(const struct timer_list *t)
> static void intel_engine_print_registers(struct intel_engine_cs *engine,
> struct drm_printer *m)
> {
> - struct drm_i915_private *dev_priv = engine->i915;
> + struct drm_i915_private *i915 = engine->i915;
> struct intel_engine_execlists * const execlists = &engine->execlists;
> u64 addr;
>
> - if (engine->id == RENDER_CLASS && IS_GRAPHICS_VER(dev_priv, 4, 7))
> + if (engine->id == RENDER_CLASS && IS_GRAPHICS_VER(i915, 4, 7))
> drm_printf(m, "\tCCID: 0x%08x\n", ENGINE_READ(engine, CCID));
> - if (HAS_EXECLISTS(dev_priv)) {
> + if (HAS_EXECLISTS(i915)) {
> drm_printf(m, "\tEL_STAT_HI: 0x%08x\n",
> ENGINE_READ(engine, RING_EXECLIST_STATUS_HI));
> drm_printf(m, "\tEL_STAT_LO: 0x%08x\n",
> @@ -1966,7 +1966,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,
> ENGINE_READ(engine, RING_MI_MODE) & (MODE_IDLE) ? " [idle]" : "");
> }
>
> - if (GRAPHICS_VER(dev_priv) >= 6) {
> + if (GRAPHICS_VER(i915) >= 6) {
> drm_printf(m, "\tRING_IMR: 0x%08x\n",
> ENGINE_READ(engine, RING_IMR));
> drm_printf(m, "\tRING_ESR: 0x%08x\n",
> @@ -1983,15 +1983,15 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,
> addr = intel_engine_get_last_batch_head(engine);
> drm_printf(m, "\tBBADDR: 0x%08x_%08x\n",
> upper_32_bits(addr), lower_32_bits(addr));
> - if (GRAPHICS_VER(dev_priv) >= 8)
> + if (GRAPHICS_VER(i915) >= 8)
> addr = ENGINE_READ64(engine, RING_DMA_FADD, RING_DMA_FADD_UDW);
> - else if (GRAPHICS_VER(dev_priv) >= 4)
> + else if (GRAPHICS_VER(i915) >= 4)
> addr = ENGINE_READ(engine, RING_DMA_FADD);
> else
> addr = ENGINE_READ(engine, DMA_FADD_I8XX);
> drm_printf(m, "\tDMA_FADDR: 0x%08x_%08x\n",
> upper_32_bits(addr), lower_32_bits(addr));
> - if (GRAPHICS_VER(dev_priv) >= 4) {
> + if (GRAPHICS_VER(i915) >= 4) {
> drm_printf(m, "\tIPEIR: 0x%08x\n",
> ENGINE_READ(engine, RING_IPEIR));
> drm_printf(m, "\tIPEHR: 0x%08x\n",
> @@ -2001,7 +2001,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,
> drm_printf(m, "\tIPEHR: 0x%08x\n", ENGINE_READ(engine, IPEHR));
> }
>
> - if (HAS_EXECLISTS(dev_priv) && !intel_engine_uses_guc(engine)) {
> + if (HAS_EXECLISTS(i915) && !intel_engine_uses_guc(engine)) {
> struct i915_request * const *port, *rq;
> const u32 *hws =
> &engine->status_page.addr[I915_HWS_CSB_BUF0_INDEX];
> @@ -2067,7 +2067,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,
> }
> rcu_read_unlock();
> i915_sched_engine_active_unlock_bh(engine->sched_engine);
> - } else if (GRAPHICS_VER(dev_priv) > 6) {
> + } else if (GRAPHICS_VER(i915) > 6) {
> drm_printf(m, "\tPP_DIR_BASE: 0x%08x\n",
> ENGINE_READ(engine, RING_PP_DIR_BASE));
> drm_printf(m, "\tPP_DIR_BASE_READ: 0x%08x\n",
> diff --git a/drivers/gpu/drm/i915/gt/intel_gsc.h b/drivers/gpu/drm/i915/gt/intel_gsc.h
> index fcac1775e9c39..7ab3ca0f9f268 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gsc.h
> +++ b/drivers/gpu/drm/i915/gt/intel_gsc.h
> @@ -33,7 +33,7 @@ struct intel_gsc {
> } intf[INTEL_GSC_NUM_INTERFACES];
> };
>
> -void intel_gsc_init(struct intel_gsc *gsc, struct drm_i915_private *dev_priv);
> +void intel_gsc_init(struct intel_gsc *gsc, struct drm_i915_private *i915);
> void intel_gsc_fini(struct intel_gsc *gsc);
> void intel_gsc_irq_handler(struct intel_gt *gt, u32 iir);
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
> index a4a8b8bc5737e..53e6396b53eeb 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c
> @@ -35,7 +35,7 @@
> * ignored.
> */
>
> -#define HAS_MSLICE_STEERING(dev_priv) (INTEL_INFO(dev_priv)->has_mslice_steering)
> +#define HAS_MSLICE_STEERING(i915) (INTEL_INFO(i915)->has_mslice_steering)
>
> static const char * const intel_steering_types[] = {
> "L3BANK",
> diff --git a/drivers/gpu/drm/i915/gt/intel_reset_types.h b/drivers/gpu/drm/i915/gt/intel_reset_types.h
> index 9312b29f5a97b..80351f0a856c9 100644
> --- a/drivers/gpu/drm/i915/gt/intel_reset_types.h
> +++ b/drivers/gpu/drm/i915/gt/intel_reset_types.h
> @@ -51,7 +51,7 @@ struct intel_reset {
>
> /**
> * Waitqueue to signal when the reset has completed. Used by clients
> - * that wait for dev_priv->mm.wedged to settle.
> + * that wait for i915->mm.wedged to settle.
> */
> wait_queue_head_t queue;
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> index 827adb0cfaea6..3fd795c3263fd 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> @@ -1052,9 +1052,9 @@ static void gen6_bsd_set_default_submission(struct intel_engine_cs *engine)
>
> static void ring_release(struct intel_engine_cs *engine)
> {
> - struct drm_i915_private *dev_priv = engine->i915;
> + struct drm_i915_private *i915 = engine->i915;
>
> - drm_WARN_ON(&dev_priv->drm, GRAPHICS_VER(dev_priv) > 2 &&
> + drm_WARN_ON(&i915->drm, GRAPHICS_VER(i915) > 2 &&
> (ENGINE_READ(engine, RING_MI_MODE) & MODE_IDLE) == 0);
>
> intel_engine_cleanup_common(engine);
> diff --git a/drivers/gpu/drm/i915/gt/intel_rps_types.h b/drivers/gpu/drm/i915/gt/intel_rps_types.h
> index 9173ec75f2b87..6507fa3f6d1e8 100644
> --- a/drivers/gpu/drm/i915/gt/intel_rps_types.h
> +++ b/drivers/gpu/drm/i915/gt/intel_rps_types.h
> @@ -57,7 +57,7 @@ struct intel_rps {
>
> /*
> * work, interrupts_enabled and pm_iir are protected by
> - * dev_priv->irq_lock
> + * i915->irq_lock
> */
> struct timer_list timer;
> struct work_struct work;
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
> index 818e9e0e66a83..195db8c9d4200 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
> @@ -520,7 +520,7 @@ void intel_guc_log_init_early(struct intel_guc_log *log)
> static int guc_log_relay_create(struct intel_guc_log *log)
> {
> struct intel_guc *guc = log_to_guc(log);
> - struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;
> + struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
> struct rchan *guc_log_relay_chan;
> size_t n_subbufs, subbuf_size;
> int ret;
> @@ -543,9 +543,9 @@ static int guc_log_relay_create(struct intel_guc_log *log)
> n_subbufs = 8;
>
> guc_log_relay_chan = relay_open("guc_log",
> - dev_priv->drm.primary->debugfs_root,
> + i915->drm.primary->debugfs_root,
> subbuf_size, n_subbufs,
> - &relay_callbacks, dev_priv);
> + &relay_callbacks, i915);
> if (!guc_log_relay_chan) {
> guc_err(guc, "Couldn't create relay channel for logging\n");
>
> @@ -570,7 +570,7 @@ static void guc_log_relay_destroy(struct intel_guc_log *log)
> static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log)
> {
> struct intel_guc *guc = log_to_guc(log);
> - struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;
> + struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
> intel_wakeref_t wakeref;
>
> _guc_log_copy_debuglogs_for_relay(log);
> @@ -579,7 +579,7 @@ static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log)
> * Generally device is expected to be active only at this
> * time, so get/put should be really quick.
> */
> - with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref)
> + with_intel_runtime_pm(&i915->runtime_pm, wakeref)
> guc_action_flush_log_complete(guc);
> }
>
> @@ -661,7 +661,7 @@ void intel_guc_log_destroy(struct intel_guc_log *log)
> int intel_guc_log_set_level(struct intel_guc_log *log, u32 level)
> {
> struct intel_guc *guc = log_to_guc(log);
> - struct drm_i915_private *dev_priv = guc_to_gt(guc)->i915;
> + struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
> intel_wakeref_t wakeref;
> int ret = 0;
>
> @@ -675,12 +675,12 @@ int intel_guc_log_set_level(struct intel_guc_log *log, u32 level)
> if (level < GUC_LOG_LEVEL_DISABLED || level > GUC_LOG_LEVEL_MAX)
> return -EINVAL;
>
> - mutex_lock(&dev_priv->drm.struct_mutex);
> + mutex_lock(&i915->drm.struct_mutex);
>
> if (log->level == level)
> goto out_unlock;
>
> - with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref)
> + with_intel_runtime_pm(&i915->runtime_pm, wakeref)
> ret = guc_action_control_log(guc,
> GUC_LOG_LEVEL_IS_VERBOSE(level),
> GUC_LOG_LEVEL_IS_ENABLED(level),
> @@ -693,7 +693,7 @@ int intel_guc_log_set_level(struct intel_guc_log *log, u32 level)
> log->level = level;
>
> out_unlock:
> - mutex_unlock(&dev_priv->drm.struct_mutex);
> + mutex_unlock(&i915->drm.struct_mutex);
>
> return ret;
> }
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Use i915 instead of dev_priv as name for the private device
2023-02-13 13:11 ` [Intel-gfx] [PATCH] " Das, Nirmoy
@ 2023-02-13 15:31 ` Jani Nikula
2023-02-13 23:36 ` Lucas De Marchi
1 sibling, 0 replies; 9+ messages in thread
From: Jani Nikula @ 2023-02-13 15:31 UTC (permalink / raw)
To: Das, Nirmoy, Andi Shyti, intel-gfx; +Cc: Rodrigo Vivi
On Mon, 13 Feb 2023, "Das, Nirmoy" <nirmoy.das@linux.intel.com> wrote:
> On 2/10/2023 4:03 PM, Andi Shyti wrote:
>> It is becoming a strong habit to call the drm_i915_private
>> structures "i915", but there are still many left that are called
>> dev_priv.
>>
>> Sometimes this makes grepping a bit challenging and anyway it
>> keeps a coherent style.
>>
>> Rename all the "dev_priv" structures in the gt/* directory to
>> "i915".
>>
>> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
>> ---
>> Hi,
>>
>> just checking if we want something similar. I have this same
>> replicated patch for the rest of i915 but I want to make sure we
>> actually want it.
>
> I might be lacking historical context here but I assumption is we are
> moving towards replacing dev_priv with i915 everywhere.
Yes. The implicit dev_priv still present in some of the register macros
is the only reason not to convert, and even in those cases we should
look into fixing that too.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Use i915 instead of dev_priv as name for the private device
2023-02-13 13:11 ` [Intel-gfx] [PATCH] " Das, Nirmoy
2023-02-13 15:31 ` Jani Nikula
@ 2023-02-13 23:36 ` Lucas De Marchi
2023-02-14 10:39 ` Andi Shyti
2023-02-14 11:32 ` Das, Nirmoy
1 sibling, 2 replies; 9+ messages in thread
From: Lucas De Marchi @ 2023-02-13 23:36 UTC (permalink / raw)
To: Das, Nirmoy; +Cc: intel-gfx, Rodrigo Vivi
On Mon, Feb 13, 2023 at 02:11:26PM +0100, Das, Nirmoy wrote:
>
>On 2/10/2023 4:03 PM, Andi Shyti wrote:
>>It is becoming a strong habit to call the drm_i915_private
>>structures "i915", but there are still many left that are called
>>dev_priv.
>>
>>Sometimes this makes grepping a bit challenging and anyway it
>>keeps a coherent style.
>>
>>Rename all the "dev_priv" structures in the gt/* directory to
>>"i915".
>>
>>Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
>>---
>>Hi,
>>
>>just checking if we want something similar. I have this same
>>replicated patch for the rest of i915 but I want to make sure we
>>actually want it.
>
>I might be lacking historical context here but I assumption is we are
>moving towards replacing dev_priv with i915 everywhere.
Context: 20230201135329.514677-1-luciano.coelho@intel.com and 87bkml5wv4.fsf@intel.com
Lucas De Marchi
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Use i915 instead of dev_priv as name for the private device
2023-02-13 23:36 ` Lucas De Marchi
@ 2023-02-14 10:39 ` Andi Shyti
2023-02-14 11:00 ` Tvrtko Ursulin
2023-02-14 11:32 ` Das, Nirmoy
1 sibling, 1 reply; 9+ messages in thread
From: Andi Shyti @ 2023-02-14 10:39 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: Jani Nikula, intel-gfx, Rodrigo Vivi
Hi,
On Mon, Feb 13, 2023 at 03:36:54PM -0800, Lucas De Marchi wrote:
> On Mon, Feb 13, 2023 at 02:11:26PM +0100, Das, Nirmoy wrote:
> >
> > On 2/10/2023 4:03 PM, Andi Shyti wrote:
> > > It is becoming a strong habit to call the drm_i915_private
> > > structures "i915", but there are still many left that are called
> > > dev_priv.
> > >
> > > Sometimes this makes grepping a bit challenging and anyway it
> > > keeps a coherent style.
> > >
> > > Rename all the "dev_priv" structures in the gt/* directory to
> > > "i915".
> > >
> > > Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
> > > ---
> > > Hi,
> > >
> > > just checking if we want something similar. I have this same
> > > replicated patch for the rest of i915 but I want to make sure we
> > > actually want it.
Thanks Nirmoy for the review!
> > I might be lacking historical context here but I assumption is we are
> > moving towards replacing dev_priv with i915 everywhere.
>
> Context: 20230201135329.514677-1-luciano.coelho@intel.com and 87bkml5wv4.fsf@intel.com
I think I have everything fixed, just didn't have time to format
patches correctly. So that I decided to take this baby step
to test the ground first and then move forward in the next couple
of weeks.
I don't think this patch that affects only the content of "gt/"
has any dependency on dev_priv macros so that please let me know
if anyone has anything against.
Thanks,
Andi
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Use i915 instead of dev_priv as name for the private device
2023-02-14 10:39 ` Andi Shyti
@ 2023-02-14 11:00 ` Tvrtko Ursulin
0 siblings, 0 replies; 9+ messages in thread
From: Tvrtko Ursulin @ 2023-02-14 11:00 UTC (permalink / raw)
To: Andi Shyti, Lucas De Marchi; +Cc: Jani Nikula, intel-gfx, Rodrigo Vivi
On 14/02/2023 10:39, Andi Shyti wrote:
> Hi,
>
> On Mon, Feb 13, 2023 at 03:36:54PM -0800, Lucas De Marchi wrote:
>> On Mon, Feb 13, 2023 at 02:11:26PM +0100, Das, Nirmoy wrote:
>>>
>>> On 2/10/2023 4:03 PM, Andi Shyti wrote:
>>>> It is becoming a strong habit to call the drm_i915_private
>>>> structures "i915", but there are still many left that are called
>>>> dev_priv.
>>>>
>>>> Sometimes this makes grepping a bit challenging and anyway it
>>>> keeps a coherent style.
>>>>
>>>> Rename all the "dev_priv" structures in the gt/* directory to
>>>> "i915".
>>>>
>>>> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
>>>> ---
>>>> Hi,
>>>>
>>>> just checking if we want something similar. I have this same
>>>> replicated patch for the rest of i915 but I want to make sure we
>>>> actually want it.
>
> Thanks Nirmoy for the review!
>
>>> I might be lacking historical context here but I assumption is we are
>>> moving towards replacing dev_priv with i915 everywhere.
>>
>> Context: 20230201135329.514677-1-luciano.coelho@intel.com and 87bkml5wv4.fsf@intel.com
>
> I think I have everything fixed, just didn't have time to format
> patches correctly. So that I decided to take this baby step
> to test the ground first and then move forward in the next couple
> of weeks.
>
> I don't think this patch that affects only the content of "gt/"
> has any dependency on dev_priv macros so that please let me know
> if anyone has anything against.
No complaints, to the contrary!
Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Use i915 instead of dev_priv as name for the private device
2023-02-13 23:36 ` Lucas De Marchi
2023-02-14 10:39 ` Andi Shyti
@ 2023-02-14 11:32 ` Das, Nirmoy
1 sibling, 0 replies; 9+ messages in thread
From: Das, Nirmoy @ 2023-02-14 11:32 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx, Rodrigo Vivi
On 2/14/2023 12:36 AM, Lucas De Marchi wrote:
> On Mon, Feb 13, 2023 at 02:11:26PM +0100, Das, Nirmoy wrote:
>>
>> On 2/10/2023 4:03 PM, Andi Shyti wrote:
>>> It is becoming a strong habit to call the drm_i915_private
>>> structures "i915", but there are still many left that are called
>>> dev_priv.
>>>
>>> Sometimes this makes grepping a bit challenging and anyway it
>>> keeps a coherent style.
>>>
>>> Rename all the "dev_priv" structures in the gt/* directory to
>>> "i915".
>>>
>>> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
>>> ---
>>> Hi,
>>>
>>> just checking if we want something similar. I have this same
>>> replicated patch for the rest of i915 but I want to make sure we
>>> actually want it.
>>
>> I might be lacking historical context here but I assumption is we are
>> moving towards replacing dev_priv with i915 everywhere.
>
> Context: 20230201135329.514677-1-luciano.coelho@intel.com and
> 87bkml5wv4.fsf@intel.com
Thanks, Lucas.
> Lucas De Marchi
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-02-14 11:32 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-10 15:03 [Intel-gfx] [PATCH] drm/i915/gt: Use i915 instead of dev_priv as name for the private device Andi Shyti
2023-02-10 19:02 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2023-02-11 13:31 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-02-13 13:11 ` [Intel-gfx] [PATCH] " Das, Nirmoy
2023-02-13 15:31 ` Jani Nikula
2023-02-13 23:36 ` Lucas De Marchi
2023-02-14 10:39 ` Andi Shyti
2023-02-14 11:00 ` Tvrtko Ursulin
2023-02-14 11:32 ` Das, Nirmoy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.