From: Lucas De Marchi <lucas.demarchi@intel.com> To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, dri-devel@lists.freedesktop.org, Jose Souza <jose.souza@intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com> Subject: [PATCH 03/30] drm/i915/display: remove PORT_F workaround for CNL Date: Fri, 23 Jul 2021 17:10:47 -0700 [thread overview] Message-ID: <20210724001114.249295-4-lucas.demarchi@intel.com> (raw) In-Reply-To: <20210724001114.249295-1-lucas.demarchi@intel.com> Explicit support for CNL is being removed from the driver as it's not expected to work. Remove the workaround for PORT_F from display/intel_bios.c so we can also remove the generic DISPLAY_VER == 10 calls to intel_ddi_init(): the only platform with that display version is already handled separately (GLK). Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/display/intel_bios.c | 6 +++--- drivers/gpu/drm/i915/display/intel_display.c | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index aa667fa71158..4172c8ee6aa6 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -1871,12 +1871,12 @@ intel_bios_encoder_supports_edp(const struct intel_bios_encoder_data *devdata) static bool is_port_valid(struct drm_i915_private *i915, enum port port) { /* - * On some ICL/CNL SKUs port F is not present, but broken VBTs mark + * On some ICL SKUs port F is not present, but broken VBTs mark * the port as present. Only try to initialize port F for the * SKUs that may actually have it. */ - if (port == PORT_F && (IS_ICELAKE(i915) || IS_CANNONLAKE(i915))) - return IS_ICL_WITH_PORT_F(i915) || IS_CNL_WITH_PORT_F(i915); + if (port == PORT_F && IS_ICELAKE(i915)) + return IS_ICL_WITH_PORT_F(i915); return true; } diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 4633d4e00e6b..ee6d5f8de24b 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -11409,13 +11409,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) intel_ddi_init(dev_priv, PORT_B); intel_ddi_init(dev_priv, PORT_C); vlv_dsi_init(dev_priv); - } else if (DISPLAY_VER(dev_priv) == 10) { - intel_ddi_init(dev_priv, PORT_A); - intel_ddi_init(dev_priv, PORT_B); - intel_ddi_init(dev_priv, PORT_C); - intel_ddi_init(dev_priv, PORT_D); - intel_ddi_init(dev_priv, PORT_E); - intel_ddi_init(dev_priv, PORT_F); } else if (DISPLAY_VER(dev_priv) >= 9) { intel_ddi_init(dev_priv, PORT_A); intel_ddi_init(dev_priv, PORT_B); -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Lucas De Marchi <lucas.demarchi@intel.com> To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 03/30] drm/i915/display: remove PORT_F workaround for CNL Date: Fri, 23 Jul 2021 17:10:47 -0700 [thread overview] Message-ID: <20210724001114.249295-4-lucas.demarchi@intel.com> (raw) In-Reply-To: <20210724001114.249295-1-lucas.demarchi@intel.com> Explicit support for CNL is being removed from the driver as it's not expected to work. Remove the workaround for PORT_F from display/intel_bios.c so we can also remove the generic DISPLAY_VER == 10 calls to intel_ddi_init(): the only platform with that display version is already handled separately (GLK). Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/display/intel_bios.c | 6 +++--- drivers/gpu/drm/i915/display/intel_display.c | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index aa667fa71158..4172c8ee6aa6 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -1871,12 +1871,12 @@ intel_bios_encoder_supports_edp(const struct intel_bios_encoder_data *devdata) static bool is_port_valid(struct drm_i915_private *i915, enum port port) { /* - * On some ICL/CNL SKUs port F is not present, but broken VBTs mark + * On some ICL SKUs port F is not present, but broken VBTs mark * the port as present. Only try to initialize port F for the * SKUs that may actually have it. */ - if (port == PORT_F && (IS_ICELAKE(i915) || IS_CANNONLAKE(i915))) - return IS_ICL_WITH_PORT_F(i915) || IS_CNL_WITH_PORT_F(i915); + if (port == PORT_F && IS_ICELAKE(i915)) + return IS_ICL_WITH_PORT_F(i915); return true; } diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 4633d4e00e6b..ee6d5f8de24b 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -11409,13 +11409,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) intel_ddi_init(dev_priv, PORT_B); intel_ddi_init(dev_priv, PORT_C); vlv_dsi_init(dev_priv); - } else if (DISPLAY_VER(dev_priv) == 10) { - intel_ddi_init(dev_priv, PORT_A); - intel_ddi_init(dev_priv, PORT_B); - intel_ddi_init(dev_priv, PORT_C); - intel_ddi_init(dev_priv, PORT_D); - intel_ddi_init(dev_priv, PORT_E); - intel_ddi_init(dev_priv, PORT_F); } else if (DISPLAY_VER(dev_priv) >= 9) { intel_ddi_init(dev_priv, PORT_A); intel_ddi_init(dev_priv, PORT_B); -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-07-24 0:11 UTC|newest] Thread overview: 143+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-24 0:10 [PATCH 00/30] Remove CNL support Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-24 0:10 ` [PATCH 01/30] drm/i915: fix not reading DSC disable fuse in GLK Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-24 18:03 ` Matt Roper 2021-07-24 18:03 ` [Intel-gfx] " Matt Roper 2021-07-24 0:10 ` [PATCH 02/30] drm/i915/display: split DISPLAY_VER 9 and 10 in intel_setup_outputs() Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-24 17:41 ` Christoph Hellwig 2021-07-25 5:02 ` Lucas De Marchi 2021-07-25 5:02 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:20 ` Rodrigo Vivi 2021-07-26 10:20 ` Rodrigo Vivi 2021-07-26 14:01 ` Lucas De Marchi 2021-07-26 14:01 ` Lucas De Marchi 2021-07-24 0:10 ` Lucas De Marchi [this message] 2021-07-24 0:10 ` [Intel-gfx] [PATCH 03/30] drm/i915/display: remove PORT_F workaround for CNL Lucas De Marchi 2021-07-24 18:05 ` Matt Roper 2021-07-24 18:05 ` [Intel-gfx] " Matt Roper 2021-07-24 0:10 ` [PATCH 04/30] drm/i915/display: remove explicit CNL handling from intel_cdclk.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-24 18:12 ` Matt Roper 2021-07-24 18:12 ` [Intel-gfx] " Matt Roper 2021-07-27 6:12 ` Lucas De Marchi 2021-07-27 6:12 ` [Intel-gfx] " Lucas De Marchi 2021-07-24 0:10 ` [PATCH 05/30] drm/i915/display: remove explicit CNL handling from intel_color.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-24 18:14 ` Matt Roper 2021-07-24 18:14 ` [Intel-gfx] " Matt Roper 2021-07-24 0:10 ` [PATCH 06/30] drm/i915/display: remove explicit CNL handling from intel_combo_phy.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-24 18:17 ` Matt Roper 2021-07-24 18:17 ` [Intel-gfx] " Matt Roper 2021-07-24 0:10 ` [PATCH 07/30] drm/i915/display: remove explicit CNL handling from intel_crtc.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-24 18:17 ` Matt Roper 2021-07-24 18:17 ` [Intel-gfx] " Matt Roper 2021-07-24 0:10 ` [PATCH 08/30] drm/i915/display: remove explicit CNL handling from intel_ddi.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 11:00 ` Rodrigo Vivi 2021-07-26 11:00 ` Rodrigo Vivi 2021-07-24 0:10 ` [PATCH 09/30] drm/i915/display: remove explicit CNL handling from intel_display_debugfs.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 11:06 ` Rodrigo Vivi 2021-07-26 11:06 ` Rodrigo Vivi 2021-07-24 0:10 ` [PATCH 10/30] drm/i915/display: remove explicit CNL handling from intel_dmc.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 11:06 ` Rodrigo Vivi 2021-07-26 11:06 ` Rodrigo Vivi 2021-07-26 23:21 ` Matt Roper 2021-07-26 23:21 ` [Intel-gfx] " Matt Roper 2021-07-24 0:10 ` [PATCH 11/30] drm/i915/display: remove explicit CNL handling from intel_dp.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:41 ` Rodrigo Vivi 2021-07-26 10:41 ` [Intel-gfx] " Rodrigo Vivi 2021-07-24 0:10 ` [PATCH 12/30] drm/i915/display: remove explicit CNL handling from intel_dpll_mgr.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:35 ` Rodrigo Vivi 2021-07-26 10:35 ` [Intel-gfx] " Rodrigo Vivi 2021-07-24 0:10 ` [PATCH 13/30] drm/i915/display: remove explicit CNL handling from intel_vdsc.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 11:05 ` Rodrigo Vivi 2021-07-26 11:05 ` Rodrigo Vivi 2021-07-24 0:10 ` [PATCH 14/30] drm/i915/display: remove explicit CNL handling from skl_universal_plane.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:22 ` Rodrigo Vivi 2021-07-26 10:22 ` Rodrigo Vivi 2021-07-24 0:10 ` [PATCH 15/30] drm/i915/display: remove explicit CNL handling from intel_display_power.c Lucas De Marchi 2021-07-24 0:10 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:28 ` Rodrigo Vivi 2021-07-26 10:28 ` Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 16/30] drm/i915/display: remove CNL ddi buf translation tables Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:56 ` Rodrigo Vivi 2021-07-26 10:56 ` Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 17/30] drm/i915/display: rename CNL references in skl_scaler.c Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:11 ` Rodrigo Vivi 2021-07-26 10:11 ` [Intel-gfx] " Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 18/30] drm/i915: remove explicit CNL handling from i915_irq.c Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:59 ` Rodrigo Vivi 2021-07-26 10:59 ` [Intel-gfx] " Rodrigo Vivi 2021-07-26 15:06 ` Lucas De Marchi 2021-07-26 15:06 ` [Intel-gfx] " Lucas De Marchi 2021-07-24 0:11 ` [PATCH 19/30] drm/i915: remove explicit CNL handling from intel_pm.c Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 11:08 ` Rodrigo Vivi 2021-07-26 11:08 ` Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 20/30] drm/i915: remove explicit CNL handling from intel_mocs.c Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:21 ` Rodrigo Vivi 2021-07-26 10:21 ` [Intel-gfx] " Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 21/30] drm/i915: remove explicit CNL handling from intel_pch.c Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:14 ` Rodrigo Vivi 2021-07-26 10:14 ` Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 22/30] drm/i915: remove explicit CNL handling from intel_wopcm.c Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:57 ` Rodrigo Vivi 2021-07-26 10:57 ` Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 23/30] drm/i915/gt: remove explicit CNL handling from intel_sseu.c Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 23:21 ` Matt Roper 2021-07-26 23:21 ` [Intel-gfx] " Matt Roper 2021-07-24 0:11 ` [PATCH 24/30] drm/i915: rename CNL references in intel_dram.c Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:22 ` Rodrigo Vivi 2021-07-26 10:22 ` [Intel-gfx] " Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 25/30] drm/i915/gt: rename CNL references in intel_engine.h Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:38 ` Rodrigo Vivi 2021-07-26 10:38 ` [Intel-gfx] " Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 26/30] drm/i915: finish removal of CNL Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:21 ` Rodrigo Vivi 2021-07-26 10:21 ` Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 27/30] drm/i915: remove GRAPHICS_VER == 10 Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:08 ` Rodrigo Vivi 2021-07-26 10:08 ` Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 28/30] drm/i915: rename/remove CNL registers Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:06 ` Rodrigo Vivi 2021-07-26 10:06 ` Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 29/30] drm/i915: replace random CNL comments Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:09 ` Rodrigo Vivi 2021-07-26 10:09 ` [Intel-gfx] " Rodrigo Vivi 2021-07-24 0:11 ` [PATCH 30/30] drm/i915: switch num_scalers/num_sprites to consider DISPLAY_VER Lucas De Marchi 2021-07-24 0:11 ` [Intel-gfx] " Lucas De Marchi 2021-07-26 10:13 ` Rodrigo Vivi 2021-07-26 10:13 ` Rodrigo Vivi 2021-07-27 6:59 ` Lucas De Marchi 2021-07-27 6:59 ` Lucas De Marchi 2021-07-24 0:40 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Remove CNL support Patchwork 2021-07-24 0:41 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-07-24 1:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-07-24 2:05 ` [PATCH 00/30] " Jason Ekstrand 2021-07-24 2:05 ` [Intel-gfx] " Jason Ekstrand 2021-07-24 12:37 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork 2021-07-26 11:07 ` Rodrigo Vivi 2021-07-26 13:59 ` Lucas De Marchi
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=20210724001114.249295-4-lucas.demarchi@intel.com \ --to=lucas.demarchi@intel.com \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jose.souza@intel.com \ --cc=rodrigo.vivi@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: linkBe 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.