* [Intel-xe] [RFC 0/3] Use common wrapper to get step name
@ 2023-09-18 12:02 Chaitanya Kumar Borah
2023-09-18 12:02 ` [Intel-xe] [RFC 1/3] drm/i915: Add wrapper for xe compatibility Chaitanya Kumar Borah
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Chaitanya Kumar Borah @ 2023-09-18 12:02 UTC (permalink / raw)
To: intel-xe
Use wrapper common for both xe and i915 to get the display step name.
This patch partially reverts the changes made in
commit 8c4154824537 ("FIXME: drm/i915/dmc: xe way of getting at stepping")
TODO: Find cleaner solution for rest(not stepping related) of the Fixme
patch
Chaitanya Kumar Borah (3):
drm/i915: Add wrapper for xe compatibility
drm/xe: Add wrapper over intel_step_name
drm/i915/dmc: Use common wrapper to get step name
drivers/gpu/drm/i915/display/intel_dmc.c | 7 ++-----
drivers/gpu/drm/i915/intel_step.c | 5 +++++
drivers/gpu/drm/i915/intel_step.h | 1 +
drivers/gpu/drm/xe/xe_step.c | 5 +++++
drivers/gpu/drm/xe/xe_step.h | 1 +
5 files changed, 14 insertions(+), 5 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-xe] [RFC 1/3] drm/i915: Add wrapper for xe compatibility
2023-09-18 12:02 [Intel-xe] [RFC 0/3] Use common wrapper to get step name Chaitanya Kumar Borah
@ 2023-09-18 12:02 ` Chaitanya Kumar Borah
2023-09-18 12:02 ` [Intel-xe] [RFC 2/3] drm/xe: Add wrapper over intel_step_name Chaitanya Kumar Borah
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Chaitanya Kumar Borah @ 2023-09-18 12:02 UTC (permalink / raw)
To: intel-xe
Add a wrapper around intel_step_name to maintain compatibility
with xe driver. The wrapper will share the same name as the one
to be used by xe while both drivers include different files as
needed during compilation.
Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
drivers/gpu/drm/i915/intel_step.c | 5 +++++
drivers/gpu/drm/i915/intel_step.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c
index c02a6f156a00..6b62b5fcc792 100644
--- a/drivers/gpu/drm/i915/intel_step.c
+++ b/drivers/gpu/drm/i915/intel_step.c
@@ -352,3 +352,8 @@ const char *intel_step_name(enum intel_step step)
return "**";
}
}
+
+const char *intel_get_step_name(struct drm_i915_private *i915)
+{
+ return intel_step_name(RUNTIME_INFO(i915)->step.display_step);
+}
diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h
index 96dfca4cba73..25a1b1948a43 100644
--- a/drivers/gpu/drm/i915/intel_step.h
+++ b/drivers/gpu/drm/i915/intel_step.h
@@ -78,5 +78,6 @@ enum intel_step {
void intel_step_init(struct drm_i915_private *i915);
const char *intel_step_name(enum intel_step step);
+const char *intel_get_step_name(struct drm_i915_private *i915);
#endif /* __INTEL_STEP_H__ */
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-xe] [RFC 2/3] drm/xe: Add wrapper over intel_step_name
2023-09-18 12:02 [Intel-xe] [RFC 0/3] Use common wrapper to get step name Chaitanya Kumar Borah
2023-09-18 12:02 ` [Intel-xe] [RFC 1/3] drm/i915: Add wrapper for xe compatibility Chaitanya Kumar Borah
@ 2023-09-18 12:02 ` Chaitanya Kumar Borah
2023-09-19 14:04 ` Jani Nikula
2023-09-18 12:02 ` [Intel-xe] [RFC 3/3] drm/i915/dmc: Use common wrapper to get step name Chaitanya Kumar Borah
` (3 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Chaitanya Kumar Borah @ 2023-09-18 12:02 UTC (permalink / raw)
To: intel-xe
To maintain compatibility between xe and i915, let's create a
wrapper with same name over driver specific calls made to
retrieve the step name.
Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
drivers/gpu/drm/xe/xe_step.c | 5 +++++
drivers/gpu/drm/xe/xe_step.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/xe/xe_step.c b/drivers/gpu/drm/xe/xe_step.c
index 371cac951e0f..9a79451ccf52 100644
--- a/drivers/gpu/drm/xe/xe_step.c
+++ b/drivers/gpu/drm/xe/xe_step.c
@@ -254,3 +254,8 @@ const char *xe_step_name(enum xe_step step)
return "**";
}
}
+
+const char *intel_get_step_name(struct drm_i915_private *i915)
+{
+ return xe_step_name(i915->info.step.display);
+}
diff --git a/drivers/gpu/drm/xe/xe_step.h b/drivers/gpu/drm/xe/xe_step.h
index a384b640f2af..3e78d46566a0 100644
--- a/drivers/gpu/drm/xe/xe_step.h
+++ b/drivers/gpu/drm/xe/xe_step.h
@@ -17,5 +17,6 @@ struct xe_step_info xe_step_gmdid_get(struct xe_device *xe,
u32 graphics_gmdid_revid,
u32 media_gmdid_revid);
const char *xe_step_name(enum xe_step step);
+const char *intel_get_step_name(struct drm_i915_private *i915);
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-xe] [RFC 3/3] drm/i915/dmc: Use common wrapper to get step name
2023-09-18 12:02 [Intel-xe] [RFC 0/3] Use common wrapper to get step name Chaitanya Kumar Borah
2023-09-18 12:02 ` [Intel-xe] [RFC 1/3] drm/i915: Add wrapper for xe compatibility Chaitanya Kumar Borah
2023-09-18 12:02 ` [Intel-xe] [RFC 2/3] drm/xe: Add wrapper over intel_step_name Chaitanya Kumar Borah
@ 2023-09-18 12:02 ` Chaitanya Kumar Borah
2023-09-18 14:17 ` [Intel-xe] ✓ CI.Patch_applied: success for " Patchwork
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Chaitanya Kumar Borah @ 2023-09-18 12:02 UTC (permalink / raw)
To: intel-xe
Use wrapper common for both xe and i915 to get the display step name.
This patch partially reverts the changes made in
commit 8c4154824537 ("FIXME: drm/i915/dmc: xe way of getting at stepping")
TODO: Find cleaner solution for rest(not stepping related) of the Fixme
patch
Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
drivers/gpu/drm/i915/display/intel_dmc.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 51e0463518fb..6b9880fe3036 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -321,11 +321,8 @@ static const struct stepping_info *
intel_get_stepping_info(struct drm_i915_private *i915,
struct stepping_info *si)
{
-#ifdef I915
- const char *step_name = intel_step_name(RUNTIME_INFO(i915)->step.display_step);
-#else
- const char *step_name = xe_step_name(i915->info.step.display);
-#endif
+ const char *step_name = intel_get_step_name(i915);
+
si->stepping = step_name[0];
si->substepping = step_name[1];
return si;
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-xe] ✓ CI.Patch_applied: success for Use common wrapper to get step name
2023-09-18 12:02 [Intel-xe] [RFC 0/3] Use common wrapper to get step name Chaitanya Kumar Borah
` (2 preceding siblings ...)
2023-09-18 12:02 ` [Intel-xe] [RFC 3/3] drm/i915/dmc: Use common wrapper to get step name Chaitanya Kumar Borah
@ 2023-09-18 14:17 ` Patchwork
2023-09-18 14:17 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-09-18 14:18 ` [Intel-xe] ✗ CI.KUnit: failure " Patchwork
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2023-09-18 14:17 UTC (permalink / raw)
To: Chaitanya Kumar Borah; +Cc: intel-xe
== Series Details ==
Series: Use common wrapper to get step name
URL : https://patchwork.freedesktop.org/series/123857/
State : success
== Summary ==
=== Applying kernel patches on branch 'drm-xe-next' with base: ===
Base commit: 717f01815 drm/xe: Reinstate pipelined fence enable_signaling
=== git am output follows ===
Applying: drm/i915: Add wrapper for xe compatibility
Applying: drm/xe: Add wrapper over intel_step_name
Applying: drm/i915/dmc: Use common wrapper to get step name
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-xe] ✗ CI.checkpatch: warning for Use common wrapper to get step name
2023-09-18 12:02 [Intel-xe] [RFC 0/3] Use common wrapper to get step name Chaitanya Kumar Borah
` (3 preceding siblings ...)
2023-09-18 14:17 ` [Intel-xe] ✓ CI.Patch_applied: success for " Patchwork
@ 2023-09-18 14:17 ` Patchwork
2023-09-18 14:18 ` [Intel-xe] ✗ CI.KUnit: failure " Patchwork
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2023-09-18 14:17 UTC (permalink / raw)
To: Chaitanya Kumar Borah; +Cc: intel-xe
== Series Details ==
Series: Use common wrapper to get step name
URL : https://patchwork.freedesktop.org/series/123857/
State : warning
== Summary ==
+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt
Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master
63c2b6b160bca2df6efc7bc4cea6f442097d7854
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit e2c4276f93ece00c00b611387e50ae49bb46bd81
Author: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Date: Mon Sep 18 17:32:29 2023 +0530
drm/i915/dmc: Use common wrapper to get step name
Use wrapper common for both xe and i915 to get the display step name.
This patch partially reverts the changes made in
commit 8c4154824537 ("FIXME: drm/i915/dmc: xe way of getting at stepping")
TODO: Find cleaner solution for rest(not stepping related) of the Fixme
patch
Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
+ /mt/dim checkpatch 717f01815b20bde3f081a18f42f31673ce1f107f drm-intel
3d43f2f01 drm/i915: Add wrapper for xe compatibility
3f86bc5ef drm/xe: Add wrapper over intel_step_name
e2c4276f9 drm/i915/dmc: Use common wrapper to get step name
-:10: WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '8c4154824537', maybe rebased or not pulled?
#10:
commit 8c4154824537 ("FIXME: drm/i915/dmc: xe way of getting at stepping")
total: 0 errors, 1 warnings, 0 checks, 13 lines checked
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-xe] ✗ CI.KUnit: failure for Use common wrapper to get step name
2023-09-18 12:02 [Intel-xe] [RFC 0/3] Use common wrapper to get step name Chaitanya Kumar Borah
` (4 preceding siblings ...)
2023-09-18 14:17 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
@ 2023-09-18 14:18 ` Patchwork
5 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2023-09-18 14:18 UTC (permalink / raw)
To: Chaitanya Kumar Borah; +Cc: intel-xe
== Series Details ==
Series: Use common wrapper to get step name
URL : https://patchwork.freedesktop.org/series/123857/
State : failure
== Summary ==
+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
[14:17:42] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[14:17:46] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make ARCH=um O=.kunit --jobs=48
ERROR:root:In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/tests/xe_pci_test.c:13:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/tests/xe_rtp_test.c:16:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/tests/xe_wa_test.c:11:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_bb.c:9:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_bo.c:17:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_bo_evict.c:9:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_debugfs.c:14:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_devcoredump.c:12:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_device.c:6:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_device_sysfs.c:12:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_dma_buf.c:18:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_exec.c:15:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_execlist.c:15:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_exec_queue.c:14:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_force_wake.c:6:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_ggtt.c:16:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_gt.c:14:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_gt_clock.c:10:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_gt_debugfs.c:11:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_gt_idle_sysfs.c:8:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_map.h:11,
from ../drivers/gpu/drm/xe/xe_vm.h:11,
from ../drivers/gpu/drm/xe/xe_trace.h:21,
from ../drivers/gpu/drm/xe/xe_gt_pagefault.c:22:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c:8:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_map.h:11,
from ../drivers/gpu/drm/xe/xe_guc_ads.c:18:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_guc_ct.c:15:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_guc_debugfs.c:11:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_guc_hwconfig.c:11:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_map.h:11,
from ../drivers/gpu/drm/xe/xe_guc_log.c:12:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_guc_pc.c:15:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_guc_submit.c:17:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_hw_engine.c:13:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_hw_fence.c:12:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_step.c:6:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_huc.c:9:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_huc_debugfs.c:11:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_irq.c:14:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_lrc.c:14:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_mmio.c:17:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_mocs.c:10:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_pci.c:19:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_pm.c:15:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_map.h:11,
from ../drivers/gpu/drm/xe/xe_vm.h:11,
from ../drivers/gpu/drm/xe/xe_preempt_fence.c:11:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_reg_sr.c:19:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_pt.c:9:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_query.c:14:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_sa.c:13:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_map.h:11,
from ../drivers/gpu/drm/xe/xe_vm.h:11,
from ../drivers/gpu/drm/xe/xe_ring_ops.c:19:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_sched_job.c:11:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_step.c:258:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
258 | const char *intel_get_step_name(struct drm_i915_private *i915)
| ^~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_step.c:258:13: error: conflicting types for ‘intel_get_step_name’
258 | const char *intel_get_step_name(struct drm_i915_private *i915)
| ^~~~~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_step.c:6:
../drivers/gpu/drm/xe/xe_step.h:20:13: note: previous declaration of ‘intel_get_step_name’ was here
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/xe_step.c: In function ‘intel_get_step_name’:
../drivers/gpu/drm/xe/xe_step.c:260:26: error: dereferencing pointer to incomplete type ‘struct drm_i915_private’
260 | return xe_step_name(i915->info.step.display);
| ^~
../drivers/gpu/drm/xe/xe_step.c:261:1: error: control reaches end of non-void function [-Werror=return-type]
261 | }
| ^
cc1: some warnings being treated as errors
make[7]: *** [../scripts/Makefile.build:243: drivers/gpu/drm/xe/xe_step.o] Error 1
make[7]: *** Waiting for unfinished jobs....
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_tile.c:8:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_map.h:11,
from ../drivers/gpu/drm/xe/xe_vm.h:11,
from ../drivers/gpu/drm/xe/xe_trace.h:21,
from ../drivers/gpu/drm/xe/xe_trace.c:8:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c:16:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_ttm_vram_mgr.c:13:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_uc.c:8:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_uc_fw.c:14:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_wait_user_fence.c:13:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_map.h:11,
from ../drivers/gpu/drm/xe/xe_vm.h:11,
from ../drivers/gpu/drm/xe/xe_vm.c:6:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_wopcm.c:9:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_wa.c:17:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_map.h:11,
from ../drivers/gpu/drm/xe/xe_vm.h:11,
from ../drivers/gpu/drm/xe/xe_vm_madvise.c:14:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_migrate.c:18:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/xe_assert.h:14,
from ../drivers/gpu/drm/xe/xe_force_wake.h:9,
from ../drivers/gpu/drm/xe/xe_device.h:16,
from ../drivers/gpu/drm/xe/xe_guc.c:14:
../drivers/gpu/drm/xe/xe_step.h:20:40: warning: ‘struct drm_i915_private’ declared inside parameter list will not be visible outside of this definition or declaration
20 | const char *intel_get_step_name(struct drm_i915_private *i915);
| ^~~~~~~~~~~~~~~~
make[6]: *** [../scripts/Makefile.build:480: drivers/gpu/drm/xe] Error 2
make[5]: *** [../scripts/Makefile.build:480: drivers/gpu/drm] Error 2
make[4]: *** [../scripts/Makefile.build:480: drivers/gpu] Error 2
make[3]: *** [../scripts/Makefile.build:480: drivers] Error 2
make[2]: *** [/kernel/Makefile:2032: .] Error 2
make[1]: *** [/kernel/Makefile:234: __sub-make] Error 2
make: *** [Makefile:234: __sub-make] Error 2
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-xe] [RFC 2/3] drm/xe: Add wrapper over intel_step_name
2023-09-18 12:02 ` [Intel-xe] [RFC 2/3] drm/xe: Add wrapper over intel_step_name Chaitanya Kumar Borah
@ 2023-09-19 14:04 ` Jani Nikula
2023-09-20 7:24 ` Borah, Chaitanya Kumar
0 siblings, 1 reply; 10+ messages in thread
From: Jani Nikula @ 2023-09-19 14:04 UTC (permalink / raw)
To: Chaitanya Kumar Borah, intel-xe
On Mon, 18 Sep 2023, Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> wrote:
> To maintain compatibility between xe and i915, let's create a
> wrapper with same name over driver specific calls made to
> retrieve the step name.
>
> Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> Signed-off-by: Animesh Manna <animesh.manna@intel.com>
> ---
> drivers/gpu/drm/xe/xe_step.c | 5 +++++
> drivers/gpu/drm/xe/xe_step.h | 1 +
These files must not have references to struct drm_i915_private.
Try building with CONFIG_DRM_XE_DISPLAY=n.
BR,
Jani.
> 2 files changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/xe/xe_step.c b/drivers/gpu/drm/xe/xe_step.c
> index 371cac951e0f..9a79451ccf52 100644
> --- a/drivers/gpu/drm/xe/xe_step.c
> +++ b/drivers/gpu/drm/xe/xe_step.c
> @@ -254,3 +254,8 @@ const char *xe_step_name(enum xe_step step)
> return "**";
> }
> }
> +
> +const char *intel_get_step_name(struct drm_i915_private *i915)
> +{
> + return xe_step_name(i915->info.step.display);
> +}
> diff --git a/drivers/gpu/drm/xe/xe_step.h b/drivers/gpu/drm/xe/xe_step.h
> index a384b640f2af..3e78d46566a0 100644
> --- a/drivers/gpu/drm/xe/xe_step.h
> +++ b/drivers/gpu/drm/xe/xe_step.h
> @@ -17,5 +17,6 @@ struct xe_step_info xe_step_gmdid_get(struct xe_device *xe,
> u32 graphics_gmdid_revid,
> u32 media_gmdid_revid);
> const char *xe_step_name(enum xe_step step);
> +const char *intel_get_step_name(struct drm_i915_private *i915);
>
> #endif
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-xe] [RFC 2/3] drm/xe: Add wrapper over intel_step_name
2023-09-20 7:16 [Intel-xe] [RFC 0/3] " Chaitanya Kumar Borah
@ 2023-09-20 7:16 ` Chaitanya Kumar Borah
0 siblings, 0 replies; 10+ messages in thread
From: Chaitanya Kumar Borah @ 2023-09-20 7:16 UTC (permalink / raw)
To: intel-xe
To maintain compatibility between xe and i915, let's create a
wrapper with same name over driver specific calls made to
retrieve the step name.
Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
drivers/gpu/drm/xe/xe_step.c | 5 +++++
drivers/gpu/drm/xe/xe_step.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/xe/xe_step.c b/drivers/gpu/drm/xe/xe_step.c
index 371cac951e0f..23ca9e4f2fa6 100644
--- a/drivers/gpu/drm/xe/xe_step.c
+++ b/drivers/gpu/drm/xe/xe_step.c
@@ -254,3 +254,8 @@ const char *xe_step_name(enum xe_step step)
return "**";
}
}
+
+const char *intel_get_step_name(struct xe_device *xe)
+{
+ return xe_step_name(xe->info.step.display);
+}
diff --git a/drivers/gpu/drm/xe/xe_step.h b/drivers/gpu/drm/xe/xe_step.h
index a384b640f2af..277947f61f71 100644
--- a/drivers/gpu/drm/xe/xe_step.h
+++ b/drivers/gpu/drm/xe/xe_step.h
@@ -17,5 +17,6 @@ struct xe_step_info xe_step_gmdid_get(struct xe_device *xe,
u32 graphics_gmdid_revid,
u32 media_gmdid_revid);
const char *xe_step_name(enum xe_step step);
+const char *intel_get_step_name(struct xe_device *xe);
#endif
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Intel-xe] [RFC 2/3] drm/xe: Add wrapper over intel_step_name
2023-09-19 14:04 ` Jani Nikula
@ 2023-09-20 7:24 ` Borah, Chaitanya Kumar
0 siblings, 0 replies; 10+ messages in thread
From: Borah, Chaitanya Kumar @ 2023-09-20 7:24 UTC (permalink / raw)
To: Jani Nikula, intel-xe@lists.freedesktop.org
Hello Jani,
> -----Original Message-----
> From: Jani Nikula <jani.nikula@linux.intel.com>
> Sent: Tuesday, September 19, 2023 7:35 PM
> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
> xe@lists.freedesktop.org
> Subject: Re: [Intel-xe] [RFC 2/3] drm/xe: Add wrapper over intel_step_name
>
> On Mon, 18 Sep 2023, Chaitanya Kumar Borah
> <chaitanya.kumar.borah@intel.com> wrote:
> > To maintain compatibility between xe and i915, let's create a wrapper
> > with same name over driver specific calls made to retrieve the step
> > name.
> >
> > Signed-off-by: Chaitanya Kumar Borah
> <chaitanya.kumar.borah@intel.com>
> > Signed-off-by: Animesh Manna <animesh.manna@intel.com>
> > ---
> > drivers/gpu/drm/xe/xe_step.c | 5 +++++ drivers/gpu/drm/xe/xe_step.h
> > | 1 +
>
> These files must not have references to struct drm_i915_private.
>
> Try building with CONFIG_DRM_XE_DISPLAY=n.
>
I did have a bad feeling about this one. Replaced it with xe_device in the latest revision.
Let me know your thoughts.
Regards
Chaitanya
> BR,
> Jani.
>
> > 2 files changed, 6 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/xe/xe_step.c
> > b/drivers/gpu/drm/xe/xe_step.c index 371cac951e0f..9a79451ccf52
> 100644
> > --- a/drivers/gpu/drm/xe/xe_step.c
> > +++ b/drivers/gpu/drm/xe/xe_step.c
> > @@ -254,3 +254,8 @@ const char *xe_step_name(enum xe_step step)
> > return "**";
> > }
> > }
> > +
> > +const char *intel_get_step_name(struct drm_i915_private *i915) {
> > + return xe_step_name(i915->info.step.display);
> > +}
> > diff --git a/drivers/gpu/drm/xe/xe_step.h
> > b/drivers/gpu/drm/xe/xe_step.h index a384b640f2af..3e78d46566a0
> 100644
> > --- a/drivers/gpu/drm/xe/xe_step.h
> > +++ b/drivers/gpu/drm/xe/xe_step.h
> > @@ -17,5 +17,6 @@ struct xe_step_info xe_step_gmdid_get(struct
> xe_device *xe,
> > u32 graphics_gmdid_revid,
> > u32 media_gmdid_revid);
> > const char *xe_step_name(enum xe_step step);
> > +const char *intel_get_step_name(struct drm_i915_private *i915);
> >
> > #endif
>
> --
> Jani Nikula, Intel
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-09-20 7:25 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-18 12:02 [Intel-xe] [RFC 0/3] Use common wrapper to get step name Chaitanya Kumar Borah
2023-09-18 12:02 ` [Intel-xe] [RFC 1/3] drm/i915: Add wrapper for xe compatibility Chaitanya Kumar Borah
2023-09-18 12:02 ` [Intel-xe] [RFC 2/3] drm/xe: Add wrapper over intel_step_name Chaitanya Kumar Borah
2023-09-19 14:04 ` Jani Nikula
2023-09-20 7:24 ` Borah, Chaitanya Kumar
2023-09-18 12:02 ` [Intel-xe] [RFC 3/3] drm/i915/dmc: Use common wrapper to get step name Chaitanya Kumar Borah
2023-09-18 14:17 ` [Intel-xe] ✓ CI.Patch_applied: success for " Patchwork
2023-09-18 14:17 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-09-18 14:18 ` [Intel-xe] ✗ CI.KUnit: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-09-20 7:16 [Intel-xe] [RFC 0/3] " Chaitanya Kumar Borah
2023-09-20 7:16 ` [Intel-xe] [RFC 2/3] drm/xe: Add wrapper over intel_step_name Chaitanya Kumar Borah
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox