linux-next: build failure after merge of the drm tree

Path	csiph.com!usenet.pasdenom.info!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: build failure after merge of the drm tree
Date	Mon, 20 Mar 2017 02:00:02 +0100
Message-ID	<tmTPY-5kh-9@gated-at.bofh.it> (permalink)
X-Original-To	Dave Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1489971089; bh=qluLZchhm7/x3vIb7yBEib5OZhXYYSZiafd+pdC5Xzk=; h=Date:From:To:Cc:Subject:From; b=BBC5J0M2ccdEANTflKwNq6Xn85T4pPDRh7iplzofI4kTaujYDVkNpZ43jyAYvqiTi C0MRMMKH0FQdWwFIEvBY8MlWafG2SSIAqtMO+cfkzZi87SmAuXkUosjSDT9DcfGGe/ LjWrgeKBfDdATvJ/JuXQ1EGiumJlKd5XSFvVJ0gHceR4+K1IL9y1rXYGVmHYOLXn+u JlQeP5PN+/p87UquW2k6Ll+l9RmsHznnPWhHQocSIMcAS44Sz7s2Qa592uaWVRkGyn qx+lPW5IMbsjH0IhM2ft06ktW3IJeFTjoOC/qGCIAzBcCxo7FWk3iUJLoYKwTqPoLr Fw3Utto9El00g==
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	43
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wilson <chris@chris-wilson.co.uk>, Jani Nikula <jani.nikula@intel.com>
X-Original-Date	Mon, 20 Mar 2017 11:51:28 +1100
X-Original-Message-ID	<20170320115128.0bc3861b@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1604124

Show key headers only | View raw

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/i915/i915_irq.c: In function 'gen6_rps_reset_ei':
drivers/gpu/drm/i915/i915_irq.c:1115:38: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
  vlv_c0_read(dev_priv, &dev_priv->rps.down_ei);
                                      ^
drivers/gpu/drm/i915/i915_irq.c:1116:15: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei'
  dev_priv->rps.up_ei = dev_priv->rps.down_ei;
               ^
drivers/gpu/drm/i915/i915_irq.c:1116:37: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
  dev_priv->rps.up_ei = dev_priv->rps.down_ei;
                                     ^
drivers/gpu/drm/i915/i915_irq.c: In function 'vlv_wa_c0_ei':
drivers/gpu/drm/i915/i915_irq.c:1133:21: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
       &dev_priv->rps.down_ei, &now,
                     ^
drivers/gpu/drm/i915/i915_irq.c:1136:16: error: 'struct intel_gen6_power_mgmt' has no member named 'down_ei'
   dev_priv->rps.down_ei = now;
                ^
drivers/gpu/drm/i915/i915_irq.c:1141:20: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei'
      &dev_priv->rps.up_ei, &now,
                    ^
drivers/gpu/drm/i915/i915_irq.c:1144:16: error: 'struct intel_gen6_power_mgmt' has no member named 'up_ei'
   dev_priv->rps.up_ei = now;
                ^
Caused by commit

  8f68d591d476 ("drm/i915: Stop using RP_DOWN_EI on Baytrail")

from the drm-intel-fixes tree and a bad merge resolution on my part.

I reapplied that commit by hand.  It would be nice if this conflict was
resolved in the drm tree.

This cherry picking of fixes from new development back to Linus' tree
can be a real pain when so many other changes happen in the same files.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the drm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-20 02:00 +0100
  Re: linux-next: build failure after merge of the drm tree Daniel Vetter <daniel.vetter@ffwll.ch> - 2017-03-20 09:10 +0100
    Re: linux-next: build failure after merge of the drm tree Daniel Vetter <daniel.vetter@ffwll.ch> - 2017-03-20 09:10 +0100

csiph-web