From patchwork Sun May 22 19:27:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tormod Volden X-Patchwork-Id: 807012 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4MJSCBe028846 for ; Sun, 22 May 2011 19:28:33 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 03BC79EC6D for ; Sun, 22 May 2011 12:28:12 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wy0-f177.google.com (mail-wy0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id F40789E771 for ; Sun, 22 May 2011 12:28:02 -0700 (PDT) Received: by wyb28 with SMTP id 28so4769590wyb.36 for ; Sun, 22 May 2011 12:28:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=uUZo1X5aoLl9SmnN7o64RwFNTzWu5f7KTRfamiiw168=; b=XWgX/eSJ2+ia46cBS45Xkk71eVZ5Qk0z9zEhxbPbrKrY6hFOwrlMT9WU5SlytPGtmr dTEBCpiLDw+QaQ6hfGhNr05fD6LoIT4kRp+YrCyev8hm+2/ZnDCxqIElC0bpB2A8f/Ks viFMU1mqmaoAjZr5eiXH22q0Js26gsX2O6O0w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=oPEuyPD2IlzYzaAWzVMuhc2+rsRFJyc+YQ7ad+O5xmHHkTstE1YO/g0pQAR3cHlPZP a9gGFUivh/F/+r21rXlJqwplFg5pnLqOjdORQFGEpGZrNDJG3cXFhmJqLVLrlPhLvlV7 zql9Ar3hWIsfttW4TkfkNQLs+BAc1UM/jpWO4= Received: by 10.227.110.147 with SMTP id n19mr1480306wbp.51.1306092481753; Sun, 22 May 2011 12:28:01 -0700 (PDT) Received: from localhost.localdomain (80-219-113-251.dclient.hispeed.ch [80.219.113.251]) by mx.google.com with ESMTPS id z13sm3624610wbd.63.2011.05.22.12.28.00 (version=SSLv3 cipher=OTHER); Sun, 22 May 2011 12:28:00 -0700 (PDT) From: Tormod Volden To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/savage: Do not add framebuffer and aperture maps Date: Sun, 22 May 2011 21:27:59 +0200 Message-Id: <1306092479-3164-1-git-send-email-lists.tormod@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1304459689-7687-1-git-send-email-lists.tormod@gmail.com> References: <1304459689-7687-1-git-send-email-lists.tormod@gmail.com> Cc: Dave Airlie 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: , MIME-Version: 1.0 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]); Sun, 22 May 2011 19:28:33 +0000 (UTC) From: Tormod Volden Since multiple framebuffer maps are not supported any longer (commit 41c2e75e60200a860a74b7c84a6375c105e7437f) these maps would be broken, and they are not used by the drm anyway. Leave it to userspace to create one working map instead. Signed-off-by: Tormod Volden --- > And if we are absolutely sure that we do not want to support multiple > framebuffers maps, I would instead suggest this change to the savage > driver, which at least allows userspace to work around it. I think there is not much interest for supporting multiple framebuffer maps at the moment, so I would suggest pushing this patch, hopefully into 2.6.40, so there is a chance of reworking the savage userspace (DDX and mesa) to deal with it instead. Regards, Tormod drivers/gpu/drm/savage/savage_bci.c | 13 +------------ drivers/gpu/drm/savage/savage_drv.h | 2 -- 2 files changed, 1 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c index bf5f83e..91fe7b4 100644 --- a/drivers/gpu/drm/savage/savage_bci.c +++ b/drivers/gpu/drm/savage/savage_bci.c @@ -639,18 +639,7 @@ int savage_driver_firstopen(struct drm_device *dev) if (ret) return ret; - ret = drm_addmap(dev, fb_base, fb_size, _DRM_FRAME_BUFFER, - _DRM_WRITE_COMBINING, &dev_priv->fb); - if (ret) - return ret; - - ret = drm_addmap(dev, aperture_base, SAVAGE_APERTURE_SIZE, - _DRM_FRAME_BUFFER, _DRM_WRITE_COMBINING, - &dev_priv->aperture); - if (ret) - return ret; - - return ret; + return 0; } /* diff --git a/drivers/gpu/drm/savage/savage_drv.h b/drivers/gpu/drm/savage/savage_drv.h index df2aac6..2b49b3e 100644 --- a/drivers/gpu/drm/savage/savage_drv.h +++ b/drivers/gpu/drm/savage/savage_drv.h @@ -153,8 +153,6 @@ typedef struct drm_savage_private { /* memory regions in physical memory */ drm_local_map_t *sarea; drm_local_map_t *mmio; - drm_local_map_t *fb; - drm_local_map_t *aperture; drm_local_map_t *status; drm_local_map_t *agp_textures; drm_local_map_t *cmd_dma;