From patchwork Tue Aug 25 13:45:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7071281 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A76389F358 for ; Tue, 25 Aug 2015 13:45:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC9E32086B for ; Tue, 25 Aug 2015 13:45:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7F3332086F for ; Tue, 25 Aug 2015 13:45:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CEAFC6E5D8; Tue, 25 Aug 2015 06:45:24 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id E8F396E5D8 for ; Tue, 25 Aug 2015 06:45:22 -0700 (PDT) Received: by wijp15 with SMTP id p15so16505316wij.0 for ; Tue, 25 Aug 2015 06:45:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=czkxU2u9jIdp3ZI+myBCbMErAEwAFg4cq3XEPg789VE=; b=ReNx7jTqEFLlXREYE3WpsDAWkJSZZcDFwdPdI8VuRnbf/vI9tvueLKUbZMMUQofXQd ZbYWgQa2PmBOUxUTzSn4Rd+oJfMXEIBywuO5jhO26MK3j/I3/4QwDVnv6TOLMsBQawlj ELMpVZ4dYGKGXBfmWFTeo5itzeLUEwbYMsRxE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=czkxU2u9jIdp3ZI+myBCbMErAEwAFg4cq3XEPg789VE=; b=FodtbHWSrMPwC4EzYoJEMa8Nh+V3Yh5gZ2TbPsA9hVj6HgLP07/QQM9+BD6gBWKFKX I5Jaao8VPm2pii7+ZlE3pI1PkLGiFG/Fl76M9UkcCopXHfSAQfWsju7wXFstVj9IKVmX TzwSNLKU/Fea3OQMvSyhRPnccH5b1VYnKBF5xN50aw56lWnEeHbKQiFcbMt4F3J1tv3L ZZXNZ6xBLe6viAJRhs7uKLxtunKu6Yjk8HbOT+Nu9ZpOGmLAjUxjL5j9fsEtrZ4FZjJ5 lzi6EV+8xtm4CwfLM7sACteonHoghHk7Fk+s81PddsurNNB+3NPTzEy5jOMifkT8BCyB ymTg== X-Gm-Message-State: ALoCoQl6Ku0/1WQfSme07e4a0Ox/xcrfx1QwAAyiYdJV1cvAkGnkw4BVPIRzvsJcJdjqR1rMVtHl X-Received: by 10.180.103.69 with SMTP id fu5mr4729520wib.95.1440510321667; Tue, 25 Aug 2015 06:45:21 -0700 (PDT) Received: from biers.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id bi6sm28221946wjc.25.2015.08.25.06.45.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Aug 2015 06:45:20 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/4] drm: Make drm_fb_unregister/remove accept NULL fb Date: Tue, 25 Aug 2015 15:45:11 +0200 Message-Id: <1440510314-8633-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.3.1 Cc: Daniel Vetter , Intel Graphics Development X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These functions are used by drivers to release fbdev emulation buffers. We need to make them resilient to NULL pointers to make the fbdev compile/runtime knobs not cause Oopses on module unload. Cc: Archit Taneja Signed-off-by: Daniel Vetter Reviewed-by: Rob Clark --- drivers/gpu/drm/drm_crtc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 33d877c65ced..884690c81094 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -538,7 +538,12 @@ EXPORT_SYMBOL(drm_framebuffer_reference); */ void drm_framebuffer_unregister_private(struct drm_framebuffer *fb) { - struct drm_device *dev = fb->dev; + struct drm_device *dev; + + if (!fb) + return; + + dev = fb->dev; mutex_lock(&dev->mode_config.fb_lock); /* Mark fb as reaped and drop idr ref. */ @@ -589,12 +594,17 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup); */ void drm_framebuffer_remove(struct drm_framebuffer *fb) { - struct drm_device *dev = fb->dev; + struct drm_device *dev; struct drm_crtc *crtc; struct drm_plane *plane; struct drm_mode_set set; int ret; + if (!fb) + return; + + dev = fb->dev; + WARN_ON(!list_empty(&fb->filp_head)); /*