From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com, ville.syrjala@linux.intel.com,
imre.deak@intel.com
Subject: [RFC 6/7] drm/i915/cx0: remove intel_is_c10phy()
Date: Tue, 12 Mar 2024 16:29:01 +0200 [thread overview]
Message-ID: <0a226cdbc1016fb7a84bb223ed6b0ad1d6f38b3a.1710253533.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1710253533.git.jani.nikula@intel.com>
Unused.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_cx0_phy.c | 14 ++++----------
drivers/gpu/drm/i915/display/intel_cx0_phy.h | 2 --
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
index f893db353f91..b88ffc75cf4a 100644
--- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
@@ -29,21 +29,15 @@
#define INTEL_CX0_LANE1 BIT(1)
#define INTEL_CX0_BOTH_LANES (INTEL_CX0_LANE1 | INTEL_CX0_LANE0)
-/* Prefer intel_encoder_is_c10phy() */
-bool intel_is_c10phy(struct drm_i915_private *i915, enum phy phy)
-{
- if ((IS_LUNARLAKE(i915) || IS_METEORLAKE(i915)) && phy < PHY_C)
- return true;
-
- return false;
-}
-
bool intel_encoder_is_c10phy(struct intel_encoder *encoder)
{
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
enum phy phy = intel_encoder_to_phy(encoder);
- return intel_is_c10phy(i915, phy);
+ if ((IS_LUNARLAKE(i915) || IS_METEORLAKE(i915)) && phy < PHY_C)
+ return true;
+
+ return false;
}
static int lane_mask_to_lane(u8 lane_mask)
diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.h b/drivers/gpu/drm/i915/display/intel_cx0_phy.h
index 2be474877fdc..3e03af3e006c 100644
--- a/drivers/gpu/drm/i915/display/intel_cx0_phy.h
+++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.h
@@ -11,7 +11,6 @@
#include <linux/bits.h>
enum icl_port_dpll_id;
-enum phy;
struct drm_i915_private;
struct intel_atomic_state;
struct intel_c10pll_state;
@@ -22,7 +21,6 @@ struct intel_crtc_state;
struct intel_encoder;
struct intel_hdmi;
-bool intel_is_c10phy(struct drm_i915_private *dev_priv, enum phy phy);
bool intel_encoder_is_c10phy(struct intel_encoder *encoder);
void intel_mtl_pll_enable(struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state);
--
2.39.2
next prev parent reply other threads:[~2024-03-12 14:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-12 14:28 [RFC 0/7] drm/i915: pass encoder around more for port/phy checks Jani Nikula
2024-03-12 14:28 ` [RFC 1/7] drm/hdmi: convert *_port_to_ddc_pin() to *_encoder_to_ddc_pin() Jani Nikula
2024-03-12 14:28 ` [RFC 2/7] drm/i915/ddi: pass encoder to intel_wait_ddi_buf_active() Jani Nikula
2024-03-12 14:28 ` [RFC 3/7] drm/i915/snps: pass encoder to intel_snps_phy_update_psr_power_state() Jani Nikula
2024-03-12 14:28 ` [RFC 4/7] drm/i915/display: add intel_encoder_is_*() and _to_*() functions Jani Nikula
2024-03-12 14:29 ` [RFC 5/7] drm/i915/display: use intel_encoder_is/to_* functions Jani Nikula
2024-03-12 14:29 ` Jani Nikula [this message]
2024-03-12 14:29 ` [RFC 7/7] drm/i915/cx0: pass encoder instead of i915 and port around Jani Nikula
2024-03-12 17:35 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: pass encoder around more for port/phy checks Patchwork
2024-03-12 17:35 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-03-12 17:54 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-03-20 15:16 ` [RFC 0/7] " Ville Syrjälä
2024-03-20 15:49 ` 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=0a226cdbc1016fb7a84bb223ed6b0ad1d6f38b3a.1710253533.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ville.syrjala@linux.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 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.