mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jay Estabrook <jay.estabrook@gmail.com>
To: linux-alpha <linux-alpha@vger.kernel.org>,
	linux-kernel <linux-kernel@vger.kernel.org>,
	dri-devel <dri-devel@lists.freedesktop.org>
Cc: Richard Henderson <rth@twiddle.net>,
	Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
	Matt Turner <mattst88@gmail.com>,
	Jay Estabrook <jay.estabrook@gmail.com>,
	airlied@linux.ie
Subject: [PATCH 1/3] alpha, drm: Cleanup Alpha support in DRM generic code
Date: Thu, 9 Jun 2011 18:18:39 -0400	[thread overview]
Message-ID: <20110609181839.7ca8838a.jay.estabrook_gmail.com@gmail.com> (raw)


Remove an obsolete Alpha adjustment, and modify another,
to go with the current Alpha architecture support.

Signed-off-by: Jay Estabrook <jay.estabrook@gmail.com>
---
 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

---

                 reply	other threads:[~2011-06-09 22:48 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110609181839.7ca8838a.jay.estabrook_gmail.com@gmail.com \
    --to=jay.estabrook@gmail.com \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=ink@jurassic.park.msu.ru \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mattst88@gmail.com \
    --cc=rth@twiddle.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome