From: Jani Nikula <jani.nikula@linux.intel.com>
To: Lucas De Marchi <lucas.de.marchi@gmail.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the drm-intel-fixes tree
Date: Wed, 30 Jan 2019 10:22:08 +0200 [thread overview]
Message-ID: <87k1im8si7.fsf@intel.com> (raw)
In-Reply-To: <CAKi4VA+kGT1WbUHV=Q6PW+PR+Vh+AEE+a2_wLkmMVq88tTSH_Q@mail.gmail.com>
On Tue, 29 Jan 2019, Lucas De Marchi <lucas.de.marchi@gmail.com> wrote:
> On Tue, Jan 29, 2019 at 2:39 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> After merging the drm-intel-fixes tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/i915/intel_display.c: In function 'has_bogus_dpll_config':
>> drivers/gpu/drm/i915/intel_display.c:15432:27: error: macro "IS_GEN" requires 3 arguments, but only 2 given
>> return IS_GEN(dev_priv, 6) &&
>> ^
>>
>> Caused by commit
>>
>> a49a17226feb ("drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen")
>>
>> It seems this was cherry-picked incorrectly :-(
>
> while the cherry-pick was correct, the macro is different on
> drm-intel-fixes. IS_GEN(dev_priv, 6) needs to be converted to
> IS_GEN6(dev_priv).
>
> Lucas De Marchi
>
>>
>> I have reverted that commit for today.
Dropped the commit from drm-intel-fixes.
Somehow I had managed to screw up my kernel config in a way that avoided
the build failure.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Lucas De Marchi <lucas.de.marchi@gmail.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree
Date: Wed, 30 Jan 2019 10:22:08 +0200 [thread overview]
Message-ID: <87k1im8si7.fsf@intel.com> (raw)
In-Reply-To: <CAKi4VA+kGT1WbUHV=Q6PW+PR+Vh+AEE+a2_wLkmMVq88tTSH_Q@mail.gmail.com>
On Tue, 29 Jan 2019, Lucas De Marchi <lucas.de.marchi@gmail.com> wrote:
> On Tue, Jan 29, 2019 at 2:39 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> After merging the drm-intel-fixes tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/i915/intel_display.c: In function 'has_bogus_dpll_config':
>> drivers/gpu/drm/i915/intel_display.c:15432:27: error: macro "IS_GEN" requires 3 arguments, but only 2 given
>> return IS_GEN(dev_priv, 6) &&
>> ^
>>
>> Caused by commit
>>
>> a49a17226feb ("drm/i915: Try to sanitize bogus DPLL state left over by broken SNB BIOSen")
>>
>> It seems this was cherry-picked incorrectly :-(
>
> while the cherry-pick was correct, the macro is different on
> drm-intel-fixes. IS_GEN(dev_priv, 6) needs to be converted to
> IS_GEN6(dev_priv).
>
> Lucas De Marchi
>
>>
>> I have reverted that commit for today.
Dropped the commit from drm-intel-fixes.
Somehow I had managed to screw up my kernel config in a way that avoided
the build failure.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
next prev parent reply other threads:[~2019-01-30 8:22 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 22:39 linux-next: build failure after merge of the drm-intel-fixes tree Stephen Rothwell
2019-01-29 22:53 ` Lucas De Marchi
2019-01-29 22:53 ` [Intel-gfx] " Lucas De Marchi
2019-01-30 8:22 ` Jani Nikula [this message]
2019-01-30 8:22 ` Jani Nikula
-- strict thread matches above, loose matches on Subject: below --
2022-07-13 12:14 Stephen Rothwell
2022-07-13 12:14 ` Stephen Rothwell
2022-01-31 22:27 Stephen Rothwell
2022-01-31 22:27 ` Stephen Rothwell
2020-11-03 22:37 Stephen Rothwell
2020-11-03 22:37 ` Stephen Rothwell
2020-11-04 0:25 ` Rodrigo Vivi
2020-11-04 0:25 ` Rodrigo Vivi
2020-06-15 23:39 Stephen Rothwell
2020-06-15 23:39 ` Stephen Rothwell
2020-06-16 9:22 ` Joonas Lahtinen
2020-06-16 9:22 ` Joonas Lahtinen
2020-05-28 22:30 Stephen Rothwell
2020-05-28 22:30 ` Stephen Rothwell
2020-01-20 21:34 Stephen Rothwell
2020-01-20 21:34 ` Stephen Rothwell
2020-01-21 7:13 ` Joonas Lahtinen
2020-01-21 7:13 ` Joonas Lahtinen
2018-05-29 9:26 Stephen Rothwell
2018-05-29 9:26 ` Stephen Rothwell
2018-05-29 11:45 ` Joonas Lahtinen
2018-05-29 11:45 ` Joonas Lahtinen
2017-10-10 7:03 Mark Brown
2017-10-11 8:51 ` Mark Brown
2017-10-11 8:51 ` Mark Brown
2017-01-02 23:42 Stephen Rothwell
2017-01-02 23:42 ` Stephen Rothwell
2017-01-03 2:59 ` Zhenyu Wang
2017-01-03 2:59 ` Zhenyu Wang
2017-01-03 4:07 ` Stephen Rothwell
2017-01-03 4:07 ` Stephen Rothwell
2017-01-03 4:48 ` Alex Williamson
2017-01-03 4:48 ` Alex Williamson
2017-01-03 9:23 ` Zhenyu Wang
2017-01-03 9:23 ` Zhenyu Wang
2017-01-03 13:25 ` Jani Nikula
2017-01-03 20:37 ` Alex Williamson
2017-01-04 9:07 ` Daniel Vetter
2014-06-06 2:03 Stephen Rothwell
2014-06-06 2:03 ` Stephen Rothwell
2014-06-06 6:45 ` Daniel Vetter
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=87k1im8si7.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lucas.de.marchi@gmail.com \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.