From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 18/30] drm/i915: remove explicit CNL handling from i915_irq.c
Date: Mon, 26 Jul 2021 06:59:35 -0400 [thread overview]
Message-ID: <YP6Vl2b0iBuQZSJi@intel.com> (raw)
In-Reply-To: <20210724001114.249295-19-lucas.demarchi@intel.com>
On Fri, Jul 23, 2021 at 05:11:02PM -0700, Lucas De Marchi wrote:
> Remove special handling of PORT_F in i915_irq.c and only do it for
> DISPLAY_VER == 11.
oh! ignore my previous thought about removing the port F...
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 7 +++----
> drivers/gpu/drm/i915/i915_reg.h | 2 +-
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index e2171bd2820e..17d336218b67 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -2297,11 +2297,10 @@ static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)
> GEN9_AUX_CHANNEL_C |
> GEN9_AUX_CHANNEL_D;
>
> - if (IS_CNL_WITH_PORT_F(dev_priv) || DISPLAY_VER(dev_priv) == 11)
> - mask |= CNL_AUX_CHANNEL_F;
> -
> - if (DISPLAY_VER(dev_priv) == 11)
> + if (DISPLAY_VER(dev_priv) == 11) {
> + mask |= ICL_AUX_CHANNEL_F;
> mask |= ICL_AUX_CHANNEL_E;
> + }
>
> return mask;
> }
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index d198b1a2d4b5..fdc8fd424d36 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -7945,7 +7945,7 @@ enum {
> #define DSI1_NON_TE (1 << 31)
> #define DSI0_NON_TE (1 << 30)
> #define ICL_AUX_CHANNEL_E (1 << 29)
> -#define CNL_AUX_CHANNEL_F (1 << 28)
> +#define ICL_AUX_CHANNEL_F (1 << 28)
> #define GEN9_AUX_CHANNEL_D (1 << 27)
> #define GEN9_AUX_CHANNEL_C (1 << 26)
> #define GEN9_AUX_CHANNEL_B (1 << 25)
> --
> 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-26 10:59 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-24 0:10 [Intel-gfx] [PATCH 00/30] Remove CNL support Lucas De Marchi
2021-07-24 0:10 ` [Intel-gfx] [PATCH 01/30] drm/i915: fix not reading DSC disable fuse in GLK Lucas De Marchi
2021-07-24 18:03 ` Matt Roper
2021-07-24 0:10 ` [Intel-gfx] [PATCH 02/30] drm/i915/display: split DISPLAY_VER 9 and 10 in intel_setup_outputs() Lucas De Marchi
2021-07-24 17:41 ` Christoph Hellwig
2021-07-25 5:02 ` Lucas De Marchi
2021-07-26 10:20 ` Rodrigo Vivi
2021-07-26 14:01 ` Lucas De Marchi
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 0:10 ` [Intel-gfx] [PATCH 04/30] drm/i915/display: remove explicit CNL handling from intel_cdclk.c Lucas De Marchi
2021-07-24 18:12 ` Matt Roper
2021-07-27 6:12 ` Lucas De Marchi
2021-07-24 0:10 ` [Intel-gfx] [PATCH 05/30] drm/i915/display: remove explicit CNL handling from intel_color.c Lucas De Marchi
2021-07-24 18:14 ` Matt Roper
2021-07-24 0:10 ` [Intel-gfx] [PATCH 06/30] drm/i915/display: remove explicit CNL handling from intel_combo_phy.c Lucas De Marchi
2021-07-24 18:17 ` Matt Roper
2021-07-24 0:10 ` [Intel-gfx] [PATCH 07/30] drm/i915/display: remove explicit CNL handling from intel_crtc.c Lucas De Marchi
2021-07-24 18:17 ` Matt Roper
2021-07-24 0:10 ` [Intel-gfx] [PATCH 08/30] drm/i915/display: remove explicit CNL handling from intel_ddi.c Lucas De Marchi
2021-07-26 11:00 ` Rodrigo Vivi
2021-07-24 0:10 ` [Intel-gfx] [PATCH 09/30] drm/i915/display: remove explicit CNL handling from intel_display_debugfs.c Lucas De Marchi
2021-07-26 11:06 ` Rodrigo Vivi
2021-07-24 0:10 ` [Intel-gfx] [PATCH 10/30] drm/i915/display: remove explicit CNL handling from intel_dmc.c Lucas De Marchi
2021-07-26 11:06 ` Rodrigo Vivi
2021-07-26 23:21 ` Matt Roper
2021-07-24 0:10 ` [Intel-gfx] [PATCH 11/30] drm/i915/display: remove explicit CNL handling from intel_dp.c Lucas De Marchi
2021-07-26 10:41 ` Rodrigo Vivi
2021-07-24 0:10 ` [Intel-gfx] [PATCH 12/30] drm/i915/display: remove explicit CNL handling from intel_dpll_mgr.c Lucas De Marchi
2021-07-26 10:35 ` Rodrigo Vivi
2021-07-24 0:10 ` [Intel-gfx] [PATCH 13/30] drm/i915/display: remove explicit CNL handling from intel_vdsc.c Lucas De Marchi
2021-07-26 11:05 ` Rodrigo Vivi
2021-07-24 0:10 ` [Intel-gfx] [PATCH 14/30] drm/i915/display: remove explicit CNL handling from skl_universal_plane.c Lucas De Marchi
2021-07-26 10:22 ` Rodrigo Vivi
2021-07-24 0:10 ` [Intel-gfx] [PATCH 15/30] drm/i915/display: remove explicit CNL handling from intel_display_power.c Lucas De Marchi
2021-07-26 10:28 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 16/30] drm/i915/display: remove CNL ddi buf translation tables Lucas De Marchi
2021-07-26 10:56 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 17/30] drm/i915/display: rename CNL references in skl_scaler.c Lucas De Marchi
2021-07-26 10:11 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 18/30] drm/i915: remove explicit CNL handling from i915_irq.c Lucas De Marchi
2021-07-26 10:59 ` Rodrigo Vivi [this message]
2021-07-26 15:06 ` Lucas De Marchi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 19/30] drm/i915: remove explicit CNL handling from intel_pm.c Lucas De Marchi
2021-07-26 11:08 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 20/30] drm/i915: remove explicit CNL handling from intel_mocs.c Lucas De Marchi
2021-07-26 10:21 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 21/30] drm/i915: remove explicit CNL handling from intel_pch.c Lucas De Marchi
2021-07-26 10:14 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 22/30] drm/i915: remove explicit CNL handling from intel_wopcm.c Lucas De Marchi
2021-07-26 10:57 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 23/30] drm/i915/gt: remove explicit CNL handling from intel_sseu.c Lucas De Marchi
2021-07-26 23:21 ` Matt Roper
2021-07-24 0:11 ` [Intel-gfx] [PATCH 24/30] drm/i915: rename CNL references in intel_dram.c Lucas De Marchi
2021-07-26 10:22 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 25/30] drm/i915/gt: rename CNL references in intel_engine.h Lucas De Marchi
2021-07-26 10:38 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 26/30] drm/i915: finish removal of CNL Lucas De Marchi
2021-07-26 10:21 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 27/30] drm/i915: remove GRAPHICS_VER == 10 Lucas De Marchi
2021-07-26 10:08 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 28/30] drm/i915: rename/remove CNL registers Lucas De Marchi
2021-07-26 10:06 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 29/30] drm/i915: replace random CNL comments Lucas De Marchi
2021-07-26 10:09 ` Rodrigo Vivi
2021-07-24 0:11 ` [Intel-gfx] [PATCH 30/30] drm/i915: switch num_scalers/num_sprites to consider DISPLAY_VER Lucas De Marchi
2021-07-26 10:13 ` Rodrigo Vivi
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 ` [Intel-gfx] [PATCH 00/30] " 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=YP6Vl2b0iBuQZSJi@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@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;
as well as URLs for NNTP newsgroup(s).