From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756350AbcAYKyO (ORCPT ); Mon, 25 Jan 2016 05:54:14 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:59161 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752521AbcAYKyL convert rfc822-to-8bit (ORCPT ); Mon, 25 Jan 2016 05:54:11 -0500 Message-ID: <1453719247.30130.22.camel@collabora.co.uk> Subject: Re: [PATCH 1/2] drm/rockchip: Don't build rockchip_drm_vop as modules From: Sjoerd Simons To: Mark Yao , David Airlie , Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Date: Mon, 25 Jan 2016 11:54:07 +0100 In-Reply-To: <1452673328-29188-2-git-send-email-mark.yao@rock-chips.com> References: <1452673328-29188-1-git-send-email-mark.yao@rock-chips.com> <1452673328-29188-2-git-send-email-mark.yao@rock-chips.com> Organization: Collabora Ltd. Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT X-Mailer: Evolution 3.18.3-1 Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2016-01-13 at 16:22 +0800, Mark Yao wrote: > rockchip_drm_vop's module init had moved to rockchip_vop_reg.c > so no need to build rockchip_drm_vop.ko Looks like this didn't make it for the Linux 4.5 merge window, which unfortunately means in 4.5-rc1 DRM on rockchip is broken :/ > Signed-off-by: Mark Yao > --- >  drivers/gpu/drm/rockchip/Makefile |    5 ++--- >  1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/Makefile > b/drivers/gpu/drm/rockchip/Makefile > index a9d380f..9e6e992 100644 > --- a/drivers/gpu/drm/rockchip/Makefile > +++ b/drivers/gpu/drm/rockchip/Makefile > @@ -3,9 +3,8 @@ >  # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. >   >  rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o > rockchip_drm_fbdev.o \ > - rockchip_drm_gem.o > + rockchip_drm_gem.o rockchip_drm_vop.o >   >  obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o >   > -obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_drm_vop.o \ > - rockchip_vop_reg.o > +obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_vop_reg.o -- Sjoerd Simons Collabora Ltd.