From patchwork Fri Oct 31 22:54:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 5207831 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C0FB79F318 for ; Fri, 31 Oct 2014 23:57:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E5CAD20176 for ; Fri, 31 Oct 2014 23:57:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D258D20172 for ; Fri, 31 Oct 2014 23:57:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 721F36E890; Fri, 31 Oct 2014 16:56:59 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com [209.85.220.45]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A295898E1 for ; Fri, 31 Oct 2014 15:57:44 -0700 (PDT) Received: by mail-pa0-f45.google.com with SMTP id lf10so8622359pab.32 for ; Fri, 31 Oct 2014 15:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mrJBRCQfsgYmf89iEE18UdtOfU1APWunRxwKD+B06+U=; b=rl94bDsisQsjV6PYSrf9Isc2vGEKIdcfOfN3RYk84Eu77fOtW9EPjzvHbElBQRppQR DHdJK2bjCHyJd1nytBiFK/oKvBzZKCCEbpdMIWzFD3fA84irm3P72uM6X6tCo3FQLpYP +2Ww97cYaJ4ymFu7G+p9bGNMUVpX7m2ZaY7gLUYhaaxPxZyBiKfugxlMbP1m6Bi8U/hr 10YKF6aU4FoFtl3tgTixjuZLm3wcCemofaRtnkC4qJOi9QSRRI34g6xE3l90S7vax4K0 lXJJgHLu0VGYzW/9NzC1OAQfHVQqDFXe5cTLUXPySZHVv796q0+YFnj27j7ASKJwFOPg W2MA== X-Received: by 10.70.49.40 with SMTP id r8mr27925954pdn.97.1414796264170; Fri, 31 Oct 2014 15:57:44 -0700 (PDT) Received: from mothership.mgc.mentorg.com (c-50-152-159-227.hsd1.ca.comcast.net. [50.152.159.227]) by mx.google.com with ESMTPSA id ev8sm10870656pdb.28.2014.10.31.15.57.43 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 15:57:43 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: dri-devel@lists.freedesktop.org Subject: [PATCH 67/72] imx-drm: ipuv3-crtc: Disable fb on crtc unbind Date: Fri, 31 Oct 2014 15:54:50 -0700 Message-Id: <1414796095-10107-68-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1414796095-10107-1-git-send-email-steve_longerbeam@mentor.com> References: <1414796095-10107-1-git-send-email-steve_longerbeam@mentor.com> X-Mailman-Approved-At: Fri, 31 Oct 2014 16:56:32 -0700 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=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 Call ipu_fb_disable() in the crtc unbind method, in case the crtc has been left enabled. Signed-off-by: Steve Longerbeam --- drivers/staging/imx-drm/ipuv3-crtc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c index 65fe429..53241fd 100644 --- a/drivers/staging/imx-drm/ipuv3-crtc.c +++ b/drivers/staging/imx-drm/ipuv3-crtc.c @@ -637,6 +637,8 @@ static void ipu_drm_unbind(struct device *dev, struct device *master, { struct ipu_crtc *ipu_crtc = dev_get_drvdata(dev); + ipu_fb_disable(ipu_crtc); + imx_drm_remove_crtc(ipu_crtc->imx_crtc); ipu_plane_put_resources(&ipu_crtc->plane[0]);