All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
	intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org
Subject: Re: [PATCH 8/8] drm/i915/de: Nuke driver_is_i915()
Date: Wed, 18 Nov 2026 12:15:28 +0200	[thread overview]
Message-ID: <d90ec99f4f051b86c51ab53f1033c02000bc6048@intel.com> (raw)
In-Reply-To: <20261113134355.14579-9-ville.syrjala@linux.intel.com>

On Fri, 13 Nov 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Now that both i915 and xe use the same mmio funcs for
> TGL+ we can unify the intel_de_init() if-ladders for
> the two drivers and get rid of driver_is_i915().
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Obviously need to adjust for xe unclaimed register flagging all over CI,
but other than that,

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


> ---
>  drivers/gpu/drm/i915/display/intel_de.c | 45 +++++++------------------
>  1 file changed, 13 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_de.c b/drivers/gpu/drm/i915/display/intel_de.c
> index 9399db0d8e1b..3a8ee5141fdd 100644
> --- a/drivers/gpu/drm/i915/display/intel_de.c
> +++ b/drivers/gpu/drm/i915/display/intel_de.c
> @@ -522,44 +522,25 @@ static const struct intel_mmio_funcs lnl_mmio_funcs = {
>  	.check_for_unclaimed_mmio = hsw_check_for_unclaimed_mmio,
>  };
>  
> -static bool driver_is_i915(void)
> -{
> -#ifdef I915
> -	return true;
> -#else
> -	return false;
> -#endif
> -}
> -
>  void intel_de_init(struct intel_display *display)
>  {
>  	display->mmio.uncore = to_intel_uncore(display->drm);
>  
>  	spin_lock_init(&display->mmio.lock);
>  
> -	/*
> -	 * TODO: enable unclaimed register detection
> -	 * (ideally without the lock) for xe and get
> -	 * rid of driver_is_i915().
> -	 */
> -	if (driver_is_i915()) {
> -		if (DISPLAY_VER(display) >= 12)
> -			display->mmio.funcs = &tgl_mmio_funcs;
> -		else if (DISPLAY_VER(display) >= 9 ||
> -			 display->platform.broadwell || display->platform.haswell)
> -			display->mmio.funcs = &hsw_mmio_funcs;
> -		else if (display->platform.valleyview || display->platform.cherryview)
> -			display->mmio.funcs = &vlv_mmio_funcs;
> -		else if (DISPLAY_VER(display) >= 6)
> -			display->mmio.funcs = &snb_mmio_funcs;
> -		else
> -			display->mmio.funcs = &i9xx_mmio_funcs;
> -	} else {
> -		if (DISPLAY_VER(display) >= 20)
> -			display->mmio.funcs = &lnl_mmio_funcs;
> -		else
> -			display->mmio.funcs = &tgl_mmio_funcs;
> -	}
> +	if (DISPLAY_VER(display) >= 20)
> +		display->mmio.funcs = &lnl_mmio_funcs;
> +	else if (DISPLAY_VER(display) >= 12)
> +		display->mmio.funcs = &tgl_mmio_funcs;
> +	else if (DISPLAY_VER(display) >= 9 ||
> +		 display->platform.broadwell || display->platform.haswell)
> +		display->mmio.funcs = &hsw_mmio_funcs;
> +	else if (display->platform.valleyview || display->platform.cherryview)
> +		display->mmio.funcs = &vlv_mmio_funcs;
> +	else if (DISPLAY_VER(display) >= 6)
> +		display->mmio.funcs = &snb_mmio_funcs;
> +	else
> +		display->mmio.funcs = &i9xx_mmio_funcs;
>  
>  	if (display->mmio.funcs->check_for_unclaimed_mmio)
>  		WRITE_ONCE(display->mmio.unclaimed_mmio_check, true);

-- 
Jani Nikula, Intel

  reply	other threads:[~2026-11-18 10:15 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-13 13:43 [PATCH 0/8] drm/{i915, xe}: Make unclaimed mmio detection lockless and enable it for xe Ville Syrjala
2026-11-13 13:43 ` [PATCH 1/8] drm/i915/de: Uninline intel_de_{read,write}_fw() Ville Syrjala
2026-11-13 14:11   ` Jani Nikula
2026-11-13 13:43 ` [PATCH 2/8] drm/i915/de: Pimp the intel_de_{read,write}_fw() docs Ville Syrjala
2026-11-13 14:12   ` [PATCH 2/8] drm/i915/de: Pimp the intel_de_{read, write}_fw() docs Jani Nikula
2026-11-13 14:31     ` Ville Syrjälä
2026-11-18  9:45       ` Jani Nikula
2026-11-13 13:43 ` [PATCH 3/8] drm/i915/de: Flatten the unclaimed mmio code Ville Syrjala
2026-11-13 14:25   ` Jani Nikula
2026-11-13 13:43 ` [PATCH 4/8] drm/i915/de: Make mmio_debug lockless Ville Syrjala
2026-11-13 16:30   ` Ville Syrjälä
2026-11-18  9:46     ` Jani Nikula
2026-11-18 10:04   ` Jani Nikula
2026-11-13 13:43 ` [PATCH 5/8] drm/i915/de: Optimize the mmio_debug checks in intel_de_{read, write}() Ville Syrjala
2026-11-18 10:10   ` Jani Nikula
2026-11-13 13:43 ` [PATCH 6/8] drm/i915/de: Make display registers unlocked for TGL+ on i915 Ville Syrjala
2026-11-18 10:11   ` Jani Nikula
2026-11-13 13:43 ` [PATCH 7/8] drm/xe: Enable unclaimed register detection on xe Ville Syrjala
2026-11-18 10:14   ` Jani Nikula
2026-11-13 13:43 ` [PATCH 8/8] drm/i915/de: Nuke driver_is_i915() Ville Syrjala
2026-11-18 10:15   ` Jani Nikula [this message]
2026-11-13 14:33 ` ✗ CI.checkpatch: warning for drm/{i915, xe}: Make unclaimed mmio detection lockless and enable it for xe Patchwork
2026-11-13 14:35 ` ✓ CI.KUnit: success " Patchwork
2026-11-13 14:52 ` ✗ CI.checksparse: warning " Patchwork
2026-11-13 14:57 ` ✗ i915.CI.BAT: failure " Patchwork
2026-11-13 15:07 ` ✗ Xe.CI.BAT: " Patchwork
2026-11-13 16:41   ` Ville Syrjälä
2026-11-14  0:50 ` ✗ Xe.CI.FULL: " 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=d90ec99f4f051b86c51ab53f1033c02000bc6048@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@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.