From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: Re: [PATCH 6/7] radeon: kill r100_io_(r|w)reg Date: Mon, 29 Nov 2010 10:40:30 -0500 Message-ID: References: <1290967575-22705-1-git-send-email-daniel.vetter@ffwll.ch> <1290967575-22705-7-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-fx0-f49.google.com (mail-fx0-f49.google.com [209.85.161.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 8DF1E9E8A8 for ; Mon, 29 Nov 2010 07:40:32 -0800 (PST) Received: by fxm19 with SMTP id 19so101220fxm.36 for ; Mon, 29 Nov 2010 07:40:31 -0800 (PST) In-Reply-To: <1290967575-22705-7-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Daniel Vetter Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Sun, Nov 28, 2010 at 1:06 PM, Daniel Vetter wro= te: > Used in a macro with only a single call-site for each. > IHMO that's a bit too much indirection. Fold them in. > I'd rather keep them separate in case we need to use them directly in some other cases. Plus it's more consistent with the other register access routines. Alex > Signed-off-by: Daniel Vetter > --- > =A0drivers/gpu/drm/radeon/radeon.h =A0 =A0 =A0 =A0| =A0 22 --------------= -------- > =A0drivers/gpu/drm/radeon/radeon_device.c | =A0 16 ++++++++++++---- > =A02 files changed, 12 insertions(+), 26 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/rad= eon.h > index 942f5f2..7afb08e 100644 > --- a/drivers/gpu/drm/radeon/radeon.h > +++ b/drivers/gpu/drm/radeon/radeon.h > @@ -1202,26 +1202,6 @@ static inline void r100_mm_wreg(struct radeon_devi= ce *rdev, uint32_t reg, uint32 > =A0 =A0 =A0 =A0} > =A0} > > -static inline u32 r100_io_rreg(struct radeon_device *rdev, u32 reg) > -{ > - =A0 =A0 =A0 if (reg < rdev->rio_mem_size) > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 return ioread32(rdev->rio_mem + reg); > - =A0 =A0 =A0 else { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 iowrite32(reg, rdev->rio_mem + RADEON_MM_IN= DEX); > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 return ioread32(rdev->rio_mem + RADEON_MM_D= ATA); > - =A0 =A0 =A0 } > -} > - > -static inline void r100_io_wreg(struct radeon_device *rdev, u32 reg, u32= v) > -{ > - =A0 =A0 =A0 if (reg < rdev->rio_mem_size) > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 iowrite32(v, rdev->rio_mem + reg); > - =A0 =A0 =A0 else { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 iowrite32(reg, rdev->rio_mem + RADEON_MM_IN= DEX); > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 iowrite32(v, rdev->rio_mem + RADEON_MM_DATA= ); > - =A0 =A0 =A0 } > -} > - > =A0/* > =A0* Cast helper > =A0*/ > @@ -1260,8 +1240,6 @@ static inline void r100_io_wreg(struct radeon_devic= e *rdev, u32 reg, u32 v) > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0WREG32_PLL(reg, tmp_); =A0 =A0 =A0 =A0 =A0= =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0\ > =A0 =A0 =A0 =A0} while (0) > =A0#define DREG32_SYS(sqf, rdev, reg) seq_printf((sqf), #reg " : 0x%08X\n= ", r100_mm_rreg((rdev), (reg))) > -#define RREG32_IO(reg) r100_io_rreg(rdev, (reg)) > -#define WREG32_IO(reg, v) r100_io_wreg(rdev, (reg), (v)) > > =A0/* > =A0* Indirect registers accessor > diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/rad= eon/radeon_device.c > index 1f752ef..14c935c 100644 > --- a/drivers/gpu/drm/radeon/radeon_device.c > +++ b/drivers/gpu/drm/radeon/radeon_device.c > @@ -496,16 +496,24 @@ static void cail_ioreg_write(struct card_info *info= , uint32_t reg, uint32_t val) > =A0{ > =A0 =A0 =A0 =A0struct radeon_device *rdev =3D info->dev->dev_private; > > - =A0 =A0 =A0 WREG32_IO(reg*4, val); > + =A0 =A0 =A0 if (reg < rdev->rio_mem_size) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 iowrite32(val, rdev->rio_mem + reg); > + =A0 =A0 =A0 else { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 iowrite32(reg, rdev->rio_mem + RADEON_MM_IN= DEX); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 iowrite32(val, rdev->rio_mem + RADEON_MM_DA= TA); > + =A0 =A0 =A0 } > =A0} > > =A0static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg) > =A0{ > =A0 =A0 =A0 =A0struct radeon_device *rdev =3D info->dev->dev_private; > - =A0 =A0 =A0 uint32_t r; > > - =A0 =A0 =A0 r =3D RREG32_IO(reg*4); > - =A0 =A0 =A0 return r; > + =A0 =A0 =A0 if (reg < rdev->rio_mem_size) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return ioread32(rdev->rio_mem + reg); > + =A0 =A0 =A0 else { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 iowrite32(reg, rdev->rio_mem + RADEON_MM_IN= DEX); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return ioread32(rdev->rio_mem + RADEON_MM_D= ATA); > + =A0 =A0 =A0 } > =A0} > > =A0int radeon_atombios_init(struct radeon_device *rdev) > -- > 1.7.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >