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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 EAEEFC11F67 for ; Tue, 29 Jun 2021 16:11:22 +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 AB4F861D94 for ; Tue, 29 Jun 2021 16:11:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB4F861D94 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 55C5D6E8C6; Tue, 29 Jun 2021 16:11:22 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3FF186E8C6; Tue, 29 Jun 2021 16:11:21 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10030"; a="205170316" X-IronPort-AV: E=Sophos;i="5.83,309,1616482800"; d="scan'208";a="205170316" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2021 09:10:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,309,1616482800"; d="scan'208";a="419649867" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by fmsmga007.fm.intel.com with SMTP; 29 Jun 2021 09:10:47 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 29 Jun 2021 19:10:46 +0300 Date: Tue, 29 Jun 2021 19:10:46 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Thomas Zimmermann Message-ID: References: <20210625084740.1586-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210625084740.1586-1-tzimmermann@suse.de> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH] drm/i915: Drop all references to DRM IRQ midlayer X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: airlied@linux.ie, intel-gfx@lists.freedesktop.org, chris@chris-wilson.co.uk, Daniel Vetter , dri-devel@lists.freedesktop.org, lucas.demarchi@intel.com Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Jun 25, 2021 at 10:47:40AM +0200, Thomas Zimmermann wrote: > Remove all references to DRM's IRQ midlayer. > = > The code in xcs_resume() probably didn't work as intended. It uses > struct drm_device.irq, which is allocated to 0, but never initialized > by i915 to the device's interrupt number. > = > Signed-off-by: Thomas Zimmermann > Fixes: 536f77b1caa0 ("drm/i915/gt: Call stop_ring() from ring resume, aga= in") > Cc: Chris Wilson > Cc: Mika Kuoppala > Cc: Daniel Vetter > Cc: Rodrigo Vivi > Cc: Joonas Lahtinen > Cc: Maarten Lankhorst > Cc: Lucas De Marchi > --- > drivers/gpu/drm/i915/gt/intel_ring_submission.c | 3 ++- > drivers/gpu/drm/i915/i915_drv.c | 1 - > drivers/gpu/drm/i915/i915_irq.c | 1 - > 3 files changed, 2 insertions(+), 3 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gp= u/drm/i915/gt/intel_ring_submission.c > index 5d42a12ef3d6..d893aaaed74f 100644 > --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c > +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c > @@ -180,12 +180,13 @@ static bool stop_ring(struct intel_engine_cs *engin= e) > static int xcs_resume(struct intel_engine_cs *engine) > { > struct intel_ring *ring =3D engine->legacy.ring; > + struct pci_dev *pdev =3D to_pci_dev(engine->i915->drm.dev); > = > ENGINE_TRACE(engine, "ring:{HEAD:%04x, TAIL:%04x}\n", > ring->head, ring->tail); > = > /* Double check the ring is empty & disabled before we resume */ > - synchronize_hardirq(engine->i915->drm.irq); > + synchronize_hardirq(pdev->irq); We have intel_synchronize_irq() to hide all these mundane details. Might want to add a matching intel_synchronize_hardirq(). > if (!stop_ring(engine)) > goto err; > = > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_= drv.c > index 850b499c71c8..73de45472f60 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -42,7 +42,6 @@ > #include > #include > #include > -#include > #include > #include > = > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_= irq.c > index a11bdb667241..eef616d96f12 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -33,7 +33,6 @@ > #include > = > #include > -#include > = > #include "display/intel_de.h" > #include "display/intel_display_types.h" > = > base-commit: 8c1323b422f8473421682ba783b5949ddd89a3f4 > prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d > prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24 > -- = > 2.32.0 -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx