All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Matt Roper <matthew.d.roper@intel.com>
Cc: intel-gfx@lists.freedesktop.org,
	"Ville Syrjälä" <ville.syrjala@intel.com>
Subject: Re: [Intel-gfx] [PATCH 6/6] drm/i915/display: Simplify GLK display version tests
Date: Mon, 22 Mar 2021 17:19:26 +0200	[thread overview]
Message-ID: <YFi1fqa1wsqm6Gn4@intel.com> (raw)
In-Reply-To: <20210320044245.3920043-7-matthew.d.roper@intel.com>

On Fri, Mar 19, 2021 at 09:42:45PM -0700, Matt Roper wrote:
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index 4be848d0d156..eb1121e05c0d 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -1433,7 +1433,7 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv,
>  		break;
>  	case BXT_CDCLK_CD2X_DIV_SEL_1_5:
>  		drm_WARN(&dev_priv->drm,
> -			 IS_GEMINILAKE(dev_priv) || DISPLAY_VER(dev_priv) >= 10,
> +			 DISPLAY_VER(dev_priv) >= 10,
>  			 "Unsupported divider\n");
>  		div = 3;
>  		break;
> @@ -1591,7 +1591,7 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
>  		break;
>  	case 3:
>  		drm_WARN(&dev_priv->drm,
> -			 IS_GEMINILAKE(dev_priv) || DISPLAY_VER(dev_priv) >= 10,
> +			 DISPLAY_VER(dev_priv) >= 10,
>  			 "Unsupported divider\n");
>  		divider = BXT_CDCLK_CD2X_DIV_SEL_1_5;
>  		break;

Looks like you still end up with the wrong thing here for the case 8?
Atm it has a gen>=10 check, after this it should have gen>=11||is_cnl.

The approach I was thinking should work for this would be somehting
along the lines of:
gen>9 -> gen>=10
gen>=10 -> gen>=11||is_cnl
is_cnl||is_glk -> gen10
gen>=11||gen10 -> gen>=10

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2021-03-22 15:19 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-20  4:42 [Intel-gfx] [PATCH 0/6] Disassociate display version from INTEL_GEN() Matt Roper
2021-03-20  4:42 ` [Intel-gfx] [PATCH 1/6] drm/i915/display: Convert gen5/gen6 tests to IS_IRONLAKE/IS_SANDYBRIDGE Matt Roper
2021-03-20  4:42 ` [Intel-gfx] [PATCH 2/6] drm/i915: Add DISPLAY_VER() and related macros Matt Roper
2021-03-23  5:37   ` Lucas De Marchi
2021-03-20  4:42 ` [Intel-gfx] [PATCH 3/6] drm/i915/display: Eliminate most usage of INTEL_GEN() Matt Roper
2021-03-23  5:45   ` Lucas De Marchi
2021-03-20  4:42 ` [Intel-gfx] [PATCH 4/6] drm/i915: Convert INTEL_GEN() to DISPLAY_VER() as appropriate in intel_pm.c Matt Roper
2021-03-20  4:42 ` [Intel-gfx] [PATCH 5/6] drm/i915: Convert INTEL_GEN() to DISPLAY_VER() as appropriate in i915_irq.c Matt Roper
2021-03-20  4:42 ` [Intel-gfx] [PATCH 6/6] drm/i915/display: Simplify GLK display version tests Matt Roper
2021-03-22 15:19   ` Ville Syrjälä [this message]
2021-03-22 19:48     ` [Intel-gfx] [PATCH v2 " Matt Roper
2021-03-22 19:50       ` [Intel-gfx] [PATCH v2.1 " Matt Roper
2021-03-22 21:16         ` Ville Syrjälä
2021-03-22 21:25           ` Matt Roper
2021-03-22 21:34             ` Ville Syrjälä
2021-03-22 23:38           ` [Intel-gfx] [PATCH v3 " Matt Roper
2021-03-23 17:25             ` Ville Syrjälä
2021-03-23 17:27               ` Matt Roper
2021-03-23 17:40                 ` Ville Syrjälä
2021-03-23 18:00                   ` Matt Roper
2021-03-20  5:09 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Disassociate display version from INTEL_GEN() Patchwork
2021-03-20  5:10 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-03-20  5:43 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-03-20  6:56 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-03-22 22:13 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Disassociate display version from INTEL_GEN() (rev3) Patchwork
2021-03-22 22:15 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-03-22 22:43 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2021-03-23  0:25 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Disassociate display version from INTEL_GEN() (rev4) Patchwork
2021-03-23  0:27 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-03-23  0:54 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2021-03-23  1:27 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Disassociate display version from INTEL_GEN() (rev5) Patchwork
2021-03-23  1:28 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-03-23  1:55 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-03-23 22:59 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-03-23 23:55   ` Matt Roper

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=YFi1fqa1wsqm6Gn4@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=matthew.d.roper@intel.com \
    --cc=ville.syrjala@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.