From: "José Roberto de Souza" <jose.souza@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 03/12] drm/i915: Drop has_gt_uc from device info
Date: Wed, 4 May 2022 12:07:47 -0700 [thread overview]
Message-ID: <20220504190756.466270-3-jose.souza@intel.com> (raw)
In-Reply-To: <20220504190756.466270-1-jose.souza@intel.com>
No need to have this parameter in intel_device_info struct
as all platforms with graphics version 9 or newer has graphics
microcontroller.
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
drivers/gpu/drm/i915/i915_pci.c | 3 ---
drivers/gpu/drm/i915/intel_device_info.h | 1 -
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d23180d1b10cb..3a3d57485b09c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1357,7 +1357,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
*/
#define HAS_FLAT_CCS(dev_priv) (INTEL_INFO(dev_priv)->has_flat_ccs)
-#define HAS_GT_UC(dev_priv) (INTEL_INFO(dev_priv)->has_gt_uc)
+#define HAS_GT_UC(dev_priv) (GRAPHICS_VER(dev_priv) >= 9)
#define HAS_POOLED_EU(dev_priv) (INTEL_INFO(dev_priv)->has_pooled_eu)
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 0512c66fa4f3f..5bd9cb8998527 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -2008,7 +2008,7 @@ __i915_gpu_coredump(struct intel_gt *gt, intel_engine_mask_t engine_mask, u32 du
return ERR_PTR(-ENOMEM);
}
- if (INTEL_INFO(i915)->has_gt_uc) {
+ if (HAS_GT_UC(i915)) {
error->gt->uc = gt_record_uc(error->gt, compress);
if (error->gt->uc) {
if (dump_flags & CORE_DUMP_FLAG_IS_GUC_CAPTURE)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index fc3e7c8bc69d1..df20818ce8eae 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -644,7 +644,6 @@ static const struct intel_device_info chv_info = {
GEN(9), \
GEN9_DEFAULT_PAGE_SIZES, \
.display.has_dmc = 1, \
- .has_gt_uc = 1, \
.display.has_hdcp = 1, \
.display.has_psr = 1, \
.display.has_psr_hw_tracking = 1, \
@@ -704,7 +703,6 @@ static const struct intel_device_info skl_gt4_info = {
.has_rps = true, \
.display.has_dp_mst = 1, \
.has_logical_ring_contexts = 1, \
- .has_gt_uc = 1, \
.dma_mask_size = 39, \
.ppgtt_type = INTEL_PPGTT_FULL, \
.ppgtt_size = 48, \
@@ -1003,7 +1001,6 @@ static const struct intel_device_info adl_p_info = {
.has_64bit_reloc = 1, \
.has_flat_ccs = 1, \
.has_global_mocs = 1, \
- .has_gt_uc = 1, \
.has_llc = 1, \
.has_logical_ring_contexts = 1, \
.has_logical_ring_elsq = 1, \
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index d16515cea22fd..6d2eafaab4ef0 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -146,7 +146,6 @@ enum intel_ppgtt_type {
func(has_4tile); \
func(has_flat_ccs); \
func(has_global_mocs); \
- func(has_gt_uc); \
func(has_heci_pxp); \
func(has_heci_gscfi); \
func(has_guc_deprivilege); \
--
2.36.0
next prev parent reply other threads:[~2022-05-04 19:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-04 19:07 [Intel-gfx] [PATCH 01/12] drm/i915: Drop IPC from display 13 and newer José Roberto de Souza
2022-05-04 19:07 ` [Intel-gfx] [PATCH 02/12] drm/i915/display: Disable DSB for DG2 and Alderlake-P José Roberto de Souza
2022-05-04 19:07 ` José Roberto de Souza [this message]
2022-05-04 20:40 ` [Intel-gfx] [PATCH 03/12] drm/i915: Drop has_gt_uc from device info Matt Roper
2022-05-04 19:07 ` [Intel-gfx] [PATCH 04/12] drm/i915: Drop has_rc6 " José Roberto de Souza
2022-05-04 20:42 ` Matt Roper
2022-05-04 19:07 ` [Intel-gfx] [PATCH 05/12] drm/i915: Drop has_rc6p " José Roberto de Souza
2022-05-04 20:45 ` Matt Roper
2022-05-04 21:27 ` Ville Syrjälä
2022-05-04 19:07 ` [Intel-gfx] [PATCH 06/12] drm/i915: Drop has_reset_engine " José Roberto de Souza
2022-05-04 20:47 ` Matt Roper
2022-05-04 19:07 ` [Intel-gfx] [PATCH 07/12] drm/i915: Drop has_logical_ring_elsq " José Roberto de Souza
2022-05-04 20:50 ` Matt Roper
2022-05-04 19:07 ` [Intel-gfx] [PATCH 08/12] drm/i915: Drop has_ddi " José Roberto de Souza
2022-05-04 20:56 ` Matt Roper
2022-05-04 19:07 ` [Intel-gfx] [PATCH 09/12] drm/i915: Drop has_dp_mst " José Roberto de Souza
2022-05-04 21:01 ` Matt Roper
2022-05-04 19:07 ` [Intel-gfx] [PATCH 10/12] drm/i915: Drop has_psr " José Roberto de Souza
2022-05-04 21:03 ` Matt Roper
2022-05-04 19:07 ` [Intel-gfx] [PATCH 11/12] drm/i915: Drop has_psr_hw_tracking " José Roberto de Souza
2022-05-04 21:08 ` Matt Roper
2022-05-04 19:07 ` [Intel-gfx] [PATCH 12/12] drm/i915: Drop supports_tv " José Roberto de Souza
2022-05-04 20:39 ` [Intel-gfx] [PATCH 01/12] drm/i915: Drop IPC from display 13 and newer Matt Roper
2022-05-04 21:33 ` Ville Syrjälä
2022-05-05 15:57 ` Souza, Jose
2022-05-04 22:49 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/12] " Patchwork
2022-05-04 22:49 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-05-04 23:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-05-05 4:01 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-05-05 10:45 ` [Intel-gfx] [PATCH 01/12] " Jani Nikula
2022-05-05 14:00 ` Souza, Jose
2022-05-05 14:49 ` Ville Syrjälä
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=20220504190756.466270-3-jose.souza@intel.com \
--to=jose.souza@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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