From patchwork Tue May 3 21:54:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tormod Volden X-Patchwork-Id: 751812 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 p43Lt7AW019994 for ; Tue, 3 May 2011 21:55:27 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B358F9E747 for ; Tue, 3 May 2011 14:55:06 -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 00FD99E747 for ; Tue, 3 May 2011 14:54:54 -0700 (PDT) Received: by wwb17 with SMTP id 17so495027wwb.12 for ; Tue, 03 May 2011 14:54:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=F2oDuRCM9IcJav0/GSFjCAxCqmiR8NYEzQOhEVNfEfQ=; b=wtL94pdEkcpZ5ZN0UABlOKKDTK2EK9W5pbwUYiAgyMH9909wFPt/Fw2Ik5sLfZI16A eIy/DckL7/kLcMeR/Fa8MjdMM77o2+OK7y1qe3wFrXMN/ZET1KUQQae/SScxfmITf51l TU4Mb51nnSRN033QPGUFYnMPXLn0ZqdfelJuk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; b=jbz2xSqD1OJeWO7/UhgP5yyVEDLCTJoVDEKZIlpPSdeYGMjMl/zJoIizA3q0zf2dCg bTOv8wGq7MEGkUN8H05hcO8luCkVLOYHRIAWvF6DBZMECBEq1m8a1MUKcXhdoPUho1De 5FJ128nucF8iE1ZkZcT/Hz2bl38u18Gt2zCAc= Received: by 10.216.254.37 with SMTP id g37mr354508wes.36.1304459694112; Tue, 03 May 2011 14:54:54 -0700 (PDT) Received: from localhost.localdomain (80-219-113-251.dclient.hispeed.ch [80.219.113.251]) by mx.google.com with ESMTPS id g58sm226202wen.20.2011.05.03.14.54.50 (version=SSLv3 cipher=OTHER); Tue, 03 May 2011 14:54:51 -0700 (PDT) From: Tormod Volden To: dri-devel@lists.freedesktop.org Subject: Re: multiple framebuffer drm maps Date: Tue, 3 May 2011 23:54:49 +0200 Message-Id: <1304459689-7687-1-git-send-email-lists.tormod@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1304457607-3783-1-git-send-email-lists.tormod@gmail.com> References: <1304457607-3783-1-git-send-email-lists.tormod@gmail.com> 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]); Tue, 03 May 2011 21:55:27 +0000 (UTC) From: Tormod Volden Subject: [PATCH] drm/savage: Do not add framebuffer and aperture maps 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. 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;