From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org,
Lucas De Marchi <lucas.demarchi@intel.com>
Subject: Re: [PATCH 3/3] drm/i915: Start using comparative INTEL_PCH_TYPE
Date: Tue, 5 Mar 2019 12:24:11 -0800 [thread overview]
Message-ID: <20190305202411.GT10303@intel.com> (raw)
In-Reply-To: <87k1hdayui.fsf@intel.com>
On Tue, Mar 05, 2019 at 09:46:29PM +0200, Jani Nikula wrote:
> On Tue, 05 Mar 2019, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> > On Tue, Mar 05, 2019 at 10:38:46AM -0800, Rodrigo Vivi wrote:
> >>On Tue, Mar 05, 2019 at 09:42:22AM -0800, Lucas De Marchi wrote:
> >>> On Tue, Mar 05, 2019 at 07:16:47PM +0200, Jani Nikula wrote:
> >>> > On Tue, 05 Mar 2019, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> >>> > > On Tue, Mar 05, 2019 at 04:10:04PM +0200, Jani Nikula wrote:
> >>> > > > On Mon, 04 Mar 2019, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> >>> > > > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> >>> > > > > index e1a051c0fbfe..acd2336bb214 100644
> >>> > > > > --- a/drivers/gpu/drm/i915/intel_dp.c
> >>> > > > > +++ b/drivers/gpu/drm/i915/intel_dp.c
> >>> > > > > @@ -949,8 +949,8 @@ static void intel_pps_get_registers(struct intel_dp *intel_dp,
> >>> > > > > regs->pp_stat = PP_STATUS(pps_idx);
> >>> > > > > regs->pp_on = PP_ON_DELAYS(pps_idx);
> >>> > > > > regs->pp_off = PP_OFF_DELAYS(pps_idx);
> >>> > > > > - if (!IS_GEN9_LP(dev_priv) && !HAS_PCH_CNP(dev_priv) &&
> >>> > > > > - !HAS_PCH_ICP(dev_priv))
> >>> > > > > + if (INTEL_PCH_TYPE(dev_priv) > PCH_NONE &&
> >>> > > > > + INTEL_PCH_TYPE(dev_priv) < PCH_CNP)
> >>> > > >
> >>> > > > This is not right, starts to require PCH.
> >>> > >
> >>> > > But in those cases INTEL_PCH_TYPE() will return either NONE or NOP.
> >>> >
> >>> > Exactly. Non-PCH platforms before CNP should match, but won't.
> >>>
> >>> yeah, right. I misread the !IS_GEN9_LP().
> >>
> >>ouch... indeed.
> >>probably this explains failure on ci for bsw and byt
> >>
> >>options:
> >>
> >>1. if (!IS_GEN9_LP(dev_priv) && !(INTEL_PCH_TYPE(dev_priv) >= 10))
> >
> > 10? I think you meant PCH_CNP
> >
> >>
> >>2. if (INTEL_GEN(dev_priv) <= 8 || IS_GEN9_BC(dev_priv))
> >>
> >>3. other ideas?
> >
> > "all PCHs before CNP, excluding GEN9_LP":
> >
> > if (INTEL_PCH_TYPE(dev_priv) < PCH_CNP && !IS_GEN9_LP(dev_priv))
>
> See the series I mentioned upthread [1], it reverses the condition
> making this easier to write anyway.
Thanks a lot!
I will make a v2 on top of yours and resend after it gets pushed.
>
> BR,
> Jani.
>
>
> [1] https://patchwork.freedesktop.org/series/57579/
>
>
> >
> >
> > Lucas De Marchi
> >
> >>
> >>>
> >>> Lucas De Marchi
> >>>
> >>> >
> >>> > BR,
> >>> > Jani.
> >>> >
> >>> >
> >>> > --
> >>> > Jani Nikula, Intel Open Source Graphics Center
>
> --
> Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-03-05 20:24 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-04 22:48 [PATCH 1/3] drm/i915/gen11+: First assume next platforms will inherit stuff Rodrigo Vivi
2019-03-04 22:48 ` [PATCH 2/3] drm/i915: Move PCH_NOP to -1 Rodrigo Vivi
2019-03-05 17:38 ` Lucas De Marchi
2019-03-04 22:48 ` [PATCH 3/3] drm/i915: Start using comparative INTEL_PCH_TYPE Rodrigo Vivi
2019-03-05 14:10 ` Jani Nikula
2019-03-05 17:08 ` Lucas De Marchi
2019-03-05 17:16 ` Jani Nikula
2019-03-05 17:42 ` Lucas De Marchi
2019-03-05 18:38 ` Rodrigo Vivi
2019-03-05 18:48 ` Lucas De Marchi
2019-03-05 19:46 ` Jani Nikula
2019-03-05 20:24 ` Rodrigo Vivi [this message]
2019-03-05 0:05 ` ✗ Fi.CI.SPARSE: warning for series starting with [1/3] drm/i915/gen11+: First assume next platforms will inherit stuff Patchwork
2019-03-05 1:12 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-03-05 17:12 ` [PATCH 1/3] " Lucas De Marchi
2019-03-05 17:43 ` Tvrtko Ursulin
2019-03-05 18:36 ` Lucas De Marchi
-- strict thread matches above, loose matches on Subject: below --
2019-03-08 21:42 Rodrigo Vivi
2019-03-08 21:43 ` [PATCH 3/3] drm/i915: Start using comparative INTEL_PCH_TYPE Rodrigo Vivi
2019-03-13 17:30 ` Lucas De Marchi
2019-03-13 20:02 ` Rodrigo Vivi
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=20190305202411.GT10303@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--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