From patchwork Fri Nov 24 17:53:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 841145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="BGiGLpQE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yk3vD565pz9s7B for ; Sat, 25 Nov 2017 05:02:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753794AbdKXSCq (ORCPT ); Fri, 24 Nov 2017 13:02:46 -0500 Received: from 78-11-180-123.static.ip.netia.com.pl ([78.11.180.123]:59614 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753807AbdKXSCp (ORCPT ); Fri, 24 Nov 2017 13:02:45 -0500 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 3yk3hZ04xnz5H; Fri, 24 Nov 2017 18:53:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1511546014; bh=ZrAbLHw4ksVWFLK3mOfzMwdTFqybQwrtdv13DvRYyNo=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=BGiGLpQEOwDTcVTjo4BzTIlblBWFjZ3lGalBaz57VIHGqydH+bMNqWLq1EdtXSPYz 7zy6xh/XEtkAdMrxbe/ay/fjo7srT2yv/9Vh/Jo41yP7UqPMWoXT471Ot4TOn0ZYrn FHr9bSiglIrRG81swxybrENzzsI9fj06OfzV94rCeK9ZjM3YMn0QcGaZAKKJ8HWOi8 MulhrJFVrK0fHAQd8xrGlfB5PIrsScm1sGOOO5FbvlKipmKpGJYGAvt1PTJYJoNuoy XnNMc7btfVrQ013uVAouPkisltQAT6iP6p11xXMQhEyuLOvXNorQmgsJweDjxixRCE m4MjuG1tsAaQQ== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.99.2 at rere Date: Fri, 24 Nov 2017 18:53:33 +0100 Message-Id: <13240c59cafec988cdda37cc4d48252ff56f0d04.1511544782.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH 10/13] fbdev: allow apertures == NULL in remove_conflicting_framebuffers() MIME-Version: 1.0 To: dri-devel@lists.freedesktop.org Cc: David Airlie , Bartlomiej Zolnierkiewicz , Eric Anholt , Maxime Ripard , Chen-Yu Tsai , Thierry Reding , Jonathan Hunter , linux-tegra@vger.kernel.org Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Interpret (otherwise-invalid) NULL apertures argument to mean all-memory range. This will allow to remove several duplicates of this code from drivers in following patches. Signed-off-by: Michał Mirosław --- drivers/video/fbdev/core/fbmem.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 5ea980e5d3b7..927e016487e9 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1780,11 +1780,25 @@ int remove_conflicting_framebuffers(struct apertures_struct *a, const char *name, bool primary) { int ret; + bool do_free = false; + + if (!a) { + a = alloc_apertures(1); + if (!a) + return -ENOMEM; + + a->ranges[0].base = 0; + a->ranges[0].size = ~0; + do_free = true; + } mutex_lock(®istration_lock); ret = do_remove_conflicting_framebuffers(a, name, primary); mutex_unlock(®istration_lock); + if (do_free) + kfree(a); + return ret; } EXPORT_SYMBOL(remove_conflicting_framebuffers);