From: "José Roberto de Souza" <jose.souza@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 12/12] drm/i915: Drop supports_tv from device info
Date: Wed, 4 May 2022 12:07:56 -0700 [thread overview]
Message-ID: <20220504190756.466270-12-jose.souza@intel.com> (raw)
In-Reply-To: <20220504190756.466270-1-jose.souza@intel.com>
Only four platforms ever support this feature so we can elimitate
this from device info and use platform checks instead.
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 3 ++-
drivers/gpu/drm/i915/i915_pci.c | 4 ----
drivers/gpu/drm/i915/intel_device_info.h | 3 +--
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d866287c663a2..3c5980d174f81 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1286,7 +1286,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
*/
#define HAS_128_BYTE_Y_TILING(dev_priv) (GRAPHICS_VER(dev_priv) != 2 && \
!(IS_I915G(dev_priv) || IS_I915GM(dev_priv)))
-#define SUPPORTS_TV(dev_priv) (INTEL_INFO(dev_priv)->display.supports_tv)
+#define SUPPORTS_TV(dev_priv) (IS_I915GM(dev_priv) || IS_I945GM(dev_priv) || \
+ IS_I965GM(dev_priv) || IS_GM45(dev_priv))
#define I915_HAS_HOTPLUG(dev_priv) (INTEL_INFO(dev_priv)->display.has_hotplug)
#define HAS_FW_BLC(dev_priv) (DISPLAY_VER(dev_priv) > 2)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index c6e99305e24d0..184a1eb6e2fce 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -259,7 +259,6 @@ static const struct intel_device_info i915gm_info = {
.display.cursor_needs_physical = 1,
.display.has_overlay = 1,
.display.overlay_needs_physical = 1,
- .display.supports_tv = 1,
.display.fbc_mask = BIT(INTEL_FBC_A),
.hws_needs_physical = 1,
.unfenced_needs_alignment = 1,
@@ -284,7 +283,6 @@ static const struct intel_device_info i945gm_info = {
.display.cursor_needs_physical = 1,
.display.has_overlay = 1,
.display.overlay_needs_physical = 1,
- .display.supports_tv = 1,
.display.fbc_mask = BIT(INTEL_FBC_A),
.hws_needs_physical = 1,
.unfenced_needs_alignment = 1,
@@ -346,7 +344,6 @@ static const struct intel_device_info i965gm_info = {
.is_mobile = 1,
.display.fbc_mask = BIT(INTEL_FBC_A),
.display.has_overlay = 1,
- .display.supports_tv = 1,
.hws_needs_physical = 1,
.has_snoop = false,
};
@@ -363,7 +360,6 @@ static const struct intel_device_info gm45_info = {
PLATFORM(INTEL_GM45),
.is_mobile = 1,
.display.fbc_mask = BIT(INTEL_FBC_A),
- .display.supports_tv = 1,
.platform_engine_mask = BIT(RCS0) | BIT(VCS0),
.gpu_reset_clobbers_display = false,
};
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index bea9f92e2264c..a1d111fc83346 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -174,8 +174,7 @@ enum intel_ppgtt_type {
func(has_hti); \
func(has_modular_fia); \
func(has_overlay); \
- func(overlay_needs_physical); \
- func(supports_tv);
+ func(overlay_needs_physical);
struct ip_version {
u8 ver;
--
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 ` [Intel-gfx] [PATCH 03/12] drm/i915: Drop has_gt_uc from device info José Roberto de Souza
2022-05-04 20:40 ` 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 ` José Roberto de Souza [this message]
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-12-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