From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: Re: [PATCH] drm/vmwgfx: fix warning if config intel iommu is off. Date: Tue, 03 Dec 2013 21:04:09 +0100 Message-ID: <529E3939.1060009@shipmail.org> References: <1383891210-8270-1-git-send-email-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.bahnhof.se (mx2.bahnhof.se [213.80.101.12]) by gabe.freedesktop.org (Postfix) with ESMTP id 8711EFB6CD for ; Tue, 3 Dec 2013 12:27:13 -0800 (PST) In-Reply-To: <1383891210-8270-1-git-send-email-airlied@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: Dave Airlie Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Hi, Dave, I'm sorry I missed this one. (but the warning is shut up with another patch). I agree this code is ugly, (and has become even uglier). I'll put on my todo list to find a way to do this more cleanly... /Thomas On 11/08/2013 07:13 AM, Dave Airlie wrote: > From: Dave Airlie > > Though I'm not really happy with how ugly this code is now. > > Signed-off-by: Dave Airlie > --- > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > index 0b5c781..ba1f8f1 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > @@ -482,7 +482,9 @@ static int vmw_dma_select_mode(struct vmw_private *dev_priv) > dev_priv->map_mode = vmw_dma_map_populate; > #endif > > +#ifdef CONFIG_INTEL_IOMMU > out_fixup: > +#endif > if (dev_priv->map_mode == vmw_dma_map_populate && > vmw_restrict_iommu) > dev_priv->map_mode = vmw_dma_map_bind;