Revert "drm/i915: Enable GMBUS for post-gen2 chipsets"

[Dave Airlie]

On Fri, Jun 17, 2011 at 6:11 AM, Jean Delvare <khali at linux-fr.org> wrote:
> Hi Dave,
>
> On Tue, 14 Jun 2011 13:39:35 +1000, Dave Airlie wrote:
>> On Sat, Jun 11, 2011 at 10:58 PM, Jean Delvare <khali at linux-fr.org> wrote:
>> > Hi Florian,
>> >
>> > On Sat, 11 Jun 2011 13:28:15 +0200, Florian Mickler wrote:
>> >> On Sat, 04 Jun 2011 19:34:56 -0000
>> >> Jean Delvare <khali at linux-fr.org> wrote:
>> >>
>> >> > Revert commit 8f9a3f9b63b8cd3f03be9dc53533f90bd4120e5f. This fixes a
>> >> > hang when loading the eeprom driver (see bug #35572.) GMBUS will be
>> >> > re-enabled later, differently.
>> >> >
>> >> > Signed-off-by: Jean Delvare <khali at linux-fr.org>
>> >> > Reported-by: Marek Otahal <markotahal at gmail.com>
>> >> > Tested-by: Yermandu Patapitafious <yermandu.dev at gmail.com>
>> >> > Tested-by: Andrew Lutomirski <luto at mit.edu>
>> >> > Acked-by: Chris Wilson <chris at chris-wilson.co.uk>
>> >> > Cc: David Airlie <airlied at linux.ie>
>> >>
>> >> is this[1] resolved some other way in the meantime?
>> >>
>> >> Regards,
>> >> Flo
>> >>
>> >> [1]: https://bugzilla.kernel.org/show_bug.cgi?id=35572
>> >
>> > Not that I know of (and I don't see any other way at least for 2.6.39.)
>> > This is a shame, really, my revert patch should have been applied
>> > several days ago already.
>> >
>> > Keith, Chris, David, can you please get it rolling? This is a
>> > regression presumably affecting a lot of users, we should really fix it
>> > quickly, both in 2.6.39.x and 3.0-rc.
>>
>> This patch really had no info other than the bug link to tell me wtf its doing,
>
> The patch I sent on June 4th (Message-ID:
> <20110604213456.7ac5588e at endymion.delvare>) says:
>
> Revert commit 8f9a3f9b63b8cd3f03be9dc53533f90bd4120e5f. This fixes a
> hang when loading the eeprom driver (see bug #35572.) GMBUS will be
> re-enabled later, differently.
>
> Seems clear enough to me.

Hi Jean,

yeah I talked to Chris and I then spotted I was applying this in the
wrong place when
looking at the code by hand,

Once Chris explained I got it, will push soon.

Dave.