Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753205AbbEHMOZ (ORCPT ); Fri, 8 May 2015 08:14:25 -0400 Received: from mail-qg0-f51.google.com ([209.85.192.51]:35989 "EHLO mail-qg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751378AbbEHMOX (ORCPT ); Fri, 8 May 2015 08:14:23 -0400 Message-ID: <554CA897.2000305@hurleysoftware.com> Date: Fri, 08 May 2015 08:14:15 -0400 From: Peter Hurley User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Denys Vlasenko , Ben Skeggs CC: Stefan Huehner , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/nouveau/core: deinline nv_mask() References: <1430988589-9486-1-git-send-email-dvlasenk@redhat.com> In-Reply-To: <1430988589-9486-1-git-send-email-dvlasenk@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2374 Lines: 72 On 05/07/2015 04:49 AM, Denys Vlasenko wrote: > Function compiles to 89 bytes of machine code. > 466 callsites with this .config: > http://busybox.net/~vda/kernel_config > Size reduction: Much of the cruft is related to calling iowriteX. Ben, Isn't subdev io always mmio? (iow, never to the 64k i/o space) > text data bss dec hex filename > 82432426 22255384 20627456 125315266 77828c2 vmlinux.before > 82426986 22255416 20627456 125309858 77813a2 vmlinux > > Signed-off-by: Denys Vlasenko > CC: Stefan Huehner > CC: Ben Skeggs > CC: David Airlie > CC: dri-devel@lists.freedesktop.org > CC: linux-kernel@vger.kernel.org > --- > drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h | 9 ++------- > drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 8 ++++++++ > 2 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h b/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h > index 6fdc391..261b7ff 100644 > --- a/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h > +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h > @@ -109,11 +109,6 @@ nv_wr32(void *obj, u32 addr, u32 data) > iowrite32_native(data, subdev->mmio + addr); > } > > -static inline u32 > -nv_mask(void *obj, u32 addr, u32 mask, u32 data) > -{ > - u32 temp = nv_rd32(obj, addr); > - nv_wr32(obj, addr, (temp & ~mask) | data); > - return temp; > -} > +u32 > +nv_mask(void *obj, u32 addr, u32 mask, u32 data); > #endif > diff --git a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c > index c5fb3a79..88331ea 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c > +++ b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c > @@ -25,6 +25,14 @@ > #include > #include > > +u32 > +nv_mask(void *obj, u32 addr, u32 mask, u32 data) > +{ > + u32 temp = nv_rd32(obj, addr); > + nv_wr32(obj, addr, (temp & ~mask) | data); > + return temp; > +} > + > struct nvkm_subdev * > nvkm_subdev(void *obj, int idx) > { > -- 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/