From patchwork Fri Apr 11 12:12:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3968201 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D32499F38C for ; Fri, 11 Apr 2014 12:12:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A79D2080D for ; Fri, 11 Apr 2014 12:12:23 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 407EC20807 for ; Fri, 11 Apr 2014 12:12:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2608D6ED97; Fri, 11 Apr 2014 05:12:20 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com [74.125.83.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E7976E390 for ; Fri, 11 Apr 2014 05:12:19 -0700 (PDT) Received: by mail-ee0-f41.google.com with SMTP id t10so4117057eei.0 for ; Fri, 11 Apr 2014 05:12:16 -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=edgteboUC7opDd1bYqedgHpKllMPMGlI2cIzLcvK7hY=; b=ghG61V2U3e0Yo19QENj3z5jaoL1SflC6AdhL9HW7uumiJHbUV7ebXIcPn/6M1qjw1Z oXcIeTkPHot6gEA8CG9Lj3AzrkJQH2vWyOjgMFMKk9pWq9hSeWt2StLKyGT/lAyJJUF5 eaUD6JDzjoaHypBJWPfqKMAVsEKOPJ1EE35BA= 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=edgteboUC7opDd1bYqedgHpKllMPMGlI2cIzLcvK7hY=; b=JHBc0k73F5mEU2NJfNHc4TI/BPjeidgrz6qostvnUQPUniWcwVWn0Bpbm8PatVoZqn 1p0OTfObgu/bwB3UH7bUSl1//i9MmlrDRcPl+oN+fORMnJ6gB5Lhh2tRzByaMMaW3zwn k4iKfel82UXza4KAr234OZy7RknCXbXxrNQdXEIw8PnyCcYDLW2IWx68wYP3wuZVSb0y IOXjYW+fPsugkY1gdgcQNmljq9FU1upC1B/d3XO3jBf2QTT5MEMlrA5kdkf+pgM23aqw Gh45e4duAaqd6kuEnwho6BH5MRHk4VoywThNVkqtgozWqUzJJSpSJdGENSF4ToZ9N5xQ /uNw== X-Gm-Message-State: ALoCoQn0yj/cMnPtTLYbEZ131EJYjsiVTHPYxV66JMrleWLSv7n6v3YagBHVy5N0c5aCMBb5X/pP X-Received: by 10.14.48.2 with SMTP id u2mr23614133eeb.5.1397218335659; Fri, 11 Apr 2014 05:12:15 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id w12sm17222227eez.36.2014.04.11.05.12.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Apr 2014 05:12:14 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 11 Apr 2014 14:12:10 +0200 Message-Id: <1397218330-28368-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 Cc: Daniel Vetter , Thierry Reding , DRI Development Subject: [Intel-gfx] [PATCH] drm/plane_helper: don't disable plane in destroy function X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.5 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 By the time drm_mode_config_cleanup calls this all the hw state should be cleaned up already - we even have a WARN right before calling plane->destroy callbacks asserting that all framebuffers are gone. So trying to disable things harder is a bit a bug. Caught by Thierry since it resulted in some mode_config.mutex locking backtraces. Cc: Thierry Reding Cc: Matt Roper Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding Tested-by: Thierry Reding Reviewed-by: Matt Roper --- drivers/gpu/drm/drm_plane_helper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c index e768d35ff22e..a3c9c6e11ee9 100644 --- a/drivers/gpu/drm/drm_plane_helper.c +++ b/drivers/gpu/drm/drm_plane_helper.c @@ -255,7 +255,6 @@ EXPORT_SYMBOL(drm_primary_helper_disable); */ void drm_primary_helper_destroy(struct drm_plane *plane) { - plane->funcs->disable_plane(plane); drm_plane_cleanup(plane); kfree(plane); }