My minnow was broken by: drm/i915: Consolidate forcewake code

My minnow was broken by: drm/i915: Consolidate forcewake code

[Olof Johansson]

Hi Daniel, Mika,

For the first time in a few days, -next was bootable last night. I
noticed that my Minnowboard Max didn't actually boot though, it got
stuck shortly after or during DRM probing:

http://arm-soc.lixom.net/bootlogs/next/next-20150123/minnowmax-x86-minnowmax_defconfig.html

I bisected it down to the below patch that I failed to find posted
(with that subject) anywhere on a public list that I am subscribed to.

The patch isn't revertable without considerable effort so I can't
double check that it's just this one change, but the commit before
that in the branch boots, this one does not.


commit fc72355f5c04c40f2916a07e9f8d4b357e2e0a93
Author:     Mika Kuoppala <mika.kuoppala@linux.intel.com>
AuthorDate: Mon Jan 19 16:20:43 2015 +0200
Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
CommitDate: Tue Jan 20 12:36:57 2015 +0100

    drm/i915: Consolidate forcewake code

    As we now have forcewake domains, take advantage of it
    by putting the differences in gen fw handling in data rather
    than in code.

    In past we have opencoded this quite extensively as the fw handling
    is in the fast path. There has also been a lot of cargo-culted
    copy'n'pasting from older gens to newer ones.

    Now when the releasing of the forcewake is done by deferred timer,
    it gives chance to consolidate more. Due to the frequency of actual hw
    access being significantly less.

    Take advantage of this and generalize the fw handling code
    as much as possible. But we still aim to keep the forcewake sequence
    particularities for each gen intact. So the access pattern
    to fw engines should remain the same.

    v2: - s/old_ack/clear_ack (Chris)
        - s/post_read/posting_read (Chris)
        - less polite commit msg (Chris)

    v3: - rebase
        - check and clear wake_count in init

    v4: - fix posting reads for gen8 (PRTS)

    Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
    Reviewed-by: Deepak S <deepak.s@linux.intel.com> (v2)
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: My minnow was broken by: drm/i915: Consolidate forcewake code

[Darren Hart]

+Jani

Jani, I think this may have inadvertently undone the fix you made for
us on the MinnowMax.

On Fri, Jan 23, 2015 at 1:44 PM, Olof Johansson <olof@lixom.net> wrote:
> Hi Daniel, Mika,
>
> For the first time in a few days, -next was bootable last night. I
> noticed that my Minnowboard Max didn't actually boot though, it got
> stuck shortly after or during DRM probing:
>
> http://arm-soc.lixom.net/bootlogs/next/next-20150123/minnowmax-x86-minnowmax_defconfig.html
>
> I bisected it down to the below patch that I failed to find posted
> (with that subject) anywhere on a public list that I am subscribed to.
>
> The patch isn't revertable without considerable effort so I can't
> double check that it's just this one change, but the commit before
> that in the branch boots, this one does not.
>
>
> commit fc72355f5c04c40f2916a07e9f8d4b357e2e0a93
> Author:     Mika Kuoppala <mika.kuoppala@linux.intel.com>
> AuthorDate: Mon Jan 19 16:20:43 2015 +0200
> Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
> CommitDate: Tue Jan 20 12:36:57 2015 +0100
>
>     drm/i915: Consolidate forcewake code
>
>     As we now have forcewake domains, take advantage of it
>     by putting the differences in gen fw handling in data rather
>     than in code.
>
>     In past we have opencoded this quite extensively as the fw handling
>     is in the fast path. There has also been a lot of cargo-culted
>     copy'n'pasting from older gens to newer ones.
>
>     Now when the releasing of the forcewake is done by deferred timer,
>     it gives chance to consolidate more. Due to the frequency of actual hw
>     access being significantly less.
>
>     Take advantage of this and generalize the fw handling code
>     as much as possible. But we still aim to keep the forcewake sequence
>     particularities for each gen intact. So the access pattern
>     to fw engines should remain the same.
>
>     v2: - s/old_ack/clear_ack (Chris)
>         - s/post_read/posting_read (Chris)
>         - less polite commit msg (Chris)
>
>     v3: - rebase
>         - check and clear wake_count in init
>
>     v4: - fix posting reads for gen8 (PRTS)
>
>     Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
>     Reviewed-by: Deepak S <deepak.s@linux.intel.com> (v2)
>     Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>



-- 
Darren Hart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: My minnow was broken by: drm/i915: Consolidate forcewake code

[Daniel Vetter]

On Fri, Jan 23, 2015 at 02:43:53PM -0800, Darren Hart wrote:
> +Jani
> 
> Jani, I think this may have inadvertently undone the fix you made for
> us on the MinnowMax.

Do you still remember the patch? Some digging around didn't turn up
anything ...
-Daniel

