From: Jani Nikula <jani.nikula@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>,
Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [Intel-xe] [RESEND 3/5] fixup! drm/xe/display: Implement display support
Date: Fri, 30 Jun 2023 14:50:17 +0300 [thread overview]
Message-ID: <20230630115019.123675-4-jani.nikula@intel.com> (raw)
In-Reply-To: <20230630115019.123675-1-jani.nikula@intel.com>
We'll have struct intel_uncore uses, so add the name back instead of
fake_uncore.
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 16 ++---
| 58 +++++++++----------
drivers/gpu/drm/xe/xe_device_types.h | 2 +-
3 files changed, 38 insertions(+), 38 deletions(-)
--git a/drivers/gpu/drm/xe/compat-i915-headers/intel_pcode.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_pcode.h
index 71f1fd1de2fd..0c47661bdc6a 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_pcode.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_pcode.h
@@ -10,32 +10,32 @@
#include "xe_pcode.h"
static inline int
-snb_pcode_write_timeout(struct fake_uncore *uncore, u32 mbox, u32 val,
+snb_pcode_write_timeout(struct intel_uncore *uncore, u32 mbox, u32 val,
int fast_timeout_us, int slow_timeout_ms)
{
- return xe_pcode_write_timeout(__fake_uncore_to_gt(uncore), mbox, val,
+ return xe_pcode_write_timeout(__compat_uncore_to_gt(uncore), mbox, val,
slow_timeout_ms ?: 1);
}
static inline int
-snb_pcode_write(struct fake_uncore *uncore, u32 mbox, u32 val)
+snb_pcode_write(struct intel_uncore *uncore, u32 mbox, u32 val)
{
- return xe_pcode_write(__fake_uncore_to_gt(uncore), mbox, val);
+ return xe_pcode_write(__compat_uncore_to_gt(uncore), mbox, val);
}
static inline int
-snb_pcode_read(struct fake_uncore *uncore, u32 mbox, u32 *val, u32 *val1)
+snb_pcode_read(struct intel_uncore *uncore, u32 mbox, u32 *val, u32 *val1)
{
- return xe_pcode_read(__fake_uncore_to_gt(uncore), mbox, val, val1);
+ return xe_pcode_read(__compat_uncore_to_gt(uncore), mbox, val, val1);
}
static inline int
-skl_pcode_request(struct fake_uncore *uncore, u32 mbox,
+skl_pcode_request(struct intel_uncore *uncore, u32 mbox,
u32 request, u32 reply_mask, u32 reply,
int timeout_base_ms)
{
- return xe_pcode_request(__fake_uncore_to_gt(uncore), mbox, request, reply_mask, reply,
+ return xe_pcode_request(__compat_uncore_to_gt(uncore), mbox, request, reply_mask, reply,
timeout_base_ms);
}
--git a/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
index fae6213d26f1..652654b5481d 100644
--- a/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
+++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
@@ -10,31 +10,31 @@
#include "xe_device_types.h"
#include "xe_mmio.h"
-static inline struct xe_gt *__fake_uncore_to_gt(struct fake_uncore *uncore)
+static inline struct xe_gt *__compat_uncore_to_gt(struct intel_uncore *uncore)
{
struct xe_device *xe = container_of(uncore, struct xe_device, uncore);
return xe_root_mmio_gt(xe);
}
-static inline u32 intel_uncore_read(struct fake_uncore *uncore,
+static inline u32 intel_uncore_read(struct intel_uncore *uncore,
i915_reg_t i915_reg)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- return xe_mmio_read32(__fake_uncore_to_gt(uncore), reg);
+ return xe_mmio_read32(__compat_uncore_to_gt(uncore), reg);
}
-static inline u32 intel_uncore_read8(struct fake_uncore *uncore,
+static inline u32 intel_uncore_read8(struct intel_uncore *uncore,
i915_reg_t i915_reg)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- return xe_mmio_read8(__fake_uncore_to_gt(uncore), reg);
+ return xe_mmio_read8(__compat_uncore_to_gt(uncore), reg);
}
static inline u64
-intel_uncore_read64_2x32(struct fake_uncore *uncore,
+intel_uncore_read64_2x32(struct intel_uncore *uncore,
i915_reg_t i915_lower_reg, i915_reg_t i915_upper_reg)
{
struct xe_reg lower_reg = XE_REG(i915_mmio_reg_offset(i915_lower_reg));
@@ -42,102 +42,102 @@ intel_uncore_read64_2x32(struct fake_uncore *uncore,
u32 upper, lower, old_upper;
int loop = 0;
- upper = xe_mmio_read32(__fake_uncore_to_gt(uncore), upper_reg);
+ upper = xe_mmio_read32(__compat_uncore_to_gt(uncore), upper_reg);
do {
old_upper = upper;
- lower = xe_mmio_read32(__fake_uncore_to_gt(uncore), lower_reg);
- upper = xe_mmio_read32(__fake_uncore_to_gt(uncore), upper_reg);
+ lower = xe_mmio_read32(__compat_uncore_to_gt(uncore), lower_reg);
+ upper = xe_mmio_read32(__compat_uncore_to_gt(uncore), upper_reg);
} while (upper != old_upper && loop++ < 2);
return (u64)upper << 32 | lower;
}
-static inline void intel_uncore_posting_read(struct fake_uncore *uncore,
+static inline void intel_uncore_posting_read(struct intel_uncore *uncore,
i915_reg_t i915_reg)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- xe_mmio_read32(__fake_uncore_to_gt(uncore), reg);
+ xe_mmio_read32(__compat_uncore_to_gt(uncore), reg);
}
-static inline void intel_uncore_write(struct fake_uncore *uncore,
+static inline void intel_uncore_write(struct intel_uncore *uncore,
i915_reg_t i915_reg, u32 val)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- xe_mmio_write32(__fake_uncore_to_gt(uncore), reg, val);
+ xe_mmio_write32(__compat_uncore_to_gt(uncore), reg, val);
}
-static inline u32 intel_uncore_rmw(struct fake_uncore *uncore,
+static inline u32 intel_uncore_rmw(struct intel_uncore *uncore,
i915_reg_t i915_reg, u32 clear, u32 set)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- return xe_mmio_rmw32(__fake_uncore_to_gt(uncore), reg, clear, set);
+ return xe_mmio_rmw32(__compat_uncore_to_gt(uncore), reg, clear, set);
}
-static inline int intel_wait_for_register(struct fake_uncore *uncore,
+static inline int intel_wait_for_register(struct intel_uncore *uncore,
i915_reg_t i915_reg, u32 mask,
u32 value, unsigned int timeout)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- return xe_mmio_wait32(__fake_uncore_to_gt(uncore), reg, value, mask,
+ return xe_mmio_wait32(__compat_uncore_to_gt(uncore), reg, value, mask,
timeout * USEC_PER_MSEC, NULL, false);
}
-static inline int intel_wait_for_register_fw(struct fake_uncore *uncore,
+static inline int intel_wait_for_register_fw(struct intel_uncore *uncore,
i915_reg_t i915_reg, u32 mask,
u32 value, unsigned int timeout)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- return xe_mmio_wait32(__fake_uncore_to_gt(uncore), reg, value, mask,
+ return xe_mmio_wait32(__compat_uncore_to_gt(uncore), reg, value, mask,
timeout * USEC_PER_MSEC, NULL, false);
}
static inline int
-__intel_wait_for_register(struct fake_uncore *uncore, i915_reg_t i915_reg,
+__intel_wait_for_register(struct intel_uncore *uncore, i915_reg_t i915_reg,
u32 mask, u32 value, unsigned int fast_timeout_us,
unsigned int slow_timeout_ms, u32 *out_value)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- return xe_mmio_wait32(__fake_uncore_to_gt(uncore), reg, value, mask,
+ return xe_mmio_wait32(__compat_uncore_to_gt(uncore), reg, value, mask,
fast_timeout_us + 1000 * slow_timeout_ms,
out_value, false);
}
-static inline u32 intel_uncore_read_fw(struct fake_uncore *uncore,
+static inline u32 intel_uncore_read_fw(struct intel_uncore *uncore,
i915_reg_t i915_reg)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- return xe_mmio_read32(__fake_uncore_to_gt(uncore), reg);
+ return xe_mmio_read32(__compat_uncore_to_gt(uncore), reg);
}
-static inline void intel_uncore_write_fw(struct fake_uncore *uncore,
+static inline void intel_uncore_write_fw(struct intel_uncore *uncore,
i915_reg_t i915_reg, u32 val)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- xe_mmio_write32(__fake_uncore_to_gt(uncore), reg, val);
+ xe_mmio_write32(__compat_uncore_to_gt(uncore), reg, val);
}
-static inline u32 intel_uncore_read_notrace(struct fake_uncore *uncore,
+static inline u32 intel_uncore_read_notrace(struct intel_uncore *uncore,
i915_reg_t i915_reg)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- return xe_mmio_read32(__fake_uncore_to_gt(uncore), reg);
+ return xe_mmio_read32(__compat_uncore_to_gt(uncore), reg);
}
-static inline void intel_uncore_write_notrace(struct fake_uncore *uncore,
+static inline void intel_uncore_write_notrace(struct intel_uncore *uncore,
i915_reg_t i915_reg, u32 val)
{
struct xe_reg reg = XE_REG(i915_mmio_reg_offset(i915_reg));
- xe_mmio_write32(__fake_uncore_to_gt(uncore), reg, val);
+ xe_mmio_write32(__compat_uncore_to_gt(uncore), reg, val);
}
#endif /* __INTEL_UNCORE_H__ */
diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 6afe37c8704e..ed7860645e8c 100644
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -397,7 +397,7 @@ struct xe_device {
bool display_irqs_enabled;
u32 enabled_irq_mask;
- struct fake_uncore {
+ struct intel_uncore {
spinlock_t lock;
} uncore;
--
2.39.2
next prev parent reply other threads:[~2023-06-30 11:50 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-30 11:50 [Intel-xe] xe & i915 display integration, display irqs Jani Nikula
2023-06-30 11:50 ` [Intel-xe] [RESEND 1/5] drm/i915/uncore: add intel_uncore_regs() helper Jani Nikula
2023-07-10 16:38 ` Andi Shyti
2023-07-11 8:15 ` Jani Nikula
2023-07-11 10:32 ` Andi Shyti
2023-06-30 11:50 ` [Intel-xe] [RESEND 2/5] fixup! drm/xe/display: Implement display support Jani Nikula
2023-06-30 11:50 ` Jani Nikula [this message]
2023-06-30 11:50 ` [Intel-xe] [RESEND 4/5] " Jani Nikula
2023-06-30 11:50 ` [Intel-xe] [RESEND 5/5] " Jani Nikula
2023-06-30 11:53 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [RESEND,1/5] drm/i915/uncore: add intel_uncore_regs() helper Patchwork
2023-06-30 11:53 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-06-30 11:55 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-06-30 11:58 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-06-30 11:59 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-06-30 12:00 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-06-30 12:43 ` [Intel-xe] ○ CI.BAT: info " Patchwork
2023-07-03 11:28 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [RESEND,1/5] drm/i915/uncore: add intel_uncore_regs() helper (rev2) Patchwork
2023-07-03 11:29 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-07-03 11:29 ` [Intel-xe] ✗ CI.KUnit: failure " Patchwork
2023-07-03 14:20 ` [Intel-xe] ✓ CI.Patch_applied: success for series starting with [RESEND,1/5] drm/i915/uncore: add intel_uncore_regs() helper (rev3) Patchwork
2023-07-03 14:21 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-07-03 14:22 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-07-03 14:26 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-07-03 14:26 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-07-03 14:27 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-07-03 15:12 ` [Intel-xe] ○ CI.BAT: info " Patchwork
2023-07-03 18:52 ` [Intel-xe] xe & i915 display integration, display irqs Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230630115019.123675-4-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox