From patchwork Tue Jun 2 09:51:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11583499 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D012F739 for ; Tue, 2 Jun 2020 09:52:06 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B011920679 for ; Tue, 2 Jun 2020 09:52:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="OMB/lHCd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B011920679 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A9D256E129; Tue, 2 Jun 2020 09:51:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED9366E117 for ; Tue, 2 Jun 2020 09:51:55 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id x6so2667794wrm.13 for ; Tue, 02 Jun 2020 02:51:55 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=zBJStSFyGwXYFshx7uTxuda0k6lYRaHuTLZX4FygES0=; b=OMB/lHCdSerDMq5F3y0UdSeHZ1ySwvyYooKPapUvZTfZu7LNtNnovnTNxvMpuczG6U HnSjsqYfil3JP3XgX2Zmf7kLid3N9MrQxQ4dC6FZot6Uoy5eMCmh56mfszctvWhGsWpi RaZqz5ifvDVqRksaho9/inr0SJdqwLkdXgcq8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zBJStSFyGwXYFshx7uTxuda0k6lYRaHuTLZX4FygES0=; b=j8DSad4V15HjTJ466QBe0txjZqw8ps5F8zLZImzggdu5boGjf4RYAvxD43tsAwOKdG JsNnnLEDczkDh+sRTUASVEfLS4BAqWsSfovjENlhjtgwC5nM91MWl6b3TY+DMOJ9SEk5 aBFdhsbhm8xamPeJqPc5v4FsxBtEx2jsPNifLJELE+HVmOVgyYATmQn6CILmLctmcemo JHsB7QDZHLcfEUL3isgSEPPzzCjwPKmCTEZoo6Z3NGBWFpmRxQ7osYDg8pUfTLynGvQJ Ob8ffUfn3BZ6mYIuDRGyzlaRZ/yzWJIZEScS72q6Pjwn7II4TEBVLqulhphcqYmtLBrC 1EhQ== X-Gm-Message-State: AOAM530sfvPBYNZdV3lhH7IaDWUEQ3ImGJkmKSv7fWhtsCqjrvX3EoXL IaFAAHZLshYWOkqbhhOLGxT3WHo6vgM= X-Google-Smtp-Source: ABdhPJxuFjAFdXbTEEKA3QY6AgrPXluPeV2VnPbk43I0VIgYZ1wE1DPthaEbQ3kpgkImnXdTgRMjkg== X-Received: by 2002:adf:f552:: with SMTP id j18mr24368390wrp.279.1591091514182; Tue, 02 Jun 2020 02:51:54 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id a6sm2996443wrn.38.2020.06.02.02.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 02:51:53 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 3/3] drm/hdlcd: Don't call drm_crtc_vblank_off on unbind Date: Tue, 2 Jun 2020 11:51:40 +0200 Message-Id: <20200602095140.36678-3-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200602095140.36678-1-daniel.vetter@ffwll.ch> References: <20200602095140.36678-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Liviu Dudau , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is already taken care of by drm_atomic_helper_shutdown(), and in that case only for the CRTC which are actually on. Only tricky bit here is that we kill the interrupt handling before we shut down crtc, so need to reorder that. Signed-off-by: Daniel Vetter Cc: Liviu Dudau Cc: Brian Starkey Cc: Acked-by: Liviu Dudau --- drivers/gpu/drm/arm/hdlcd_drv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index 194419f47c5e..26bc5d7766f5 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -347,9 +347,8 @@ static void hdlcd_drm_unbind(struct device *dev) of_node_put(hdlcd->crtc.port); hdlcd->crtc.port = NULL; pm_runtime_get_sync(dev); - drm_crtc_vblank_off(&hdlcd->crtc); - drm_irq_uninstall(drm); drm_atomic_helper_shutdown(drm); + drm_irq_uninstall(drm); pm_runtime_put(dev); if (pm_runtime_enabled(dev)) pm_runtime_disable(dev);