From patchwork Fri May 27 18:19:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tormod Volden X-Patchwork-Id: 825182 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 p4RIJEEN028506 for ; Fri, 27 May 2011 18:19:35 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D5559EF82 for ; Fri, 27 May 2011 11:19:14 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ww0-f43.google.com (mail-ww0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B86E9E7E9 for ; Fri, 27 May 2011 11:19:05 -0700 (PDT) Received: by wwb17 with SMTP id 17so1763444wwb.12 for ; Fri, 27 May 2011 11:19:04 -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=yIi2eAc/nl3us3YgO0U8OayVhicP0nSHjiKpz0HeY0M=; b=XvMhwn5Xs2CSBeittYOSQVvz0lWOouVM81IaEvfjoL+A/zKWkf4HVIG5buK4vTDgbY TX62yaY0NgcAszkvI1vbA1JJ8Pc4chrYgwtSrrwUjgv/eO+o/pCYMxwiM08+A/vjrHy0 ey8yrrtXNspkdukmpzbalxKaXGEBYnDMk/KII= 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=ucJDA6riRaYhjqqMp82xnPMWccACaWBUalxb0k7ltla/faNfN4tNpr1F3T8RuzsQyJ 862kT1+B37Gs683NyGZiJNEniPTRor2HzMy/usOThg1bGfVUZC0Gks+IksAE+WXAvERY z5wFqu54xmCGfT1L+R6xq8eKEyPCzv97lU4+Q= Received: by 10.216.59.83 with SMTP id r61mr2354737wec.5.1306520344621; Fri, 27 May 2011 11:19:04 -0700 (PDT) Received: from localhost.localdomain (80-219-113-251.dclient.hispeed.ch [80.219.113.251]) by mx.google.com with ESMTPS id z22sm1123948weq.26.2011.05.27.11.19.03 (version=SSLv3 cipher=OTHER); Fri, 27 May 2011 11:19:03 -0700 (PDT) From: Tormod Volden To: dri-devel@lists.freedesktop.org Subject: [PATCH resend] drm/savage: Do not add framebuffer and aperture maps Date: Fri, 27 May 2011 20:19:02 +0200 Message-Id: <1306520342-2145-1-git-send-email-lists.tormod@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1306092479-3164-1-git-send-email-lists.tormod@gmail.com> References: <1306092479-3164-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]); Fri, 27 May 2011 18:19:35 +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 --- The drm driver is not required to set up fb maps, right? For instance radeon does, but its comment says "Create mappings for registers and framebuffer so userland doesn't necessarily have to find them." 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;