From patchwork Thu Jun 9 22:19:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jay Estabrook X-Patchwork-Id: 867512 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p59N4oVc004019 for ; Thu, 9 Jun 2011 23:05:11 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 707E4A0901 for ; Thu, 9 Jun 2011 16:04:50 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vw0-f49.google.com (mail-vw0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 71AB79E744 for ; Thu, 9 Jun 2011 15:48:27 -0700 (PDT) Received: by mail-vw0-f49.google.com with SMTP id 8so2128403vws.36 for ; Thu, 09 Jun 2011 15:48:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:x-mailer :mime-version:content-type:content-transfer-encoding; bh=NSRfpNoDRbPfKWC5nkt4Mr5hCJHoMp/uUhbglZ2lp6M=; b=iCcqxlesj/olFGbrW4eolH3uB+vFsZT9I7lo0p+IdgViskdcD6lpaJvdmFFDVeq+am BbtFGqp2EZ1+YDa519OgyPimScfNTDylJeK6bpGv+PrjwP6X7I+Kvpi8Gi5lV5x7+mJF /cF8WQZu6kiIh+NQr2l9HVlA8COdEP7rtXA38= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; b=k/YEsaMhQo/vuTLNiBY4a3DLhwAGKh6kkzAiGOUXmMZ+82ru5vKQGHyuk06I2K0Uun 5kp/L0GgSMIKh90lX6Wky+QSuXFws53l2B+YyiOHLioGM9K5ZQwwpijqA7sKwyjNgPL9 3GNUCtgiDZarugSnkwlcsSoXz+MyVJ8VuPEQ8= Received: by 10.52.181.193 with SMTP id dy1mr1844803vdc.73.1307659707249; Thu, 09 Jun 2011 15:48:27 -0700 (PDT) Received: from localhost (pool-98-110-153-132.bstnma.fios.verizon.net [98.110.153.132]) by mx.google.com with ESMTPS id bl1sm1352627vbb.5.2011.06.09.15.48.25 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Jun 2011 15:48:26 -0700 (PDT) Date: Thu, 9 Jun 2011 18:19:12 -0400 From: Jay Estabrook To: linux-alpha , linux-kernel , dri-devel Subject: [PATCH 2/3] alpha, drm: Remove obsolete Alpha support in MGA DRM code Message-ID: <20110609181912.2dfad4fe.jay.estabrook_gmail.com@gmail.com> X-Mailer: Claws Mail 3.7.8 (GTK+ 2.22.1; alpha-unknown-linux-gnu) Mime-Version: 1.0 X-Mailman-Approved-At: Thu, 09 Jun 2011 16:02:54 -0700 Cc: Jay Estabrook , Ivan Kokshaysky , Richard Henderson X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 09 Jun 2011 23:05:11 +0000 (UTC) Remove an obsolete Alpha adjustment in the drm for MGA on Alpha. Signed-off-by: Jay Estabrook --- drivers/gpu/drm/mga/mga_drv.h | 19 ------------------- 1 file changed, 19 deletions(-) --- diff -Naurp a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h --- a/drivers/gpu/drm/mga/mga_drv.h 2011-04-26 23:48:50.000000000 -0400 +++ b/drivers/gpu/drm/mga/mga_drv.h 2011-05-02 11:51:48.000000000 -0400 @@ -195,29 +195,10 @@ extern long mga_compat_ioctl(struct file #define mga_flush_write_combine() DRM_WRITEMEMORYBARRIER() -#if defined(__linux__) && defined(__alpha__) -#define MGA_BASE(reg) ((unsigned long)(dev_priv->mmio->handle)) -#define MGA_ADDR(reg) (MGA_BASE(reg) + reg) - -#define MGA_DEREF(reg) (*(volatile u32 *)MGA_ADDR(reg)) -#define MGA_DEREF8(reg) (*(volatile u8 *)MGA_ADDR(reg)) - -#define MGA_READ(reg) (_MGA_READ((u32 *)MGA_ADDR(reg))) -#define MGA_READ8(reg) (_MGA_READ((u8 *)MGA_ADDR(reg))) -#define MGA_WRITE(reg, val) do { DRM_WRITEMEMORYBARRIER(); MGA_DEREF(reg) = val; } while (0) -#define MGA_WRITE8(reg, val) do { DRM_WRITEMEMORYBARRIER(); MGA_DEREF8(reg) = val; } while (0) - -static inline u32 _MGA_READ(u32 *addr) -{ - DRM_MEMORYBARRIER(); - return *(volatile u32 *)addr; -} -#else #define MGA_READ8(reg) DRM_READ8(dev_priv->mmio, (reg)) #define MGA_READ(reg) DRM_READ32(dev_priv->mmio, (reg)) #define MGA_WRITE8(reg, val) DRM_WRITE8(dev_priv->mmio, (reg), (val)) #define MGA_WRITE(reg, val) DRM_WRITE32(dev_priv->mmio, (reg), (val)) -#endif #define DWGREG0 0x1c00 #define DWGREG0_END 0x1dff