[git pull] drm merge for 3.9-rc1

[Sedat Dilek]

On Thu, Feb 28, 2013 at 12:18 PM, Chris Wilson <chris at chris-wilson.co.uk> wrote:
> On Thu, Feb 28, 2013 at 12:06:28AM +0100, Sedat Dilek wrote:
>> On Wed, Feb 27, 2013 at 11:36 PM, Sedat Dilek <sedat.dilek at gmail.com> wrote:
>> > Hi,
>> >
>> > I am seeing this also on Linux-Next.
>> >
>> > /var/log/kern.log:Feb 27 22:52:35 fambox kernel: [   28.202381]
>> > [drm:intel_dp_aux_wait_done] *ERROR* dp aux hw did not signal timeout
>> > (has irq: 1)!
>> > /var/log/kern.log:Feb 27 22:52:35 fambox kernel: [   28.210588]
>> > [drm:intel_dp_aux_wait_done] *ERROR* dp aux hw did not signal timeout
>> > (has irq: 1)!
>> >
>> > /var/log/kern.log.1:Feb 22 07:36:04 fambox kernel: [   27.408280]
>> > [drm:intel_dp_aux_wait_done] *ERROR* dp aux hw did not signal timeout
>> > (has irq: 1)!
>> >
>> > This seems to be hard reproducible...
>> > Laptop-LCD... Sandybridge Mobile-GT2.
>> >
>> > Is there a way to force the error?
>> >
>> > Possible patch see [1].
>> >
>> > - Sedat -
>> >
>> > [1] https://patchwork.kernel.org/patch/2192721/
>
> That was:
>
> +       if (!done) {
> +               status = I915_READ_NOTRACE(ch_ctl);
> +               DRM_ERROR("dp aux hw did not signal timeout (has irq:
> %i), status=%08x!\n",
> +                         has_aux_irq, status);
> +       }
>
> You applied
>
> +       if (!done) {
> +               status = I915_READ_NOTRACE(ch_ctl);
> +               DRM_ERROR("dp aux hw did not signal timeout (has irq:
> %i), status=%08x!\n",
> +                         has_aux_irq, status);
> +       {
>
> That second '{' is the source of the compile error.

Schei**e, OK I try with a v2.

A hint how to force the error?

- Sedat -

> -Chris
>
> --
> Chris Wilson, Intel Open Source Technology Centre