Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751640AbbEFO2f (ORCPT ); Wed, 6 May 2015 10:28:35 -0400 Received: from mail-yk0-f174.google.com ([209.85.160.174]:35504 "EHLO mail-yk0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750808AbbEFO2a (ORCPT ); Wed, 6 May 2015 10:28:30 -0400 MIME-Version: 1.0 In-Reply-To: <1430918732-15895-1-git-send-email-sviau@codeaurora.org> References: <1430918732-15895-1-git-send-email-sviau@codeaurora.org> Date: Wed, 6 May 2015 10:28:29 -0400 Message-ID: Subject: Re: [PATCH] drm/msm: Fix compil issue when DRM_MSM_FBDEV is disabled From: Rob Clark To: Stephane Viau , Archit Taneja Cc: "dri-devel@lists.freedesktop.org" , linux-arm-msm , Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1928 Lines: 57 On Wed, May 6, 2015 at 9:25 AM, Stephane Viau wrote: > When CONFIG_DRM_MSM_FBDEV is not defined, > CONFIG_DRM_KMS_FB_HELPER does not get selected and > drm_fb_helper_*() helper functions are thus not available. > > This change fixes these link issues. Hmm, didn't Archit start on making fbdev config option global and adding nop-stubs for the case that it was disabled? I lost track of where that was going.. BR, -R > Signed-off-by: Stephane Viau > --- > drivers/gpu/drm/msm/msm_drv.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 2b1218c..35380ec 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -21,9 +21,11 @@ > > static void msm_fb_output_poll_changed(struct drm_device *dev) > { > +#ifdef DRM_MSM_FBDEV > struct msm_drm_private *priv = dev->dev_private; > if (priv->fbdev) > drm_fb_helper_hotplug_event(priv->fbdev); > +#endif > } > > static const struct drm_mode_config_funcs mode_config_funcs = { > @@ -419,9 +421,11 @@ static void msm_preclose(struct drm_device *dev, struct drm_file *file) > > static void msm_lastclose(struct drm_device *dev) > { > +#ifdef DRM_MSM_FBDEV > struct msm_drm_private *priv = dev->dev_private; > if (priv->fbdev) > drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev); > +#endif > } > > static irqreturn_t msm_irq(int irq, void *arg) > -- > Qualcomm Innovation Center, Inc. > > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project > -- 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/