From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 06/10] drm/i915/crt: Extract intel_crt_regs.h
Date: Fri, 08 Nov 2024 15:13:38 +0200 [thread overview]
Message-ID: <87h68heum5.fsf@intel.com> (raw)
In-Reply-To: <20241107161123.16269-7-ville.syrjala@linux.intel.com>
On Thu, 07 Nov 2024, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Move the analog port register definitions into their
> own file.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
'git show --color-moved' <3
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_crt.c | 1 +
> drivers/gpu/drm/i915/display/intel_crt_regs.h | 48 +++++++++++++++++++
> .../gpu/drm/i915/display/intel_pch_display.c | 1 +
> drivers/gpu/drm/i915/gvt/display.c | 1 +
> drivers/gpu/drm/i915/gvt/handlers.c | 1 +
> drivers/gpu/drm/i915/i915_reg.h | 38 ---------------
> drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 +
> 7 files changed, 53 insertions(+), 38 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/display/intel_crt_regs.h
>
> diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
> index e21e402f85c8..4784a858b4a2 100644
> --- a/drivers/gpu/drm/i915/display/intel_crt.c
> +++ b/drivers/gpu/drm/i915/display/intel_crt.c
> @@ -38,6 +38,7 @@
> #include "i915_reg.h"
> #include "intel_connector.h"
> #include "intel_crt.h"
> +#include "intel_crt_regs.h"
> #include "intel_crtc.h"
> #include "intel_ddi.h"
> #include "intel_ddi_buf_trans.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_crt_regs.h b/drivers/gpu/drm/i915/display/intel_crt_regs.h
> new file mode 100644
> index 000000000000..9a93020b9a7e
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/display/intel_crt_regs.h
> @@ -0,0 +1,48 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2024 Intel Corporation
> + */
> +
> +#ifndef __INTEL_CRT_REGS_H__
> +#define __INTEL_CRT_REGS_H__
> +
> +#include "intel_display_reg_defs.h"
> +
> +#define ADPA _MMIO(0x61100)
> +#define PCH_ADPA _MMIO(0xe1100)
> +#define VLV_ADPA _MMIO(VLV_DISPLAY_BASE + 0x61100)
> +#define ADPA_DAC_ENABLE REG_BIT(31)
> +#define ADPA_PIPE_SEL_MASK REG_BIT(30)
> +#define ADPA_PIPE_SEL(pipe) REG_FIELD_PREP(ADPA_PIPE_SEL_MASK, (pipe))
> +#define ADPA_PIPE_SEL_MASK_CPT REG_GENMASK(30, 29)
> +#define ADPA_PIPE_SEL_CPT(pipe) REG_FIELD_PREP(ADPA_PIPE_SEL_MASK_CPT, (pipe))
> +#define ADPA_CRT_HOTPLUG_MONITOR_MASK REG_GENMASK(25, 24)
> +#define ADPA_CRT_HOTPLUG_MONITOR_NONE REG_FIELD_PREP(ADPA_CRT_HOTPLUG_MONITOR_MASK, 0)
> +#define ADPA_CRT_HOTPLUG_MONITOR_COLOR REG_FIELD_PREP(ADPA_CRT_HOTPLUG_MONITOR_MASK, 3)
> +#define ADPA_CRT_HOTPLUG_MONITOR_MONO REG_FIELD_PREP(ADPA_CRT_HOTPLUG_MONITOR_MASK, 2)
> +#define ADPA_CRT_HOTPLUG_ENABLE REG_BIT(23)
> +#define ADPA_CRT_HOTPLUG_PERIOD_MASK REG_BIT(22)
> +#define ADPA_CRT_HOTPLUG_PERIOD_64 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_PERIOD_MASK, 0)
> +#define ADPA_CRT_HOTPLUG_PERIOD_128 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_PERIOD_MASK, 1)
> +#define ADPA_CRT_HOTPLUG_WARMUP_MASK REG_BIT(21)
> +#define ADPA_CRT_HOTPLUG_WARMUP_5MS REG_FIELD_PREP(ADPA_CRT_HOTPLUG_WARMUP_MASK, 0)
> +#define ADPA_CRT_HOTPLUG_WARMUP_10MS REG_FIELD_PREP(ADPA_CRT_HOTPLUG_WARMUP_MASK, 1)
> +#define ADPA_CRT_HOTPLUG_SAMPLE_MASK REG_BIT(20)
> +#define ADPA_CRT_HOTPLUG_SAMPLE_2S REG_FIELD_PREP(ADPA_CRT_HOTPLUG_SAMPLE_MASK, 0)
> +#define ADPA_CRT_HOTPLUG_SAMPLE_4S REG_FIELD_PREP(ADPA_CRT_HOTPLUG_SAMPLE_MASK, 1)
> +#define ADPA_CRT_HOTPLUG_VOLTAGE_MASK REG_GENMASK(19, 18)
> +#define ADPA_CRT_HOTPLUG_VOLTAGE_40 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLTAGE_MASK, 0)
> +#define ADPA_CRT_HOTPLUG_VOLTAGE_50 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLTAGE_MASK, 1)
> +#define ADPA_CRT_HOTPLUG_VOLTAGE_60 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLTAGE_MASK, 2)
> +#define ADPA_CRT_HOTPLUG_VOLTAGE_70 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLTAGE_MASK, 3)
> +#define ADPA_CRT_HOTPLUG_VOLREF_MASK REG_BIT(17)
> +#define ADPA_CRT_HOTPLUG_VOLREF_325MV REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLREF_MASK, 0)
> +#define ADPA_CRT_HOTPLUG_VOLREF_475MV REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLREF_MASK, 1)
> +#define ADPA_CRT_HOTPLUG_FORCE_TRIGGER REG_BIT(16)
> +#define ADPA_USE_VGA_HVPOLARITY REG_BIT(15)
> +#define ADPA_HSYNC_CNTL_DISABLE REG_BIT(11)
> +#define ADPA_VSYNC_CNTL_DISABLE REG_BIT(10)
> +#define ADPA_VSYNC_ACTIVE_HIGH REG_BIT(4)
> +#define ADPA_HSYNC_ACTIVE_HIGH REG_BIT(3)
> +
> +#endif /* __INTEL_CRT_REGS_H__ */
> diff --git a/drivers/gpu/drm/i915/display/intel_pch_display.c b/drivers/gpu/drm/i915/display/intel_pch_display.c
> index 4210de87a0a2..cd48d3e6cf42 100644
> --- a/drivers/gpu/drm/i915/display/intel_pch_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_pch_display.c
> @@ -6,6 +6,7 @@
> #include "g4x_dp.h"
> #include "i915_reg.h"
> #include "intel_crt.h"
> +#include "intel_crt_regs.h"
> #include "intel_de.h"
> #include "intel_display_types.h"
> #include "intel_dpll.h"
> diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
> index 17f74cb244bb..b6136825d213 100644
> --- a/drivers/gpu/drm/i915/gvt/display.c
> +++ b/drivers/gpu/drm/i915/gvt/display.c
> @@ -40,6 +40,7 @@
>
> #include "display/bxt_dpio_phy_regs.h"
> #include "display/i9xx_plane_regs.h"
> +#include "display/intel_crt_regs.h"
> #include "display/intel_cursor_regs.h"
> #include "display/intel_display.h"
> #include "display/intel_dpio_phy.h"
> diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
> index 9494d812c00a..25acb9ddb12c 100644
> --- a/drivers/gpu/drm/i915/gvt/handlers.c
> +++ b/drivers/gpu/drm/i915/gvt/handlers.c
> @@ -45,6 +45,7 @@
> #include "intel_mchbar_regs.h"
> #include "display/bxt_dpio_phy_regs.h"
> #include "display/i9xx_plane_regs.h"
> +#include "display/intel_crt_regs.h"
> #include "display/intel_cursor_regs.h"
> #include "display/intel_display_types.h"
> #include "display/intel_dmc_regs.h"
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 6391f2e9d530..8a0a478051a6 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -1147,44 +1147,6 @@
> #define _TRANS_MULT_B 0x6102c
> #define TRANS_MULT(dev_priv, trans) _MMIO_TRANS2(dev_priv, (trans), _TRANS_MULT_A)
>
> -/* VGA port control */
> -#define ADPA _MMIO(0x61100)
> -#define PCH_ADPA _MMIO(0xe1100)
> -#define VLV_ADPA _MMIO(VLV_DISPLAY_BASE + 0x61100)
> -#define ADPA_DAC_ENABLE REG_BIT(31)
> -#define ADPA_PIPE_SEL_MASK REG_BIT(30)
> -#define ADPA_PIPE_SEL(pipe) REG_FIELD_PREP(ADPA_PIPE_SEL_MASK, (pipe))
> -#define ADPA_PIPE_SEL_MASK_CPT REG_GENMASK(30, 29)
> -#define ADPA_PIPE_SEL_CPT(pipe) REG_FIELD_PREP(ADPA_PIPE_SEL_MASK_CPT, (pipe))
> -#define ADPA_CRT_HOTPLUG_MONITOR_MASK REG_GENMASK(25, 24)
> -#define ADPA_CRT_HOTPLUG_MONITOR_NONE REG_FIELD_PREP(ADPA_CRT_HOTPLUG_MONITOR_MASK, 0)
> -#define ADPA_CRT_HOTPLUG_MONITOR_COLOR REG_FIELD_PREP(ADPA_CRT_HOTPLUG_MONITOR_MASK, 3)
> -#define ADPA_CRT_HOTPLUG_MONITOR_MONO REG_FIELD_PREP(ADPA_CRT_HOTPLUG_MONITOR_MASK, 2)
> -#define ADPA_CRT_HOTPLUG_ENABLE REG_BIT(23)
> -#define ADPA_CRT_HOTPLUG_PERIOD_MASK REG_BIT(22)
> -#define ADPA_CRT_HOTPLUG_PERIOD_64 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_PERIOD_MASK, 0)
> -#define ADPA_CRT_HOTPLUG_PERIOD_128 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_PERIOD_MASK, 1)
> -#define ADPA_CRT_HOTPLUG_WARMUP_MASK REG_BIT(21)
> -#define ADPA_CRT_HOTPLUG_WARMUP_5MS REG_FIELD_PREP(ADPA_CRT_HOTPLUG_WARMUP_MASK, 0)
> -#define ADPA_CRT_HOTPLUG_WARMUP_10MS REG_FIELD_PREP(ADPA_CRT_HOTPLUG_WARMUP_MASK, 1)
> -#define ADPA_CRT_HOTPLUG_SAMPLE_MASK REG_BIT(20)
> -#define ADPA_CRT_HOTPLUG_SAMPLE_2S REG_FIELD_PREP(ADPA_CRT_HOTPLUG_SAMPLE_MASK, 0)
> -#define ADPA_CRT_HOTPLUG_SAMPLE_4S REG_FIELD_PREP(ADPA_CRT_HOTPLUG_SAMPLE_MASK, 1)
> -#define ADPA_CRT_HOTPLUG_VOLTAGE_MASK REG_GENMASK(19, 18)
> -#define ADPA_CRT_HOTPLUG_VOLTAGE_40 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLTAGE_MASK, 0)
> -#define ADPA_CRT_HOTPLUG_VOLTAGE_50 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLTAGE_MASK, 1)
> -#define ADPA_CRT_HOTPLUG_VOLTAGE_60 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLTAGE_MASK, 2)
> -#define ADPA_CRT_HOTPLUG_VOLTAGE_70 REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLTAGE_MASK, 3)
> -#define ADPA_CRT_HOTPLUG_VOLREF_MASK REG_BIT(17)
> -#define ADPA_CRT_HOTPLUG_VOLREF_325MV REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLREF_MASK, 0)
> -#define ADPA_CRT_HOTPLUG_VOLREF_475MV REG_FIELD_PREP(ADPA_CRT_HOTPLUG_VOLREF_MASK, 1)
> -#define ADPA_CRT_HOTPLUG_FORCE_TRIGGER REG_BIT(16)
> -#define ADPA_USE_VGA_HVPOLARITY REG_BIT(15)
> -#define ADPA_HSYNC_CNTL_DISABLE REG_BIT(11)
> -#define ADPA_VSYNC_CNTL_DISABLE REG_BIT(10)
> -#define ADPA_VSYNC_ACTIVE_HIGH REG_BIT(4)
> -#define ADPA_HSYNC_ACTIVE_HIGH REG_BIT(3)
> -
> /* Hotplug control (945+ only) */
> #define PORT_HOTPLUG_EN(dev_priv) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61110)
> #define PORTB_HOTPLUG_INT_EN (1 << 29)
> diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
> index 955c9a33212a..63849389f39a 100644
> --- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
> +++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
> @@ -8,6 +8,7 @@
> #include "display/intel_audio_regs.h"
> #include "display/intel_backlight_regs.h"
> #include "display/intel_color_regs.h"
> +#include "display/intel_crt_regs.h"
> #include "display/intel_cursor_regs.h"
> #include "display/intel_display_types.h"
> #include "display/intel_dmc_regs.h"
--
Jani Nikula, Intel
next prev parent reply other threads:[~2024-11-08 13:13 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-07 16:11 [PATCH 00/10] drm/i915: Potential boot oops fix and some cleanups Ville Syrjala
2024-11-07 16:11 ` [PATCH 01/10] drm/i915: Grab intel_display from the encoder to avoid potential oopsies Ville Syrjala
2024-11-08 13:00 ` Jani Nikula
2024-11-11 22:03 ` Ville Syrjälä
2024-11-07 16:11 ` [PATCH 02/10] drm/i915/crt: Split long line Ville Syrjala
2024-11-08 13:01 ` Jani Nikula
2024-11-07 16:11 ` [PATCH 03/10] drm/i915/crt: Drop the unused ADPA_DPMS bit definitions Ville Syrjala
2024-11-08 13:02 ` Jani Nikula
2024-11-07 16:11 ` [PATCH 04/10] drm/i915/crt: Use REG_BIT() & co Ville Syrjala
2024-11-08 13:08 ` Jani Nikula
2024-11-07 16:11 ` [PATCH 05/10] drm/i915/crt: Clean up ADPA_HOTPLUG_BITS definitions Ville Syrjala
2024-11-08 13:12 ` Jani Nikula
2024-11-07 16:11 ` [PATCH 06/10] drm/i915/crt: Extract intel_crt_regs.h Ville Syrjala
2024-11-08 13:13 ` Jani Nikula [this message]
2024-11-07 16:11 ` [PATCH 07/10] drm/i915/crt: s/pipe_config/crtc_state/ Ville Syrjala
2024-11-08 13:14 ` Jani Nikula
2024-11-07 16:11 ` [PATCH 08/10] drm/i915/crt: Drop pointless drm_device variables Ville Syrjala
2024-11-08 13:15 ` Jani Nikula
2024-11-07 16:11 ` [PATCH 09/10] drm/i915/crt: Rename some variables Ville Syrjala
2024-11-08 13:16 ` Jani Nikula
2024-11-07 16:11 ` [PATCH 10/10] drm/i915/crt: Nuke unused crt->connector Ville Syrjala
2024-11-08 13:16 ` Jani Nikula
2024-11-08 4:56 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Potential boot oops fix and some cleanups (rev2) Patchwork
2024-11-08 4:56 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-11-08 5:10 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-11-08 17:08 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Potential boot oops fix and some cleanups (rev3) Patchwork
2024-11-08 17:08 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-11-08 17:24 ` ✓ Fi.CI.BAT: success " Patchwork
2024-11-08 18:22 ` ✓ Fi.CI.IGT: " Patchwork
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=87h68heum5.fsf@intel.com \
--to=jani.nikula@linux.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.