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 dvlasenk@redhat.com CC: Stefan Huehner stefan@huehner.org CC: Ben Skeggs bskeggs@redhat.com CC: David Airlie airlied@linux.ie 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 <core/device.h> #include <core/option.h>

+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) {