> 
> On Fri, Jan 23, 2015 at 1:44 PM, Olof Johansson <olof@lixom.net> wrote:
> > Hi Daniel, Mika,
> >
> > For the first time in a few days, -next was bootable last night. I
> > noticed that my Minnowboard Max didn't actually boot though, it got
> > stuck shortly after or during DRM probing:
> >
> > http://arm-soc.lixom.net/bootlogs/next/next-20150123/minnowmax-x86-minnowmax_defconfig.html
> >
> > I bisected it down to the below patch that I failed to find posted
> > (with that subject) anywhere on a public list that I am subscribed to.
> >
> > The patch isn't revertable without considerable effort so I can't
> > double check that it's just this one change, but the commit before
> > that in the branch boots, this one does not.
> >
> >
> > commit fc72355f5c04c40f2916a07e9f8d4b357e2e0a93
> > Author:     Mika Kuoppala <mika.kuoppala@linux.intel.com>
> > AuthorDate: Mon Jan 19 16:20:43 2015 +0200
> > Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
> > CommitDate: Tue Jan 20 12:36:57 2015 +0100
> >
> >     drm/i915: Consolidate forcewake code
> >
> >     As we now have forcewake domains, take advantage of it
> >     by putting the differences in gen fw handling in data rather
> >     than in code.
> >
> >     In past we have opencoded this quite extensively as the fw handling
> >     is in the fast path. There has also been a lot of cargo-culted
> >     copy'n'pasting from older gens to newer ones.
> >
> >     Now when the releasing of the forcewake is done by deferred timer,
> >     it gives chance to consolidate more. Due to the frequency of actual hw
> >     access being significantly less.
> >
> >     Take advantage of this and generalize the fw handling code
> >     as much as possible. But we still aim to keep the forcewake sequence
> >     particularities for each gen intact. So the access pattern
> >     to fw engines should remain the same.
> >
> >     v2: - s/old_ack/clear_ack (Chris)
> >         - s/post_read/posting_read (Chris)
> >         - less polite commit msg (Chris)
> >
> >     v3: - rebase
> >         - check and clear wake_count in init
> >
> >     v4: - fix posting reads for gen8 (PRTS)
> >
> >     Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
> >     Reviewed-by: Deepak S <deepak.s@linux.intel.com> (v2)
> >     Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> 
> 
> -- 
> Darren Hart

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: My minnow was broken by: drm/i915: Consolidate forcewake code

[Ville Syrjälä]

On Sat, Jan 24, 2015 at 12:58:19PM +0100, Daniel Vetter wrote:
> On Fri, Jan 23, 2015 at 02:43:53PM -0800, Darren Hart wrote:
> > +Jani
> > 
> > Jani, I think this may have inadvertently undone the fix you made for
> > us on the MinnowMax.
> 
> Do you still remember the patch? Some digging around didn't turn up
> anything ...

IIRC it was this:
commit 05adaf1f101f25f40f12c29403e6488f0e45f6b6
Author: Jani Nikula <jani.nikula@intel.com>
Date:   Fri May 9 14:52:34 2014 +0300

    drm/i915/vlv: reset VLV media force wake request register

> -Daniel
> 
> > 
> > On Fri, Jan 23, 2015 at 1:44 PM, Olof Johansson <olof@lixom.net> wrote:
> > > Hi Daniel, Mika,
> > >
> > > For the first time in a few days, -next was bootable last night. I
> > > noticed that my Minnowboard Max didn't actually boot though, it got
> > > stuck shortly after or during DRM probing:
> > >
> > > http://arm-soc.lixom.net/bootlogs/next/next-20150123/minnowmax-x86-minnowmax_defconfig.html
> > >
> > > I bisected it down to the below patch that I failed to find posted
> > > (with that subject) anywhere on a public list that I am subscribed to.
> > >
> > > The patch isn't revertable without considerable effort so I can't
> > > double check that it's just this one change, but the commit before
> > > that in the branch boots, this one does not.
> > >
> > >
> > > commit fc72355f5c04c40f2916a07e9f8d4b357e2e0a93
> > > Author:     Mika Kuoppala <mika.kuoppala@linux.intel.com>
> > > AuthorDate: Mon Jan 19 16:20:43 2015 +0200
> > > Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
> > > CommitDate: Tue Jan 20 12:36:57 2015 +0100
> > >
> > >     drm/i915: Consolidate forcewake code
> > >
> > >     As we now have forcewake domains, take advantage of it
> > >     by putting the differences in gen fw handling in data rather
> > >     than in code.
> > >
> > >     In past we have opencoded this quite extensively as the fw handling
> > >     is in the fast path. There has also been a lot of cargo-culted
> > >     copy'n'pasting from older gens to newer ones.
> > >
> > >     Now when the releasing of the forcewake is done by deferred timer,
> > >     it gives chance to consolidate more. Due to the frequency of actual hw
> > >     access being significantly less.
> > >
> > >     Take advantage of this and generalize the fw handling code
> > >     as much as possible. But we still aim to keep the forcewake sequence
> > >     particularities for each gen intact. So the access pattern
> > >     to fw engines should remain the same.
> > >
> > >     v2: - s/old_ack/clear_ack (Chris)
> > >         - s/post_read/posting_read (Chris)
> > >         - less polite commit msg (Chris)
> > >
> > >     v3: - rebase
> > >         - check and clear wake_count in init
> > >
> > >     v4: - fix posting reads for gen8 (PRTS)
> > >
> > >     Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
> > >     Reviewed-by: Deepak S <deepak.s@linux.intel.com> (v2)
> > >     Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > 
> > 
> > 
> > -- 
> > Darren Hart
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: My minnow was broken by: drm/i915: Consolidate forcewake code

