[Intel-gfx] [PATCH] drm/i915/icl: More workaround for port F detection due to broken VBTs

[Jani Nikula]

On Mon, 13 May 2019, Imre Deak <imre.deak at intel.com> wrote:
> On Mon, May 13, 2019 at 04:56:25PM +0300, Jani Nikula wrote:
>> On Fri, 10 May 2019, Imre Deak <imre.deak at intel.com> wrote:
>> > Add another ICL-Y PCIID that proved to have only 5 ports to the
>> > corresponding PCIID list.
>> >
>> > Meanwhile I'm trying to get a complete list of all PCIIDs with less than
>> > 6 ports and/or get a VBT fix to mark these ports non-existant, but until
>> > then the only way is to go one-by-one.
>> >
>> > This fixes the following error on machines with less than 6 port:
>> >
>> > 	[drm:intel_power_well_enable [i915]] enabling AUX F
>> > 	------------[ cut here ]------------
>> > 	WARN_ON(intel_wait_for_register(&dev_priv->uncore, regs->driver, (0x1 << ((pw_idx) * 2)), (0x1 << ((pw_idx) * 2)), 1))
>> >
>> > (Internal reference: BSpec/Index/20584/Issues, HSD/1306084116)
>> >
>> > Cc: Mika Kahola <mika.kahola at intel.com>
>> > References: https://bugs.freedesktop.org/show_bug.cgi?id=108915
>> 
>> We've used Bugzilla: for bugs that the patch at hand fixes, and
>> References: for other related links and stuff. Seems like the patch
>> actually fixed the bug.
>
> Yes, it's a link to a related bug. It - unfortunately - does not fix the
> bug, since we don't know yet the full PCIID list for ICLs that have only
> 5 (or even less) ports.

Yet the bug was closed referencing this commit...

BR,
Jani.


>
>> 
>> BR,
>> Jani.
>> 
>> 
>> > Signed-off-by: Imre Deak <imre.deak at intel.com>
>> > ---
>> >  include/drm/i915_pciids.h | 4 ++--
>> >  1 file changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
>> > index 6477da22af28..6d60ea68c171 100644
>> > --- a/include/drm/i915_pciids.h
>> > +++ b/include/drm/i915_pciids.h
>> > @@ -559,7 +559,6 @@
>> >  #define INTEL_ICL_PORT_F_IDS(info) \
>> >  	INTEL_VGA_DEVICE(0x8A50, info), \
>> >  	INTEL_VGA_DEVICE(0x8A5C, info), \
>> > -	INTEL_VGA_DEVICE(0x8A5D, info), \
>> >  	INTEL_VGA_DEVICE(0x8A59, info),	\
>> >  	INTEL_VGA_DEVICE(0x8A58, info),	\
>> >  	INTEL_VGA_DEVICE(0x8A52, info), \
>> > @@ -573,7 +572,8 @@
>> >  
>> >  #define INTEL_ICL_11_IDS(info) \
>> >  	INTEL_ICL_PORT_F_IDS(info), \
>> > -	INTEL_VGA_DEVICE(0x8A51, info)
>> > +	INTEL_VGA_DEVICE(0x8A51, info), \
>> > +	INTEL_VGA_DEVICE(0x8A5D, info)
>> >  
>> >  /* EHL */
>> >  #define INTEL_EHL_IDS(info) \
>> 
>> -- 
>> Jani Nikula, Intel Open Source Graphics Center

-- 
Jani Nikula, Intel Open Source Graphics Center