From patchwork Thu Jun 9 22:18:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jay Estabrook X-Patchwork-Id: 867472 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p59N4Efv030990 for ; Thu, 9 Jun 2011 23:04:34 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 982089E732 for ; Thu, 9 Jun 2011 16:04:14 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vx0-f177.google.com (mail-vx0-f177.google.com [209.85.220.177]) by gabe.freedesktop.org (Postfix) with ESMTP id E5E7C9E732 for ; Thu, 9 Jun 2011 15:48:25 -0700 (PDT) Received: by mail-vx0-f177.google.com with SMTP id 2so2121174vxd.36 for ; Thu, 09 Jun 2011 15:48:25 -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=wvKG8rF1SE+deIXNG6LTAp4N0BdHChdfnRVExLJP8S4=; b=IQIH+r/ah8MDF3IizqSA6r3wu2vnWF2jG3/Wy7DizFHNnMjDzQl61Nv7yGcfT9beVH wsOrEX6kA5TdqFG2YPJVIRQo0Us7ZiaQL3SZNgSevsGSrnSA3VvmdHF9kfk/nTFp8ipt NL11IRu/eTcfgDJ92Y5x4V+dyblRv+xXgakvk= 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=CW3HOzKjn/hlERQqQI8QCHwsl29/4lWmuMjwtXgJKknslufzCmUaYeBduT0rs3WQeA ze4V3h8u1DehyciSKfhcQcX9wzx+pghk7kPK7/4zNH671jei5AVK6XRyhcNx2/PlNoVe k60ahveoWo4pF1eQeLOjuIwcDRoCZgFAd959M= Received: by 10.52.74.234 with SMTP id x10mr219210vdv.18.1307659705693; Thu, 09 Jun 2011 15:48:25 -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.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Jun 2011 15:48:25 -0700 (PDT) Date: Thu, 9 Jun 2011 18:18:39 -0400 From: Jay Estabrook To: linux-alpha , linux-kernel , dri-devel Subject: [PATCH 1/3] alpha, drm: Cleanup Alpha support in DRM generic code Message-ID: <20110609181839.7ca8838a.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 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Jun 2011 23:04:34 +0000 (UTC) Remove an obsolete Alpha adjustment, and modify another, to go with the current Alpha architecture support. Signed-off-by: Jay Estabrook --- drivers/gpu/drm/drm_bufs.c | 3 --- drivers/gpu/drm/drm_vm.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) --- diff -Naurp a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c --- a/drivers/gpu/drm/drm_bufs.c 2011-04-26 23:48:50.000000000 -0400 +++ b/drivers/gpu/drm/drm_bufs.c 2011-05-02 11:51:48.000000000 -0400 @@ -183,9 +183,6 @@ static int drm_addmap_core(struct drm_de return -EINVAL; } #endif -#ifdef __alpha__ - map->offset += dev->hose->mem_space->start; -#endif /* Some drivers preinitialize some maps, without the X Server * needing to be aware of it. Therefore, we just return success * when the server tries to create a duplicate map. diff -Naurp a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c --- a/drivers/gpu/drm/drm_vm.c 2011-04-26 23:48:50.000000000 -0400 +++ b/drivers/gpu/drm/drm_vm.c 2011-05-02 11:51:48.000000000 -0400 @@ -526,7 +526,7 @@ static int drm_mmap_dma(struct file *fil static resource_size_t drm_core_get_reg_ofs(struct drm_device *dev) { #ifdef __alpha__ - return dev->hose->dense_mem_base - dev->hose->mem_space->start; + return dev->hose->dense_mem_base; #else return 0; #endif