On Thu, 28 Apr 2016, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 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@xxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxx>
FWIW,
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> 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
--
Jani Nikula, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
