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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B7660CD4F21 for ; Wed, 13 May 2026 13:54:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B40110E331; Wed, 13 May 2026 13:54:00 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="eAQuRpEt"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6B04B10E23D; Wed, 13 May 2026 13:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778680440; x=1810216440; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=v8mq8XInBTTOEiUdw/27rTNH6AdjyRgp8GCGJN0p89M=; b=eAQuRpEtX4JTWqREYoCPbpYvrTocaUzhBfkB3Osg1AeGr+xdZI8zH9KZ p/w2/y29bqYMpgzJ69L6Cs5iQ9x93z2jneyQ0I+X7slSs/MiJjxQyjVUj UCWQROHvQGjXR/uvkSIU5UVfRAypD8z/qgKzA4Pf1aRNUpx5d5cyRcMdb 2K5fBVU6H/Bjm0BFyJ7C275aS2DoT2+64CvCUJvZpdnW0MsPBhotjHOrV qtSBeDyX+Vtp3wi/J/3c8Ck70mpOf6rsqL6cJ2uMtEUG1gL6n8eG7zITu Q6t7b439BMEOFp5oFzzmtyLRREqvX8dE3D4zU3QiKPibGh3ozg3EZHOkv g==; X-CSE-ConnectionGUID: 57f33c9OSKWbkOE5tc3llw== X-CSE-MsgGUID: e0u7QWtqTX6voXvOeXiXaw== X-IronPort-AV: E=McAfee;i="6800,10657,11784"; a="67137022" X-IronPort-AV: E=Sophos;i="6.23,232,1770624000"; d="scan'208";a="67137022" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2026 06:53:59 -0700 X-CSE-ConnectionGUID: 45LbsvB5QrGrpOSZUHkI5w== X-CSE-MsgGUID: jhhZ2uIxS+C0+zGHA1eZEw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,232,1770624000"; d="scan'208";a="233640889" Received: from amilburn-desk.amilburn-desk (HELO localhost) ([10.245.244.10]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2026 06:53:58 -0700 Date: Wed, 13 May 2026 16:53:54 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: Re: [PATCH v3 1/6] drm/i915/irq: deduplicate dg1_de_irq_postinstall() and gen11_de_irq_postinstall() Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Patchwork-Hint: comment Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, May 13, 2026 at 01:10:06PM +0300, Jani Nikula wrote: > dg1_de_irq_postinstall() and gen11_de_irq_postinstall() are exactly the > same. Remove dg1_de_irq_postinstall() and call > gen11_de_irq_postinstall() instead. > > Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/display/intel_display_irq.c | 9 --------- > drivers/gpu/drm/i915/display/intel_display_irq.h | 1 - > drivers/gpu/drm/i915/i915_irq.c | 2 +- > 3 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c > index b5bfdebc66ca..bf4b5e7b6011 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_irq.c > +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c > @@ -2449,15 +2449,6 @@ void gen11_de_irq_postinstall(struct intel_display *display) > intel_de_write(display, GEN11_DISPLAY_INT_CTL, GEN11_DISPLAY_IRQ_ENABLE); > } > > -void dg1_de_irq_postinstall(struct intel_display *display) > -{ > - if (!HAS_DISPLAY(display)) > - return; > - > - gen8_de_irq_postinstall(display); > - intel_de_write(display, GEN11_DISPLAY_INT_CTL, GEN11_DISPLAY_IRQ_ENABLE); > -} > - > struct intel_display_irq_funcs { > void (*reset)(struct intel_display *display); > }; > diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.h b/drivers/gpu/drm/i915/display/intel_display_irq.h > index b25d180254d7..e2b1674fae06 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_irq.h > +++ b/drivers/gpu/drm/i915/display/intel_display_irq.h > @@ -71,7 +71,6 @@ void vlv_display_irq_postinstall(struct intel_display *display); > void ilk_de_irq_postinstall(struct intel_display *display); > void gen8_de_irq_postinstall(struct intel_display *display); > void gen11_de_irq_postinstall(struct intel_display *display); > -void dg1_de_irq_postinstall(struct intel_display *display); > > u32 i915_pipestat_enable_mask(struct intel_display *display, enum pipe pipe); > void i915_enable_pipestat(struct intel_display *display, enum pipe pipe, u32 status_mask); > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index d4d8dd0a4174..ef9eadf38a53 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -778,7 +778,7 @@ static void dg1_irq_postinstall(struct drm_i915_private *dev_priv) > > gen2_irq_init(uncore, GEN11_GU_MISC_IRQ_REGS, ~gu_misc_masked, gu_misc_masked); > > - dg1_de_irq_postinstall(display); > + gen11_de_irq_postinstall(display); > > dg1_master_intr_enable(intel_uncore_regs(uncore)); > intel_uncore_posting_read(uncore, DG1_MSTR_TILE_INTR); > -- > 2.47.3 -- Ville Syrjälä Intel