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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 20D5DC4320A for ; Tue, 3 Aug 2021 15:00:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 07AF660F70 for ; Tue, 3 Aug 2021 15:00:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236022AbhHCPAO (ORCPT ); Tue, 3 Aug 2021 11:00:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235632AbhHCPAN (ORCPT ); Tue, 3 Aug 2021 11:00:13 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8112CC061764 for ; Tue, 3 Aug 2021 08:00:01 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id h14so25622181wrx.10 for ; Tue, 03 Aug 2021 08:00:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Jw4wr5u/bMQ+8Mg5l7jnnjM6HvuOqoF/MPTYPqGyvN0=; b=Er/5R0jxks3UChiwjzshiC7Oq4cVBmIKe/e54/BliOTPYJCj7iAEZB2SOSMNYBnfBj 0gIc6x3kT0KI3N8WQZGtvgnDaOSsa8zMbme4PPL5KNJl8x88/w7TbQyCjwRVgzEOWQcM Jwjvg1tFUyoT4ADk6UvnT09ws4s0nNpkqPcX8p0759J570LoDQIENxF3OJEd1srDG/rn zIOGA9GkOq6viWZNva8ERKjFAxFyPtn+Or8CoJycovsX3mX3CNy3vBc0z1SEMFxl9jhq PJ936A22gXodubTeFvJPXbKI09Se9WWXb0BoybcB0NN69GJXx6UPC16wHLeZKs5/oIgi Ykvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Jw4wr5u/bMQ+8Mg5l7jnnjM6HvuOqoF/MPTYPqGyvN0=; b=t9US4gfrkvWPxzd1+HlfWWUX2CMzdnDSMi+cJHcpo/d1teelJYC93LZCANO7p1unxf L1LtBP4gFY/Jx0l4GzF5D0bnx5Wf9HOkIcSoXFT/yfDbMBeDqAlEJPRpSVVD1Pb/97Pf 0PKOr+Iyx06pKnzoYYzPH9ea5onDwpmppyLryBeBZq1sJ5w2n09tyenwicsZIR/JNG58 siT7P0Jet1BP1RpuodChJj0SWr47OkA2qpBf67+BJGeEC3UUKfKfET5UAEr0nlPN75WY JaM9v5rQLtZGUmHLcZlnwC0hoaIpSGS5ZfvYtFr/Q/IECl8wCfn3pTo6e3earTNALx6F YwBA== X-Gm-Message-State: AOAM530Y6bSnh3nbZc6GeuC0c134ofxqEaTHZDEqmoVXPMz0hheK/M05 9jqNKSbUzbFgBZxNtwKk3XcYJEAKixkijF8ytwY= X-Google-Smtp-Source: ABdhPJzQudrPX3oAwlSlqCmD/d2aB0jX8IyeqZHbMG70gD1DBriAKw16cqE1Xazzv/3Y8EGXbGTePXUSosLvk9p1zmk= X-Received: by 2002:a5d:504d:: with SMTP id h13mr21657703wrt.132.1628002800036; Tue, 03 Aug 2021 08:00:00 -0700 (PDT) MIME-Version: 1.0 References: <20210803090704.32152-1-tzimmermann@suse.de> <20210803090704.32152-8-tzimmermann@suse.de> <1f5f285a-b923-16ff-2ca1-6f92e22ffcab@linaro.org> In-Reply-To: <1f5f285a-b923-16ff-2ca1-6f92e22ffcab@linaro.org> From: Rob Clark Date: Tue, 3 Aug 2021 08:04:13 -0700 Message-ID: Subject: Re: [PATCH v2 07/14] drm/msm: Convert to Linux IRQ interfaces To: Dmitry Baryshkov Cc: Thomas Zimmermann , Daniel Vetter , David Airlie , Alexander Deucher , =?UTF-8?Q?Christian_K=C3=B6nig?= , Liviu Dudau , Brian Starkey , Sam Ravnborg , Boris Brezillon , Nicolas Ferre , Maarten Lankhorst , Maxime Ripard , Stefan Agner , alison.wang@nxp.com, Patrik Jakobsson , anitha.chrisanthus@intel.com, edmund.j.dea@intel.com, Sean Paul , Shawn Guo , Sascha Hauer , Sascha Hauer , jyri.sarha@iki.fi, tomba@kernel.org, Dan.Sneddon@microchip.com, tomi.valkeinen@ideasonboard.com, amd-gfx list , dri-devel , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , linux-arm-msm , freedreno Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Tue, Aug 3, 2021 at 2:37 AM Dmitry Baryshkov wrote: > > 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. It looks ok.. I can't really test it this week, but it should be pretty obvious if it wasn't working BR, -R > > > --- > > 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=-10.8 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 29D57C4338F for ; Tue, 3 Aug 2021 15:02:04 +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 E9A5260720 for ; Tue, 3 Aug 2021 15:02:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E9A5260720 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qmtYUK6GX0CEBWP46/8y0lIP+3vBqF4L8eEhhBvxVS4=; b=1CIfXKXntXlRdr jdGdLzpCtZxbLBsdKWulJADP4OSm+UNfXskTRBLNUKGkThId82xI3ul4tGC6piKBV4fak5uIEOjjL AscismnLcgL7sfPG6AIpq+HiHOPUvpdT5Hbaho/tZZIB0pwtCG/UVi36uQw4Qg9TKnIyLEPNVmMja lhU4YnUmz+6+gyem/rvAhzGRM//JIy2kDgP/tRkaqreoOyQ35N8PeM/UrZzppRV9gzNnk0HdLWcxm R3+3g2b+Ub2TN+DC1kAjDgBxs6iW4qng1PcKu1vnzwn12mURzMS0mU8JSEdWfMmbzR/+W9WGEzEi9 jCbTkm9aFyeZW4M6n8NQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAvto-003JVw-0y; Tue, 03 Aug 2021 15:00:08 +0000 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAvth-003JT8-SV for linux-arm-kernel@lists.infradead.org; Tue, 03 Aug 2021 15:00:03 +0000 Received: by mail-wr1-x435.google.com with SMTP id j2so25578270wrx.9 for ; Tue, 03 Aug 2021 08:00:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Jw4wr5u/bMQ+8Mg5l7jnnjM6HvuOqoF/MPTYPqGyvN0=; b=Er/5R0jxks3UChiwjzshiC7Oq4cVBmIKe/e54/BliOTPYJCj7iAEZB2SOSMNYBnfBj 0gIc6x3kT0KI3N8WQZGtvgnDaOSsa8zMbme4PPL5KNJl8x88/w7TbQyCjwRVgzEOWQcM Jwjvg1tFUyoT4ADk6UvnT09ws4s0nNpkqPcX8p0759J570LoDQIENxF3OJEd1srDG/rn zIOGA9GkOq6viWZNva8ERKjFAxFyPtn+Or8CoJycovsX3mX3CNy3vBc0z1SEMFxl9jhq PJ936A22gXodubTeFvJPXbKI09Se9WWXb0BoybcB0NN69GJXx6UPC16wHLeZKs5/oIgi Ykvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Jw4wr5u/bMQ+8Mg5l7jnnjM6HvuOqoF/MPTYPqGyvN0=; b=j8i4c+tBCpQxmdrU83bdqcBYtgL6DGaxScCbkKQ297AjDmEEMndGFXgF3Z5/BM/XCp 1+epa7E0DmWhq0UBn8wvSf87S98DGgO+aom8pSLf/AI5qjbG5xmP+ahUobue9fJOeA6u VUXw3arYHWRQO5weZoxZ+tWNK7B0axQRJI/GaXjaY6gJgP/w41YJVEZSVb8DAeLbbCaO 9JcMmdCLpWvQtsDWqA4UObJc3jIxulEHrn+BHk0zW/AR5zdzisBJi16CBavDV3LGQBHr a+Tk63RD5IoY68wmR5OpYIcdKly8mKBemRj4Fm9JyoNMaAV7plJCLzRwbdreRGf4Vw9j ASYw== X-Gm-Message-State: AOAM533M80uav9xlaoe3KK9ZDVpxoNLA97X/BSxg2XLISJ6nBJatJiau zt/a17Id8XQ1yQhsYRvFVRouvlP8fDpyOXpks7w= X-Google-Smtp-Source: ABdhPJzQudrPX3oAwlSlqCmD/d2aB0jX8IyeqZHbMG70gD1DBriAKw16cqE1Xazzv/3Y8EGXbGTePXUSosLvk9p1zmk= X-Received: by 2002:a5d:504d:: with SMTP id h13mr21657703wrt.132.1628002800036; Tue, 03 Aug 2021 08:00:00 -0700 (PDT) MIME-Version: 1.0 References: <20210803090704.32152-1-tzimmermann@suse.de> <20210803090704.32152-8-tzimmermann@suse.de> <1f5f285a-b923-16ff-2ca1-6f92e22ffcab@linaro.org> In-Reply-To: <1f5f285a-b923-16ff-2ca1-6f92e22ffcab@linaro.org> From: Rob Clark Date: Tue, 3 Aug 2021 08:04:13 -0700 Message-ID: Subject: Re: [PATCH v2 07/14] drm/msm: Convert to Linux IRQ interfaces To: Dmitry Baryshkov X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210803_080002_008247_6B58C0C8 X-CRM114-Status: GOOD ( 32.09 ) 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: , Cc: David Airlie , tomi.valkeinen@ideasonboard.com, Liviu Dudau , Stefan Agner , amd-gfx list , anitha.chrisanthus@intel.com, Sam Ravnborg , Dan.Sneddon@microchip.com, Patrik Jakobsson , linux-arm-msm , freedreno , Sascha Hauer , edmund.j.dea@intel.com, Sascha Hauer , alison.wang@nxp.com, Maarten Lankhorst , Maxime Ripard , dri-devel , Daniel Vetter , Sean Paul , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , tomba@kernel.org, Boris Brezillon , jyri.sarha@iki.fi, =?UTF-8?Q?Christian_K=C3=B6nig?= , Thomas Zimmermann , Alexander Deucher , Shawn Guo , Brian Starkey Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Aug 3, 2021 at 2:37 AM Dmitry Baryshkov wrote: > > 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. It looks ok.. I can't really test it this week, but it should be pretty obvious if it wasn't working BR, -R > > > --- > > 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