From patchwork Mon Mar 7 22:00:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 8523271 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 721D79F2B4 for ; Mon, 7 Mar 2016 22:01:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A34B92022D for ; Mon, 7 Mar 2016 22:01:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D1CAD2020F for ; Mon, 7 Mar 2016 22:01:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E46766E42E; Mon, 7 Mar 2016 22:01:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-x22b.google.com (mail-pa0-x22b.google.com [IPv6:2607:f8b0:400e:c03::22b]) by gabe.freedesktop.org (Postfix) with ESMTPS id EAA976E42D for ; Mon, 7 Mar 2016 22:01:20 +0000 (UTC) Received: by mail-pa0-x22b.google.com with SMTP id tt10so23626596pab.3 for ; Mon, 07 Mar 2016 14:01:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=yf8pIDPa6phfPcpnWGc9FOqTaMqY2KKKJOAcQ9T3qI8=; b=lag+2ucEE8rcCpffbLbT9/EbhrCGrl54najZVNsIO39vOjye6hKf9xryxOOf/4ALqv P/mQ9daGk9h5ZWh7ex8B0F2nHMODFMIrb6dLE3sp6HrP34FABuMiP7SYbanNQQYYX/yV iLNa+ltQgR2u/jTaSC1RTBzYryd4Tsi1Et9Ks= 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=yf8pIDPa6phfPcpnWGc9FOqTaMqY2KKKJOAcQ9T3qI8=; b=Dj7OrwkSUg2iMSBDZfy7SZbcCT3eN+Ih+1vHY+wGqRAIr0mi14ZIJgWs5vW6Fsobdm copLtpNNJwD02arMai+thoQbXfQHE2sn51NTmpp96ztIsahcKTnxtKPoSFZoecEv8B+z 30Dsf5ktKxIzRwo1ip2yX7F9TWAVcBijRtUWr/fOXX9rG3TLPyGO27RjeBvL5/wc9UhR gcqir6CvgxFB/8M0X4mJ7cyPth1QNjfzfC/PGq39ZV084BG2DkWafIII4xMISN29m5e6 Lw6bvWega06I5AOdpTAerc7ZHLtjS6tCNj1tbx5BygRBSdJWD9H2Yzv411Q8n97RoJlS 1I2Q== X-Gm-Message-State: AD7BkJJeTJShiVB6q5WhaXJbQs5N626lWCqH+Thu3itcTg43XZPmgRvWtm6RgbjAPWI3gQ== X-Received: by 10.66.139.199 with SMTP id ra7mr36854421pab.74.1457388080043; Mon, 07 Mar 2016 14:01:20 -0800 (PST) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by smtp.gmail.com with ESMTPSA id p26sm19964195pfi.84.2016.03.07.14.01.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Mar 2016 14:01:18 -0800 (PST) From: Douglas Anderson To: Mark Yao , David Airlie , linux@arm.linux.org.uk, Heiko Stuebner Subject: [PATCH v2 1/5] drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path Date: Mon, 7 Mar 2016 14:00:50 -0800 Message-Id: <1457388054-23077-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 Cc: john@keeping.me.uk, Douglas Anderson , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org 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.1 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 The drm_encoder_cleanup() was missing both from the error path of dw_hdmi_rockchip_bind(). This caused a crash when slub_debug was enabled and we ended up deferring probe of HDMI at boot. This call isn't needed from unbind() because if dw_hdmi_bind() returns no error then it takes over the job of freeing the encoder (in dw_hdmi_unbind). Signed-off-by: Douglas Anderson --- Changes in v2: None drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 3d3cf2f8891e..88776aba984e 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -293,7 +293,16 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs, DRM_MODE_ENCODER_TMDS, NULL); - return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); + ret = dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); + + /* + * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(), + * which would have called the encoder cleanup. Do it manually. + */ + if (ret) + drm_encoder_cleanup(encoder); + + return ret; } static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master,