From patchwork Fri Jul 29 14:44:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 73043 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1427211qga; Fri, 29 Jul 2016 07:44:58 -0700 (PDT) X-Received: by 10.98.32.138 with SMTP id m10mr69514408pfj.146.1469803497937; Fri, 29 Jul 2016 07:44:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i29si18760642pfa.172.2016.07.29.07.44.57; Fri, 29 Jul 2016 07:44:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753230AbcG2Ool (ORCPT + 29 others); Fri, 29 Jul 2016 10:44:41 -0400 Received: from fw-tnat.cambridge.arm.com ([217.140.96.140]:14650 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753071AbcG2Oob (ORCPT ); Fri, 29 Jul 2016 10:44:31 -0400 Received: from e106497-lin.cambridge.arm.com (e106497-lin.cambridge.arm.com [10.2.131.153]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id u6TEiM76008331; Fri, 29 Jul 2016 15:44:23 +0100 From: Liviu Dudau To: David Airlie , Mali DP Maintainers , Daniel Vetter Cc: DRI devel , LKML , Brian Starkey Subject: [PATCH 2/2] drm: mali-dp: Set the drm->irq_enabled flag to match driver's state. Date: Fri, 29 Jul 2016 15:44:16 +0100 Message-Id: <20160729144416.2860-3-Liviu.Dudau@arm.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160729144416.2860-1-Liviu.Dudau@arm.com> References: <20160729144416.2860-1-Liviu.Dudau@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Mali DP driver does not use drm_irq_{un,}install() function so the drm->irq_enabled flag does not get managed automatically. Among other DRM framework functions, drm_wait_vblank() checks the value of the flag and return -EINVAL if not set. Cc: Brian Starkey Signed-off-by: Liviu Dudau --- drivers/gpu/drm/arm/malidp_drv.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.9.0 diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index 87c9249..a1c01e4 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -377,6 +377,8 @@ static int malidp_bind(struct device *dev) if (ret < 0) goto irq_init_fail; + drm->irq_enabled = true; + ret = drm_vblank_init(drm, drm->mode_config.num_crtc); if (ret < 0) { DRM_ERROR("failed to initialise vblank\n"); @@ -402,6 +404,7 @@ fbdev_fail: vblank_fail: malidp_se_irq_fini(drm); malidp_de_irq_fini(drm); + drm->irq_enabled = false; irq_init_fail: component_unbind_all(dev, drm); bind_fail: @@ -439,6 +442,7 @@ static void malidp_unbind(struct device *dev) drm_kms_helper_poll_fini(drm); malidp_se_irq_fini(drm); malidp_de_irq_fini(drm); + drm->irq_enabled = false; drm_vblank_cleanup(drm); component_unbind_all(dev, drm); of_node_put(malidp->crtc.port);