From patchwork Mon Oct 24 00:24:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9391275 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9CED160762 for ; Mon, 24 Oct 2016 00:25:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E77328A14 for ; Mon, 24 Oct 2016 00:25:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8347C28AD7; Mon, 24 Oct 2016 00:25:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3BF8728A14 for ; Mon, 24 Oct 2016 00:25:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D51486E1C0; Mon, 24 Oct 2016 00:25:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 943386E112; Mon, 24 Oct 2016 00:24:55 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3t2H9J62qVz9t87; Mon, 24 Oct 2016 11:24:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1477268692; bh=y6pxc6VfM6NFDZqrMx4rzePk45XfnEX7v3g6JTtGv3Q=; h=Date:From:To:Cc:Subject:From; b=dKP4uJgpaR3vj0pnJ3NoNPK1L2ezH047Z/EISoOQ2Ofeqb9o+y6L7gQkC87mikwGT rVFh26+3Eo+hMzLLmwJBWBSUJN7w/ccwE8NMUbLMV14y4zXPwbEey8HCsq10xOSILn p4NXobM5ElM1JEkqcdeg5REzmE1l0PXWeETomcIc= Date: Mon, 24 Oct 2016 11:24:52 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Subject: linux-next: build failure after merge of the drm-misc tree Message-ID: <20161024112452.7945da3f@canb.auug.org.au> MIME-Version: 1.0 Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tvrtko Ursulin X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from drivers/gpu/drm/i915/intel_drv.h:32:0, from drivers/gpu/drm/i915/intel_display.c:36: drivers/gpu/drm/i915/intel_display.c: In function 'intel_primary_plane_create': drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info' #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen) ^ drivers/gpu/drm/i915/intel_display.c:15077:6: note: in expansion of macro 'INTEL_GEN' if (INTEL_GEN(dev) >= 9) { ^ drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info' #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen) ^ drivers/gpu/drm/i915/intel_display.c:15081:13: note: in expansion of macro 'INTEL_GEN' } else if (INTEL_GEN(dev) >= 4) { ^ drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info' #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen) ^ drivers/gpu/drm/i915/intel_display.c:15088:6: note: in expansion of macro 'INTEL_GEN' if (INTEL_GEN(dev) >= 4) ^ drivers/gpu/drm/i915/intel_display.c: In function 'intel_cursor_plane_create': drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info' #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen) ^ drivers/gpu/drm/i915/intel_display.c:15231:6: note: in expansion of macro 'INTEL_GEN' if (INTEL_GEN(dev) >= 4) ^ Caused by commit 93ca7e006670 ("drm/i915: Use the per-plane rotation property") interacting with commit 55b8f2a76dff ("drm/i915: Make INTEL_GEN only take dev_priv") from the drm-intel tree. I added this merge fix patch: From 3d8024ddc9cd584e23e9ff4845a46475972c3d36 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 24 Oct 2016 11:12:05 +1100 Subject: [PATCH] drm/i915: merge fix for INTEL_GEN API change Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/intel_display.c | 9 +++++---- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c2a8df968b03..89d73ab020e7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15074,18 +15074,18 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, if (ret) goto fail; - if (INTEL_GEN(dev) >= 9) { + if (INTEL_GEN(dev_priv) >= 9) { supported_rotations = DRM_ROTATE_0 | DRM_ROTATE_90 | DRM_ROTATE_180 | DRM_ROTATE_270; - } else if (INTEL_GEN(dev) >= 4) { + } else if (INTEL_GEN(dev_priv) >= 4) { supported_rotations = DRM_ROTATE_0 | DRM_ROTATE_180; } else { supported_rotations = DRM_ROTATE_0; } - if (INTEL_GEN(dev) >= 4) + if (INTEL_GEN(dev_priv) >= 4) drm_plane_create_rotation_property(&primary->base, DRM_ROTATE_0, supported_rotations); @@ -15199,6 +15199,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev, { struct intel_plane *cursor = NULL; struct intel_plane_state *state = NULL; + struct drm_i915_private *dev_priv = to_i915(dev); int ret; cursor = kzalloc(sizeof(*cursor), GFP_KERNEL); @@ -15228,7 +15229,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev, if (ret) goto fail; - if (INTEL_GEN(dev) >= 4) + if (INTEL_GEN(dev_priv) >= 4) drm_plane_create_rotation_property(&cursor->base, DRM_ROTATE_0, DRM_ROTATE_0 | diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 9436d041389f..43d0350856e7 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1126,7 +1126,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) goto fail; } - if (INTEL_GEN(dev) >= 9) { + if (INTEL_GEN(dev_priv) >= 9) { supported_rotations = DRM_ROTATE_0 | DRM_ROTATE_90 | DRM_ROTATE_180 | DRM_ROTATE_270;