Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932918AbaLBDxH (ORCPT ); Mon, 1 Dec 2014 22:53:07 -0500 Received: from mail-lb0-f171.google.com ([209.85.217.171]:50135 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932850AbaLBDxE (ORCPT ); Mon, 1 Dec 2014 22:53:04 -0500 MIME-Version: 1.0 In-Reply-To: <5476CC59.6080607@rock-chips.com> References: <1416447994-9921-1-git-send-email-mark.yao@rock-chips.com> <5476CC59.6080607@rock-chips.com> Date: Tue, 2 Dec 2014 13:53:01 +1000 Message-ID: Subject: Re: [GIT PULL] core drm support for Rockchip SoCs v14 From: Dave Airlie To: Mark yao Cc: =?UTF-8?Q?Heiko_St=C3=BCbner?= , Boris BREZILLON , Rob Clark , Daniel Vetter , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Randy Dunlap , Grant Likely , Greg Kroah-Hartman , John Stultz , Rom Lemarchand , "devicetree@vger.kernel.org" , linux-doc@vger.kernel.org, LKML , dri-devel , linux-api@vger.kernel.org, linux-rockchip@lists.infradead.org, Douglas Anderson , =?UTF-8?Q?St=C3=A9phane_Marchesin?= , dbehr@chromium.org, Olof Johansson , Daniel Kurtz , Eddie Cai , simon xue , Tao Huang , Kever Yang , yxj@rock-chips.com, xw@rock-chips.com Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 27 November 2014 at 17:01, Mark yao wrote: > Hi Dave > > this pull request is for rockchip drm v14, based on Joerg's iommu > arm/rockchip branch. > > The following changes since commit 656d7077d8ffd1c2492d4a0a354367ab2e545059: > > dt-bindings: iommu: Add documentation for rockchip iommu (2014-11-03 > 17:29:09 +0100) > > are available in the git repository at: > > https://github.com/markyzq/kernel-drm-rockchip.git drm_iommu > > for you to fetch changes up to aab18af3a93353bc43897b716fd7e12d5998b9bc: > > dt-bindings: video: Add documentation for rockchip vop (2014-11-27 For list prosperity, now that I can build this, I find it can't build as a module LD [M] drivers/gpu/drm/rockchip/rockchipdrm.o drivers/gpu/drm/rockchip/rockchip_drm_vop.o: In function `init_module': rockchip_drm_vop.c:(.init.text+0x0): multiple definition of `init_module' drivers/gpu/drm/rockchip/rockchip_drm_drv.o:rockchip_drm_drv.c:(.init.text+0x0): first defined here drivers/gpu/drm/rockchip/rockchip_drm_vop.o: In function `cleanup_module': rockchip_drm_vop.c:(.exit.text+0x0): multiple definition of `cleanup_module' drivers/gpu/drm/rockchip/rockchip_drm_drv.o:rockchip_drm_drv.c:(.exit.text+0x0): first defined here not sure what your plan for the vop.c variant should be, is it an extra module, or just part of rockchipdrm? Dave. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/