[Jani Nikula]

On Sat, 24 Jan 2015, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Sat, Jan 24, 2015 at 12:58:19PM +0100, Daniel Vetter wrote:
>> On Fri, Jan 23, 2015 at 02:43:53PM -0800, Darren Hart wrote:
>> > +Jani
>> > 
>> > Jani, I think this may have inadvertently undone the fix you made for
>> > us on the MinnowMax.
>> 
>> Do you still remember the patch? Some digging around didn't turn up
>> anything ...
>
> IIRC it was this:
> commit 05adaf1f101f25f40f12c29403e6488f0e45f6b6
> Author: Jani Nikula <jani.nikula@intel.com>
> Date:   Fri May 9 14:52:34 2014 +0300
>
>     drm/i915/vlv: reset VLV media force wake request register

That's the fix all right.

However there's

[    2.032075] [drm] failed to retrieve link info, disabling eDP

in the logs suggesting the minnowmax tries to initialize eDP which it
doesn't have. That's a VBT problem in itself, but since

commit d2182a660808d9053a605e3ebc8c46a323ec6e5d
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Fri Jan 9 14:21:14 2015 +0200

    drm/i915: Don't register HDMI connectors for eDP ports on VLV/CHV

we don't register HDMI if there's an eDP in the same port...

Potentially two problems I think.

BR,
Jani.



>
>> -Daniel
>> 
>> > 
>> > On Fri, Jan 23, 2015 at 1:44 PM, Olof Johansson <olof@lixom.net> wrote:
>> > > Hi Daniel, Mika,
>> > >
>> > > For the first time in a few days, -next was bootable last night. I
>> > > noticed that my Minnowboard Max didn't actually boot though, it got
>> > > stuck shortly after or during DRM probing:
>> > >
>> > > http://arm-soc.lixom.net/bootlogs/next/next-20150123/minnowmax-x86-minnowmax_defconfig.html
>> > >
>> > > I bisected it down to the below patch that I failed to find posted
>> > > (with that subject) anywhere on a public list that I am subscribed to.
>> > >
>> > > The patch isn't revertable without considerable effort so I can't
>> > > double check that it's just this one change, but the commit before
>> > > that in the branch boots, this one does not.
>> > >
>> > >
>> > > commit fc72355f5c04c40f2916a07e9f8d4b357e2e0a93
>> > > Author:     Mika Kuoppala <mika.kuoppala@linux.intel.com>
>> > > AuthorDate: Mon Jan 19 16:20:43 2015 +0200
>> > > Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
>> > > CommitDate: Tue Jan 20 12:36:57 2015 +0100
>> > >
>> > >     drm/i915: Consolidate forcewake code
>> > >
>> > >     As we now have forcewake domains, take advantage of it
>> > >     by putting the differences in gen fw handling in data rather
>> > >     than in code.
>> > >
>> > >     In past we have opencoded this quite extensively as the fw handling
>> > >     is in the fast path. There has also been a lot of cargo-culted
>> > >     copy'n'pasting from older gens to newer ones.
>> > >
>> > >     Now when the releasing of the forcewake is done by deferred timer,
>> > >     it gives chance to consolidate more. Due to the frequency of actual hw
>> > >     access being significantly less.
>> > >
>> > >     Take advantage of this and generalize the fw handling code
>> > >     as much as possible. But we still aim to keep the forcewake sequence
>> > >     particularities for each gen intact. So the access pattern
>> > >     to fw engines should remain the same.
>> > >
>> > >     v2: - s/old_ack/clear_ack (Chris)
>> > >         - s/post_read/posting_read (Chris)
>> > >         - less polite commit msg (Chris)
>> > >
>> > >     v3: - rebase
>> > >         - check and clear wake_count in init
>> > >
>> > >     v4: - fix posting reads for gen8 (PRTS)
>> > >
>> > >     Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
>> > >     Reviewed-by: Deepak S <deepak.s@linux.intel.com> (v2)
>> > >     Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>> > 
>> > 
>> > 
>> > -- 
>> > Darren Hart
>> 
>> -- 
>> Daniel Vetter
>> Software Engineer, Intel Corporation
>> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> -- 
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel