From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mika Kahola <mika.kahola@intel.com>,
Jani Nikula <jani.nikula@intel.com>
Subject: linux-next: build failure after merge of the drm tree
Date: Thu, 28 Apr 2016 11:57:45 +1000 [thread overview]
Message-ID: <20160428115745.55890c80@canb.auug.org.au> (raw)
Hi Dave,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/gpu/drm/i915/intel_ddi.c: In function 'intel_prepare_ddi_buffer':
drivers/gpu/drm/i915/intel_ddi.c:447:15: error: 'struct drm_i915_private' has no member named 'edp_low_vswing'
if (dev_priv->edp_low_vswing) {
^
Caused by commit
06411f08b3f3 ("drm/i915: move edp low vswing config to vbt data")
interacting with commit
992e7a41f9fc ("drm/i915: Fix eDP low vswing for Broadwell")
from the drm-intel-fixes tree.
I applied the following merge fixup patch (which is suggested by the "v3:
Change dev_priv->edp_low_vswing to use dev_priv->vbt.edp.low_vswing"
comment in the drm-intel-fixes tree patch, but clearly could not be
done there).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Apr 2016 11:53:36 +1000
Subject: [PATCH] drm/i915: fix up for edp_low_vswing change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/intel_ddi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 6080b5481984..e304857ba405 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -444,7 +444,7 @@ void intel_prepare_ddi_buffer(struct intel_encoder *encoder)
ddi_translations_fdi = bdw_ddi_translations_fdi;
ddi_translations_dp = bdw_ddi_translations_dp;
- if (dev_priv->edp_low_vswing) {
+ if (dev_priv->vbt.edp.low_vswing) {
ddi_translations_edp = bdw_ddi_translations_edp;
n_edp_entries = ARRAY_SIZE(bdw_ddi_translations_edp);
} else {
--
2.7.0
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-04-28 1:57 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-28 1:57 Stephen Rothwell [this message]
2016-04-28 8:11 ` linux-next: build failure after merge of the drm tree Jani Nikula
2016-07-15 3:40 Stephen Rothwell
2016-07-15 4:32 ` Sedat Dilek
2017-03-20 0:51 Stephen Rothwell
2017-03-20 8:03 ` Daniel Vetter
2017-03-20 8:05 ` Daniel Vetter
2018-01-02 1:48 Stephen Rothwell
2018-03-13 5:46 Stephen Rothwell
2018-05-16 6:53 Stephen Rothwell
2018-05-16 8:09 ` Oded Gabbay
2018-05-17 5:00 ` Dave Airlie
2019-04-26 2:17 Stephen Rothwell
2019-07-08 4:48 Stephen Rothwell
2019-10-10 0:22 Stephen Rothwell
2019-11-05 2:54 Stephen Rothwell
2019-11-05 2:54 ` Stephen Rothwell
2020-05-08 4:29 Stephen Rothwell
2020-09-28 3:54 Stephen Rothwell
[not found] ` <20200928060427.GA15041@lst.de>
2020-09-28 6:08 ` Dave Airlie
2020-09-28 10:15 ` Paul Cercueil
[not found] ` <20200928113415.GA555@lst.de>
2020-09-28 11:46 ` Paul Cercueil
[not found] ` <20200928121002.GA3219@lst.de>
2020-09-28 13:31 ` Paul Cercueil
[not found] ` <20200930090252.GA9357@lst.de>
2020-09-30 13:33 ` Paul Cercueil
[not found] ` <20200930161124.GA6859@lst.de>
2020-09-30 16:39 ` Paul Cercueil
[not found] ` <20200930164023.GA8645@lst.de>
2020-09-30 16:45 ` Paul Cercueil
2020-12-09 1:53 Stephen Rothwell
2021-01-08 0:55 Stephen Rothwell
2021-01-08 1:25 ` Stephen Rothwell
2021-01-10 23:56 ` Stephen Rothwell
2021-01-18 0:59 ` Stephen Rothwell
2021-01-18 1:06 ` Dave Airlie
2021-01-20 12:12 ` Daniel Vetter
2021-01-20 20:44 ` Stephen Rothwell
2021-04-09 3:36 Stephen Rothwell
2021-08-20 2:33 Stephen Rothwell
2021-08-20 6:23 ` Masahiro Yamada
2021-09-01 21:50 ` Stephen Rothwell
2021-09-05 22:49 ` Stephen Rothwell
2021-09-06 7:34 ` Daniel Vetter
2021-09-08 3:13 ` Masahiro Yamada
2021-09-08 9:07 ` Daniel Vetter
2022-02-25 16:42 broonie
2022-02-28 3:46 ` Stephen Rothwell
2022-02-28 6:44 ` Hsin-Yi Wang
2022-02-28 6:48 ` Dave Airlie
2022-02-28 15:33 ` Robert Foss
2022-03-01 6:58 ` Dave Airlie
[not found] <20220930105434.111407-1-broonie@kernel.org>
2022-10-04 2:20 ` Stephen Rothwell
2022-10-04 2:24 ` David Airlie
2022-10-04 3:05 ` Stephen Rothwell
2022-10-04 11:39 ` Mark Brown
2022-10-05 15:30 ` Alex Deucher
2022-10-05 16:45 ` Hamza Mahfooz
2022-10-05 22:28 ` Stephen Rothwell
2022-10-06 8:12 ` Stephen Rothwell
2022-10-06 13:56 ` Alex Deucher
2022-10-06 16:52 ` Stephen Rothwell
2022-10-06 16:25 ` Hamza Mahfooz
2023-01-19 2:12 Stephen Rothwell
2023-04-11 6:47 Stephen Rothwell
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=20160428115745.55890c80@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mika.kahola@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).