| Message ID | 20190313214307.26573-1-rodrigo.vivi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Also use new comparative stuff for more ICP+ stuff | expand |
On Wed, Mar 13, 2019 at 02:43:07PM -0700, Rodrigo Vivi wrote: >I just noticed that initial PCH comparative patch >left some >= PCH_ICP cases behind. > >Let's also cover these cases and leave only the pin map >behind now. > >No functional change. Hence no fixes tag. > >Cc: Lucas De Marchi <lucas.demarchi@intel.com> >Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Lucas De Marchi >--- > drivers/gpu/drm/i915/i915_irq.c | 8 ++++---- > drivers/gpu/drm/i915/intel_cdclk.c | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > >diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c >index c823d2e76852..82d487189a34 100644 >--- a/drivers/gpu/drm/i915/i915_irq.c >+++ b/drivers/gpu/drm/i915/i915_irq.c >@@ -2829,7 +2829,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) > I915_WRITE(SDEIIR, iir); > ret = IRQ_HANDLED; > >- if (HAS_PCH_ICP(dev_priv)) >+ if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) > icp_irq_handler(dev_priv, iir); > else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT) > spt_irq_handler(dev_priv, iir); >@@ -3413,7 +3413,7 @@ static void gen11_irq_reset(struct drm_device *dev) > GEN3_IRQ_RESET(GEN11_GU_MISC_); > GEN3_IRQ_RESET(GEN8_PCU_); > >- if (HAS_PCH_ICP(dev_priv)) >+ if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) > GEN3_IRQ_RESET(SDE); > } > >@@ -3594,7 +3594,7 @@ static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv) > > gen11_hpd_detection_setup(dev_priv); > >- if (HAS_PCH_ICP(dev_priv)) >+ if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) > icp_hpd_irq_setup(dev_priv); > } > >@@ -4050,7 +4050,7 @@ static int gen11_irq_postinstall(struct drm_device *dev) > struct drm_i915_private *dev_priv = dev->dev_private; > u32 gu_misc_masked = GEN11_GU_MISC_GSE; > >- if (HAS_PCH_ICP(dev_priv)) >+ if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) > icp_irq_postinstall(dev); > > gen11_gt_irq_postinstall(dev_priv); >diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c >index 9d236e4ed26a..21fb4e0d6c4e 100644 >--- a/drivers/gpu/drm/i915/intel_cdclk.c >+++ b/drivers/gpu/drm/i915/intel_cdclk.c >@@ -2668,7 +2668,7 @@ static int cnp_rawclk(struct drm_i915_private *dev_priv) > > rawclk |= CNP_RAWCLK_DEN(DIV_ROUND_CLOSEST(numerator * 1000, > fraction) - 1); >- if (HAS_PCH_ICP(dev_priv)) >+ if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) > rawclk |= ICP_RAWCLK_NUM(numerator); > } > >-- >2.20.1 >
On Thu, Mar 14, 2019 at 11:45:18AM -0700, Lucas De Marchi wrote: > On Wed, Mar 13, 2019 at 02:43:07PM -0700, Rodrigo Vivi wrote: > > I just noticed that initial PCH comparative patch > > left some >= PCH_ICP cases behind. > > > > Let's also cover these cases and leave only the pin map > > behind now. > > > > No functional change. Hence no fixes tag. > > > > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > > Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> thanks, pushed. > > Lucas De Marchi > > > --- > > drivers/gpu/drm/i915/i915_irq.c | 8 ++++---- > > drivers/gpu/drm/i915/intel_cdclk.c | 2 +- > > 2 files changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > > index c823d2e76852..82d487189a34 100644 > > --- a/drivers/gpu/drm/i915/i915_irq.c > > +++ b/drivers/gpu/drm/i915/i915_irq.c > > @@ -2829,7 +2829,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) > > I915_WRITE(SDEIIR, iir); > > ret = IRQ_HANDLED; > > > > - if (HAS_PCH_ICP(dev_priv)) > > + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) > > icp_irq_handler(dev_priv, iir); > > else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT) > > spt_irq_handler(dev_priv, iir); > > @@ -3413,7 +3413,7 @@ static void gen11_irq_reset(struct drm_device *dev) > > GEN3_IRQ_RESET(GEN11_GU_MISC_); > > GEN3_IRQ_RESET(GEN8_PCU_); > > > > - if (HAS_PCH_ICP(dev_priv)) > > + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) > > GEN3_IRQ_RESET(SDE); > > } > > > > @@ -3594,7 +3594,7 @@ static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv) > > > > gen11_hpd_detection_setup(dev_priv); > > > > - if (HAS_PCH_ICP(dev_priv)) > > + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) > > icp_hpd_irq_setup(dev_priv); > > } > > > > @@ -4050,7 +4050,7 @@ static int gen11_irq_postinstall(struct drm_device *dev) > > struct drm_i915_private *dev_priv = dev->dev_private; > > u32 gu_misc_masked = GEN11_GU_MISC_GSE; > > > > - if (HAS_PCH_ICP(dev_priv)) > > + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) > > icp_irq_postinstall(dev); > > > > gen11_gt_irq_postinstall(dev_priv); > > diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c > > index 9d236e4ed26a..21fb4e0d6c4e 100644 > > --- a/drivers/gpu/drm/i915/intel_cdclk.c > > +++ b/drivers/gpu/drm/i915/intel_cdclk.c > > @@ -2668,7 +2668,7 @@ static int cnp_rawclk(struct drm_i915_private *dev_priv) > > > > rawclk |= CNP_RAWCLK_DEN(DIV_ROUND_CLOSEST(numerator * 1000, > > fraction) - 1); > > - if (HAS_PCH_ICP(dev_priv)) > > + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) > > rawclk |= ICP_RAWCLK_NUM(numerator); > > } > > > > -- > > 2.20.1 > >
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index c823d2e76852..82d487189a34 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -2829,7 +2829,7 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl) I915_WRITE(SDEIIR, iir); ret = IRQ_HANDLED; - if (HAS_PCH_ICP(dev_priv)) + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) icp_irq_handler(dev_priv, iir); else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT) spt_irq_handler(dev_priv, iir); @@ -3413,7 +3413,7 @@ static void gen11_irq_reset(struct drm_device *dev) GEN3_IRQ_RESET(GEN11_GU_MISC_); GEN3_IRQ_RESET(GEN8_PCU_); - if (HAS_PCH_ICP(dev_priv)) + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) GEN3_IRQ_RESET(SDE); } @@ -3594,7 +3594,7 @@ static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv) gen11_hpd_detection_setup(dev_priv); - if (HAS_PCH_ICP(dev_priv)) + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) icp_hpd_irq_setup(dev_priv); } @@ -4050,7 +4050,7 @@ static int gen11_irq_postinstall(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; u32 gu_misc_masked = GEN11_GU_MISC_GSE; - if (HAS_PCH_ICP(dev_priv)) + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) icp_irq_postinstall(dev); gen11_gt_irq_postinstall(dev_priv); diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c index 9d236e4ed26a..21fb4e0d6c4e 100644 --- a/drivers/gpu/drm/i915/intel_cdclk.c +++ b/drivers/gpu/drm/i915/intel_cdclk.c @@ -2668,7 +2668,7 @@ static int cnp_rawclk(struct drm_i915_private *dev_priv) rawclk |= CNP_RAWCLK_DEN(DIV_ROUND_CLOSEST(numerator * 1000, fraction) - 1); - if (HAS_PCH_ICP(dev_priv)) + if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) rawclk |= ICP_RAWCLK_NUM(numerator); }
I just noticed that initial PCH comparative patch left some >= PCH_ICP cases behind. Let's also cover these cases and leave only the pin map behind now. No functional change. Hence no fixes tag. Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> --- drivers/gpu/drm/i915/i915_irq.c | 8 ++++---- drivers/gpu/drm/i915/intel_cdclk.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)