From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC27CC4338F for ; Tue, 3 Aug 2021 09:39:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A74BE60F94 for ; Tue, 3 Aug 2021 09:39:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234973AbhHCJjG (ORCPT ); Tue, 3 Aug 2021 05:39:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235026AbhHCJi5 (ORCPT ); Tue, 3 Aug 2021 05:38:57 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92F31C0617A0 for ; Tue, 3 Aug 2021 02:37:32 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id h9so27416082ljq.8 for ; Tue, 03 Aug 2021 02:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=SK6Ob07YJlX0nTWImG5cDSOjubg9maW6J2sNRF3yaOY=; b=FBF9KtmjCa4uE0h2AteVPxiHyctdT6XJKIMbXtjO/tEd2nTSV/YeGyPiRGpkuIvk4D MIsUvmdLlN3oN6mclWG7afHoXK1c0LZjelfP0qDlPGcdSNdDBmBndm2Wjg2EFLjBi1sQ NW8SX1btq/CrnfYYRiGJRs/IQHazS4i8tNYH1NJBnBtQGSHrv5cZJkHSdmCXPVZmenua ikIpDlNesEvw+jbsMZ/kYJWaEh1Oxgu4eltNTq+dQAVMq3x+D5m1idjwyeQjL4/mqJ8Q XpT0GMgKd7iBnpTACGTS/qZReSNt1jD/grlVuRsommifNHDzZgq1Co7tOou7ch99y/6v HiYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=SK6Ob07YJlX0nTWImG5cDSOjubg9maW6J2sNRF3yaOY=; b=Erk9BqNLNdIEAKeyZC6Ww1pza2JOLqcppNcgLRWNAfhEErm3V6Mmh8iEnGVKYqjUo8 CyeT6wR+LXVLQK2buMDMiHmNEN/T3eNG1cumCakv8UtvqT0AHWPNrw+T57rXDj7E00hU gsKHnUHWVspFC9MYMufNjn0jxdfV+eXhBUkZ8xPB3iZjSRTDyvpz8Uf6vlyRj8luKfjD s02an3gdkaZ9YJ5KqAt3JBZkTOP2eslPNbfZmP5U8EIh3yrwaMJ3XVYaMy+2Q1hhWOTC Gix6lcD30hDh0rzOJ8orbDkFI/OsSqsVLA3kC9fixK9wGTfLhPs25gLw3wn46SpbBlyu ic4A== X-Gm-Message-State: AOAM533jWPDAle0hq8j+CaW5bzHA62kj+B9rUZ22gzBgjWrGO8jX97mb 2tnZzLN5OtLQMJrQB8DQc0Fk+A== X-Google-Smtp-Source: ABdhPJwfzeu1HZdLhzyas+uFWAQ6XGdYcgkubYxUqCC4cyCTAVYruEGRSEc4hbVySR5Fttx49rvpQw== X-Received: by 2002:a05:651c:2051:: with SMTP id t17mr13734385ljo.118.1627983450529; Tue, 03 Aug 2021 02:37:30 -0700 (PDT) Received: from [192.168.1.211] ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id g17sm748572lfv.210.2021.08.03.02.37.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 Aug 2021 02:37:30 -0700 (PDT) Subject: Re: [PATCH v2 07/14] drm/msm: Convert to Linux IRQ interfaces To: Thomas Zimmermann , daniel@ffwll.ch, airlied@linux.ie, alexander.deucher@amd.com, christian.koenig@amd.com, liviu.dudau@arm.com, brian.starkey@arm.com, sam@ravnborg.org, bbrezillon@kernel.org, nicolas.ferre@microchip.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, stefan@agner.ch, alison.wang@nxp.com, patrik.r.jakobsson@gmail.com, anitha.chrisanthus@intel.com, robdclark@gmail.com, edmund.j.dea@intel.com, sean@poorly.run, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, jyri.sarha@iki.fi, tomba@kernel.org, Dan.Sneddon@microchip.com, tomi.valkeinen@ideasonboard.com Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org References: <20210803090704.32152-1-tzimmermann@suse.de> <20210803090704.32152-8-tzimmermann@suse.de> From: Dmitry Baryshkov Message-ID: <1f5f285a-b923-16ff-2ca1-6f92e22ffcab@linaro.org> Date: Tue, 3 Aug 2021 12:37:29 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210803090704.32152-8-tzimmermann@suse.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 03/08/2021 12:06, Thomas Zimmermann wrote: > Drop the DRM IRQ midlayer in favor of Linux IRQ interfaces. DRM's > IRQ helpers are mostly useful for UMS drivers. Modern KMS drivers > don't benefit from using it. > > DRM IRQ callbacks are now being called directly or inlined. > > Signed-off-by: Thomas Zimmermann Reviewed-by: Dmitry Baryshkov Rob should probably also give his blessing on this patch though. > --- > drivers/gpu/drm/msm/msm_drv.c | 113 ++++++++++++++++++++-------------- > drivers/gpu/drm/msm/msm_kms.h | 2 +- > 2 files changed, 69 insertions(+), 46 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 1594ae39d54f..a332b09a5a11 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -201,6 +200,71 @@ void msm_rmw(void __iomem *addr, u32 mask, u32 or) > msm_writel(val | or, addr); > } > > +static irqreturn_t msm_irq(int irq, void *arg) > +{ > + struct drm_device *dev = arg; > + struct msm_drm_private *priv = dev->dev_private; > + struct msm_kms *kms = priv->kms; > + > + BUG_ON(!kms); > + > + return kms->funcs->irq(kms); > +} > + > +static void msm_irq_preinstall(struct drm_device *dev) > +{ > + struct msm_drm_private *priv = dev->dev_private; > + struct msm_kms *kms = priv->kms; > + > + BUG_ON(!kms); > + > + kms->funcs->irq_preinstall(kms); > +} > + > +static int msm_irq_postinstall(struct drm_device *dev) > +{ > + struct msm_drm_private *priv = dev->dev_private; > + struct msm_kms *kms = priv->kms; > + > + BUG_ON(!kms); > + > + if (kms->funcs->irq_postinstall) > + return kms->funcs->irq_postinstall(kms); > + > + return 0; > +} > + > +static int msm_irq_install(struct drm_device *dev, unsigned int irq) > +{ > + int ret; > + > + if (irq == IRQ_NOTCONNECTED) > + return -ENOTCONN; > + > + msm_irq_preinstall(dev); > + > + ret = request_irq(irq, msm_irq, 0, dev->driver->name, dev); > + if (ret) > + return ret; > + > + ret = msm_irq_postinstall(dev); > + if (ret) { > + free_irq(irq, dev); > + return ret; > + } > + > + return 0; > +} > + > +static void msm_irq_uninstall(struct drm_device *dev) > +{ > + struct msm_drm_private *priv = dev->dev_private; > + struct msm_kms *kms = priv->kms; > + > + kms->funcs->irq_uninstall(kms); > + free_irq(kms->irq, dev); > +} > + > struct msm_vblank_work { > struct work_struct work; > int crtc_id; > @@ -265,7 +329,7 @@ static int msm_drm_uninit(struct device *dev) > } > > /* We must cancel and cleanup any pending vblank enable/disable > - * work before drm_irq_uninstall() to avoid work re-enabling an > + * work before msm_irq_uninstall() to avoid work re-enabling an > * irq after uninstall has disabled it. > */ > > @@ -294,7 +358,7 @@ static int msm_drm_uninit(struct device *dev) > drm_mode_config_cleanup(ddev); > > pm_runtime_get_sync(dev); > - drm_irq_uninstall(ddev); > + msm_irq_uninstall(ddev); > pm_runtime_put_sync(dev); > > if (kms && kms->funcs) > @@ -553,7 +617,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) > > if (kms) { > pm_runtime_get_sync(dev); > - ret = drm_irq_install(ddev, kms->irq); > + ret = msm_irq_install(ddev, kms->irq); > pm_runtime_put_sync(dev); > if (ret < 0) { > DRM_DEV_ERROR(dev, "failed to install IRQ handler\n"); > @@ -662,43 +726,6 @@ static void msm_postclose(struct drm_device *dev, struct drm_file *file) > context_close(ctx); > } > > -static irqreturn_t msm_irq(int irq, void *arg) > -{ > - struct drm_device *dev = arg; > - struct msm_drm_private *priv = dev->dev_private; > - struct msm_kms *kms = priv->kms; > - BUG_ON(!kms); > - return kms->funcs->irq(kms); > -} > - > -static void msm_irq_preinstall(struct drm_device *dev) > -{ > - struct msm_drm_private *priv = dev->dev_private; > - struct msm_kms *kms = priv->kms; > - BUG_ON(!kms); > - kms->funcs->irq_preinstall(kms); > -} > - > -static int msm_irq_postinstall(struct drm_device *dev) > -{ > - struct msm_drm_private *priv = dev->dev_private; > - struct msm_kms *kms = priv->kms; > - BUG_ON(!kms); > - > - if (kms->funcs->irq_postinstall) > - return kms->funcs->irq_postinstall(kms); > - > - return 0; > -} > - > -static void msm_irq_uninstall(struct drm_device *dev) > -{ > - struct msm_drm_private *priv = dev->dev_private; > - struct msm_kms *kms = priv->kms; > - BUG_ON(!kms); > - kms->funcs->irq_uninstall(kms); > -} > - > int msm_crtc_enable_vblank(struct drm_crtc *crtc) > { > struct drm_device *dev = crtc->dev; > @@ -1051,10 +1078,6 @@ static const struct drm_driver msm_driver = { > .open = msm_open, > .postclose = msm_postclose, > .lastclose = drm_fb_helper_lastclose, > - .irq_handler = msm_irq, > - .irq_preinstall = msm_irq_preinstall, > - .irq_postinstall = msm_irq_postinstall, > - .irq_uninstall = msm_irq_uninstall, > .dumb_create = msm_gem_dumb_create, > .dumb_map_offset = msm_gem_dumb_map_offset, > .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h > index 086a2d59b8c8..9de7c42e1071 100644 > --- a/drivers/gpu/drm/msm/msm_kms.h > +++ b/drivers/gpu/drm/msm/msm_kms.h > @@ -150,7 +150,7 @@ struct msm_kms { > const struct msm_kms_funcs *funcs; > struct drm_device *dev; > > - /* irq number to be passed on to drm_irq_install */ > + /* irq number to be passed on to msm_irq_install */ > int irq; > > /* mapper-id used to request GEM buffer mapped for scanout: */ > -- With best wishes Dmitry From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABD88C4338F for ; Tue, 3 Aug 2021 09:39:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 7908D60F48 for ; Tue, 3 Aug 2021 09:39:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7908D60F48 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CEiEUBB9e7c4XouRBP4Zged63K8exBmqoZhfGM8b71M=; b=HwSZKpeR6r70nl2OyHeuZWfnB5 yat/7k+iYThdibnlRF1U3RZLytCjxZVi+fF72oZGecLknqLNlLxEJgr9d/iAu2hU1LON2TXgMo11e C6FfjuMgqGAJovyzz19s8Jyb9osEAMjsQuSwCoghbKUr2GVNZmEReto9j5PkhE9RbJknFBi3iDdie 9U9LnA8jyD4EmL4B50axUb6ecaOvhHMQVFnu8eWv2hEmOYPy/og+tqCco2Xq0fqd4RL7lZhZURMXK g0we1NjppLzgoQ9BuQCKLEIBxEJQy7CRyeoNlG6aG6Oafv6gOpubmWEu8JGt2zfWrLQfP6jkiFnqE T/ht9++A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAqrl-001qHJ-Cq; Tue, 03 Aug 2021 09:37:41 +0000 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAqrg-001qG7-BN for linux-arm-kernel@lists.infradead.org; Tue, 03 Aug 2021 09:37:39 +0000 Received: by mail-lj1-x22a.google.com with SMTP id m18so3627053ljo.1 for ; Tue, 03 Aug 2021 02:37:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=SK6Ob07YJlX0nTWImG5cDSOjubg9maW6J2sNRF3yaOY=; b=FBF9KtmjCa4uE0h2AteVPxiHyctdT6XJKIMbXtjO/tEd2nTSV/YeGyPiRGpkuIvk4D MIsUvmdLlN3oN6mclWG7afHoXK1c0LZjelfP0qDlPGcdSNdDBmBndm2Wjg2EFLjBi1sQ NW8SX1btq/CrnfYYRiGJRs/IQHazS4i8tNYH1NJBnBtQGSHrv5cZJkHSdmCXPVZmenua ikIpDlNesEvw+jbsMZ/kYJWaEh1Oxgu4eltNTq+dQAVMq3x+D5m1idjwyeQjL4/mqJ8Q XpT0GMgKd7iBnpTACGTS/qZReSNt1jD/grlVuRsommifNHDzZgq1Co7tOou7ch99y/6v HiYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=SK6Ob07YJlX0nTWImG5cDSOjubg9maW6J2sNRF3yaOY=; b=jhLJsO6769nEjIKBbT5pe8PYADS/QRXjFYpfxCpLuc6FtzEBv3VnlJzXGwnrb6xN21 LrGQ5o69Y/dvh2CFpuzXeFc1L6K5PNsOxDqTdfBZsVktNwVIA8jPP6SzdptjmD/mheCU gIOKOj7nw+iZquP3xwStaYRCH+JpkOsOdLvOwbwGjKEW5DpOl9k+OR3MOehGxS31guOt 4xCZ2f/OZTyxKERAIOy4X4rpj5req5OChHO0xTGkbdRiAdFA4ACBX1U8wO+gr28q6py0 hceSB3hF+yjS1XyNPuKEJWtlVbR8yhm1smn+jBnCfeKrVAcPzpPWhKRCz+fZoFo3qugn Jelg== X-Gm-Message-State: AOAM532ughRsPRZCV7IpluUBs8/1gVdmaZa/a3/baXDuJGd7GKHKZi2t oKpBmYUHVTAjQdyPtXpv0m28DA== X-Google-Smtp-Source: ABdhPJwfzeu1HZdLhzyas+uFWAQ6XGdYcgkubYxUqCC4cyCTAVYruEGRSEc4hbVySR5Fttx49rvpQw== X-Received: by 2002:a05:651c:2051:: with SMTP id t17mr13734385ljo.118.1627983450529; Tue, 03 Aug 2021 02:37:30 -0700 (PDT) Received: from [192.168.1.211] ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id g17sm748572lfv.210.2021.08.03.02.37.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 Aug 2021 02:37:30 -0700 (PDT) Subject: Re: [PATCH v2 07/14] drm/msm: Convert to Linux IRQ interfaces To: Thomas Zimmermann , daniel@ffwll.ch, airlied@linux.ie, alexander.deucher@amd.com, christian.koenig@amd.com, liviu.dudau@arm.com, brian.starkey@arm.com, sam@ravnborg.org, bbrezillon@kernel.org, nicolas.ferre@microchip.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, stefan@agner.ch, alison.wang@nxp.com, patrik.r.jakobsson@gmail.com, anitha.chrisanthus@intel.com, robdclark@gmail.com, edmund.j.dea@intel.com, sean@poorly.run, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, jyri.sarha@iki.fi, tomba@kernel.org, Dan.Sneddon@microchip.com, tomi.valkeinen@ideasonboard.com Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org References: <20210803090704.32152-1-tzimmermann@suse.de> <20210803090704.32152-8-tzimmermann@suse.de> From: Dmitry Baryshkov Message-ID: <1f5f285a-b923-16ff-2ca1-6f92e22ffcab@linaro.org> Date: Tue, 3 Aug 2021 12:37:29 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210803090704.32152-8-tzimmermann@suse.de> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210803_023736_428444_DAFE4923 X-CRM114-Status: GOOD ( 30.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 03/08/2021 12:06, Thomas Zimmermann wrote: > Drop the DRM IRQ midlayer in favor of Linux IRQ interfaces. DRM's > IRQ helpers are mostly useful for UMS drivers. Modern KMS drivers > don't benefit from using it. > > DRM IRQ callbacks are now being called directly or inlined. > > Signed-off-by: Thomas Zimmermann Reviewed-by: Dmitry Baryshkov Rob should probably also give his blessing on this patch though. > --- > drivers/gpu/drm/msm/msm_drv.c | 113 ++++++++++++++++++++-------------- > drivers/gpu/drm/msm/msm_kms.h | 2 +- > 2 files changed, 69 insertions(+), 46 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 1594ae39d54f..a332b09a5a11 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -201,6 +200,71 @@ void msm_rmw(void __iomem *addr, u32 mask, u32 or) > msm_writel(val | or, addr); > } > > +static irqreturn_t msm_irq(int irq, void *arg) > +{ > + struct drm_device *dev = arg; > + struct msm_drm_private *priv = dev->dev_private; > + struct msm_kms *kms = priv->kms; > + > + BUG_ON(!kms); > + > + return kms->funcs->irq(kms); > +} > + > +static void msm_irq_preinstall(struct drm_device *dev) > +{ > + struct msm_drm_private *priv = dev->dev_private; > + struct msm_kms *kms = priv->kms; > + > + BUG_ON(!kms); > + > + kms->funcs->irq_preinstall(kms); > +} > + > +static int msm_irq_postinstall(struct drm_device *dev) > +{ > + struct msm_drm_private *priv = dev->dev_private; > + struct msm_kms *kms = priv->kms; > + > + BUG_ON(!kms); > + > + if (kms->funcs->irq_postinstall) > + return kms->funcs->irq_postinstall(kms); > + > + return 0; > +} > + > +static int msm_irq_install(struct drm_device *dev, unsigned int irq) > +{ > + int ret; > + > + if (irq == IRQ_NOTCONNECTED) > + return -ENOTCONN; > + > + msm_irq_preinstall(dev); > + > + ret = request_irq(irq, msm_irq, 0, dev->driver->name, dev); > + if (ret) > + return ret; > + > + ret = msm_irq_postinstall(dev); > + if (ret) { > + free_irq(irq, dev); > + return ret; > + } > + > + return 0; > +} > + > +static void msm_irq_uninstall(struct drm_device *dev) > +{ > + struct msm_drm_private *priv = dev->dev_private; > + struct msm_kms *kms = priv->kms; > + > + kms->funcs->irq_uninstall(kms); > + free_irq(kms->irq, dev); > +} > + > struct msm_vblank_work { > struct work_struct work; > int crtc_id; > @@ -265,7 +329,7 @@ static int msm_drm_uninit(struct device *dev) > } > > /* We must cancel and cleanup any pending vblank enable/disable > - * work before drm_irq_uninstall() to avoid work re-enabling an > + * work before msm_irq_uninstall() to avoid work re-enabling an > * irq after uninstall has disabled it. > */ > > @@ -294,7 +358,7 @@ static int msm_drm_uninit(struct device *dev) > drm_mode_config_cleanup(ddev); > > pm_runtime_get_sync(dev); > - drm_irq_uninstall(ddev); > + msm_irq_uninstall(ddev); > pm_runtime_put_sync(dev); > > if (kms && kms->funcs) > @@ -553,7 +617,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) > > if (kms) { > pm_runtime_get_sync(dev); > - ret = drm_irq_install(ddev, kms->irq); > + ret = msm_irq_install(ddev, kms->irq); > pm_runtime_put_sync(dev); > if (ret < 0) { > DRM_DEV_ERROR(dev, "failed to install IRQ handler\n"); > @@ -662,43 +726,6 @@ static void msm_postclose(struct drm_device *dev, struct drm_file *file) > context_close(ctx); > } > > -static irqreturn_t msm_irq(int irq, void *arg) > -{ > - struct drm_device *dev = arg; > - struct msm_drm_private *priv = dev->dev_private; > - struct msm_kms *kms = priv->kms; > - BUG_ON(!kms); > - return kms->funcs->irq(kms); > -} > - > -static void msm_irq_preinstall(struct drm_device *dev) > -{ > - struct msm_drm_private *priv = dev->dev_private; > - struct msm_kms *kms = priv->kms; > - BUG_ON(!kms); > - kms->funcs->irq_preinstall(kms); > -} > - > -static int msm_irq_postinstall(struct drm_device *dev) > -{ > - struct msm_drm_private *priv = dev->dev_private; > - struct msm_kms *kms = priv->kms; > - BUG_ON(!kms); > - > - if (kms->funcs->irq_postinstall) > - return kms->funcs->irq_postinstall(kms); > - > - return 0; > -} > - > -static void msm_irq_uninstall(struct drm_device *dev) > -{ > - struct msm_drm_private *priv = dev->dev_private; > - struct msm_kms *kms = priv->kms; > - BUG_ON(!kms); > - kms->funcs->irq_uninstall(kms); > -} > - > int msm_crtc_enable_vblank(struct drm_crtc *crtc) > { > struct drm_device *dev = crtc->dev; > @@ -1051,10 +1078,6 @@ static const struct drm_driver msm_driver = { > .open = msm_open, > .postclose = msm_postclose, > .lastclose = drm_fb_helper_lastclose, > - .irq_handler = msm_irq, > - .irq_preinstall = msm_irq_preinstall, > - .irq_postinstall = msm_irq_postinstall, > - .irq_uninstall = msm_irq_uninstall, > .dumb_create = msm_gem_dumb_create, > .dumb_map_offset = msm_gem_dumb_map_offset, > .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h > index 086a2d59b8c8..9de7c42e1071 100644 > --- a/drivers/gpu/drm/msm/msm_kms.h > +++ b/drivers/gpu/drm/msm/msm_kms.h > @@ -150,7 +150,7 @@ struct msm_kms { > const struct msm_kms_funcs *funcs; > struct drm_device *dev; > > - /* irq number to be passed on to drm_irq_install */ > + /* irq number to be passed on to msm_irq_install */ > int irq; > > /* mapper-id used to request GEM buffer mapped for scanout: */ > -- With best wishes Dmitry _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel