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 18ECEE9E301 for ; Wed, 11 Feb 2026 12:53:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9BE2C10E5BE; Wed, 11 Feb 2026 12:53:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="IlJjY5DM"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7328810E0C5; Wed, 11 Feb 2026 12:53:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1770814381; x=1802350381; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=B7VLOMEJbi8zZMAUzyo9I2Kx5QfUPCNRah1jxJLFQww=; b=IlJjY5DM/2jUTH7DTYTr0LL23FrIebsRkhc690feSb9csRWaHHmvwxNs DVHXGcHlqVBDa4WHxxs3aNyMXBBxVNe1klEeWgl1H40+y94gkSR3OBWz+ 3Mu6B22KlDrqx5TMO5zULa3QsKJZm9wcskQ07pPJYyQNMPbUPFf8yEw0i OSqfRBe1ipTB6hPLP0L8QQS3/feW2I0rCtVoFEa3ncnYsZBU7SkpoqukW Rhz2/gx9Bk5ogtaMCqw6c4qBV1vqWPypnicmrAquhSRsPat01uRdwpj1x 2QxNdFsdAeYEzj7I0/JOrNM/I57/MIcyLzBKN07qA075AETu6JPPi8hto A==; X-CSE-ConnectionGUID: W/8p7VPaSRuLDIErJeDFig== X-CSE-MsgGUID: apz4VwUFTq+2+Y1VQevgwQ== X-IronPort-AV: E=McAfee;i="6800,10657,11697"; a="94600548" X-IronPort-AV: E=Sophos;i="6.21,283,1763452800"; d="scan'208";a="94600548" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2026 04:53:01 -0800 X-CSE-ConnectionGUID: RgUS5e73QfWQRWuypW6hgg== X-CSE-MsgGUID: c/ZU5z+zT1iwkNR2m4XYzA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,283,1763452800"; d="scan'208";a="211276503" Received: from slindbla-desk.ger.corp.intel.com (HELO localhost) ([10.245.246.57]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2026 04:52:58 -0800 From: Jani Nikula To: Uma Shankar , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com, Uma Shankar Subject: Re: [v4 17/20] drm/i915: Remove i915_reg.h from intel_display_irq.c In-Reply-To: <20260205094341.1882816-18-uma.shankar@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland References: <20260205094341.1882816-1-uma.shankar@intel.com> <20260205094341.1882816-18-uma.shankar@intel.com> Date: Wed, 11 Feb 2026 14:52:55 +0200 Message-ID: <692326a47e13e3d1dcb73ea91cf8ec98b3d26118@intel.com> MIME-Version: 1.0 Content-Type: text/plain 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 Thu, 05 Feb 2026, Uma Shankar wrote: > Move VLV_IRQ_REGS to common header for interrupt to make > intel_display_irq.c free from including i915_reg.h. > > v2: Move interrupt to dedicated header (Jani) > > Signed-off-by: Uma Shankar Reviewed-by: Jani Nikula > --- > .../gpu/drm/i915/display/intel_display_irq.c | 1 - > .../gpu/drm/i915/display/intel_display_regs.h | 5 ++ > drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 + > drivers/gpu/drm/i915/gt/intel_rc6.c | 1 + > drivers/gpu/drm/i915/gvt/handlers.c | 1 + > drivers/gpu/drm/i915/gvt/interrupt.c | 1 + > drivers/gpu/drm/i915/i915_reg.h | 52 ------------------- > drivers/gpu/drm/i915/intel_clock_gating.c | 1 + > drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 + > drivers/gpu/drm/i915/vlv_suspend.c | 1 + > include/drm/intel/intel_gmd_interrupt_regs.h | 49 +++++++++++++++++ > 11 files changed, 63 insertions(+), 53 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c > index 432a9c895c39..bd0eb1f46919 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_irq.c > +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c > @@ -7,7 +7,6 @@ > #include > #include > > -#include "i915_reg.h" > #include "icl_dsi_regs.h" > #include "intel_crtc.h" > #include "intel_de.h" > diff --git a/drivers/gpu/drm/i915/display/intel_display_regs.h b/drivers/gpu/drm/i915/display/intel_display_regs.h > index dcb8cab7b30b..1c77a7de2d6e 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_regs.h > +++ b/drivers/gpu/drm/i915/display/intel_display_regs.h > @@ -1470,6 +1470,11 @@ > #define DE_PIPEA_FIFO_UNDERRUN (1 << 0) > #define DE_PIPE_FIFO_UNDERRUN(pipe) (1 << (8 * (pipe))) > > +/* Display Internal Timeout Register */ > +#define RM_TIMEOUT _MMIO(0x42060) > +#define RM_TIMEOUT_REG_CAPTURE _MMIO(0x420E0) > +#define MMIO_TIMEOUT_US(us) ((us) << 0) > + > #define GEN8_DE_MISC_ISR _MMIO(0x44460) > #define GEN8_DE_MISC_IMR _MMIO(0x44464) > #define GEN8_DE_MISC_IIR _MMIO(0x44468) > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_irq.c b/drivers/gpu/drm/i915/gt/intel_gt_irq.c > index 75e802e10be2..d85c849c0081 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_irq.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt_irq.c > @@ -5,6 +5,8 @@ > > #include > > +#include > + > #include "i915_drv.h" > #include "i915_irq.h" > #include "i915_reg.h" > diff --git a/drivers/gpu/drm/i915/gt/intel_rc6.c b/drivers/gpu/drm/i915/gt/intel_rc6.c > index 942ac1ebecee..5c316f734c4a 100644 > --- a/drivers/gpu/drm/i915/gt/intel_rc6.c > +++ b/drivers/gpu/drm/i915/gt/intel_rc6.c > @@ -8,6 +8,7 @@ > > #include > #include > +#include > > #include "display/vlv_clock.h" > #include "gem/i915_gem_region.h" > diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c > index 2e9d9d0638ae..4f65ced906da 100644 > --- a/drivers/gpu/drm/i915/gvt/handlers.c > +++ b/drivers/gpu/drm/i915/gvt/handlers.c > @@ -41,6 +41,7 @@ > #include > #include > #include > +#include > > #include "display/bxt_dpio_phy_regs.h" > #include "display/i9xx_plane_regs.h" > diff --git a/drivers/gpu/drm/i915/gvt/interrupt.c b/drivers/gpu/drm/i915/gvt/interrupt.c > index 91d22b1c62e2..f85113218037 100644 > --- a/drivers/gpu/drm/i915/gvt/interrupt.c > +++ b/drivers/gpu/drm/i915/gvt/interrupt.c > @@ -32,6 +32,7 @@ > #include > > #include > +#include > > #include "display/intel_display_regs.h" > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 5cb53a8c451a..7f3d5b7f7abd 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -335,9 +335,6 @@ > > #define VLV_GU_CTL0 _MMIO(VLV_DISPLAY_BASE + 0x2030) > #define VLV_GU_CTL1 _MMIO(VLV_DISPLAY_BASE + 0x2034) > -#define SCPD0 _MMIO(0x209c) /* 915+ only */ > -#define SCPD_FBC_IGNORE_3D (1 << 6) > -#define CSTATE_RENDER_CLOCK_GATE_DISABLE (1 << 5) > #define GEN2_IER _MMIO(0x20a0) > #define GEN2_IIR _MMIO(0x20a4) > #define GEN2_IMR _MMIO(0x20a8) > @@ -350,13 +347,6 @@ > #define GINT_DIS (1 << 22) > #define GCFG_DIS (1 << 8) > #define VLV_GUNIT_CLOCK_GATE2 _MMIO(VLV_DISPLAY_BASE + 0x2064) > -#define VLV_IIR_RW _MMIO(VLV_DISPLAY_BASE + 0x2084) > -#define VLV_IER _MMIO(VLV_DISPLAY_BASE + 0x20a0) > -#define VLV_IIR _MMIO(VLV_DISPLAY_BASE + 0x20a4) > -#define VLV_IMR _MMIO(VLV_DISPLAY_BASE + 0x20a8) > -#define VLV_ISR _MMIO(VLV_DISPLAY_BASE + 0x20ac) > -#define VLV_PCBR _MMIO(VLV_DISPLAY_BASE + 0x2120) > -#define VLV_PCBR_ADDR_SHIFT 12 > > #define EIR _MMIO(0x20b0) > #define EMR _MMIO(0x20b4) > @@ -682,11 +672,6 @@ > #define PCH_3DCGDIS1 _MMIO(0x46024) > # define VFMUNIT_CLOCK_GATE_DISABLE (1 << 11) > > -/* Display Internal Timeout Register */ > -#define RM_TIMEOUT _MMIO(0x42060) > -#define RM_TIMEOUT_REG_CAPTURE _MMIO(0x420E0) > -#define MMIO_TIMEOUT_US(us) ((us) << 0) > - > #define VLV_MASTER_IER _MMIO(0x4400c) /* Gunit master IER */ > #define MASTER_INTERRUPT_ENABLE (1 << 31) > > @@ -699,24 +684,6 @@ > GTIER, \ > GTIIR) > > -#define GEN8_MASTER_IRQ _MMIO(0x44200) > -#define GEN8_MASTER_IRQ_CONTROL (1 << 31) > -#define GEN8_PCU_IRQ (1 << 30) > -#define GEN8_DE_PCH_IRQ (1 << 23) > -#define GEN8_DE_MISC_IRQ (1 << 22) > -#define GEN8_DE_PORT_IRQ (1 << 20) > -#define GEN8_DE_PIPE_C_IRQ (1 << 18) > -#define GEN8_DE_PIPE_B_IRQ (1 << 17) > -#define GEN8_DE_PIPE_A_IRQ (1 << 16) > -#define GEN8_DE_PIPE_IRQ(pipe) (1 << (16 + (pipe))) > -#define GEN8_GT_VECS_IRQ (1 << 6) > -#define GEN8_GT_GUC_IRQ (1 << 5) > -#define GEN8_GT_PM_IRQ (1 << 4) > -#define GEN8_GT_VCS1_IRQ (1 << 3) /* NB: VCS2 in bspec! */ > -#define GEN8_GT_VCS0_IRQ (1 << 2) /* NB: VCS1 in bpsec! */ > -#define GEN8_GT_BCS_IRQ (1 << 1) > -#define GEN8_GT_RCS_IRQ (1 << 0) > - > #define GEN8_GT_ISR(which) _MMIO(0x44300 + (0x10 * (which))) > #define GEN8_GT_IMR(which) _MMIO(0x44304 + (0x10 * (which))) > #define GEN8_GT_IIR(which) _MMIO(0x44308 + (0x10 * (which))) > @@ -742,25 +709,6 @@ > GEN8_PCU_IER, \ > GEN8_PCU_IIR) > > -#define GEN11_GU_MISC_ISR _MMIO(0x444f0) > -#define GEN11_GU_MISC_IMR _MMIO(0x444f4) > -#define GEN11_GU_MISC_IIR _MMIO(0x444f8) > -#define GEN11_GU_MISC_IER _MMIO(0x444fc) > -#define GEN11_GU_MISC_GSE (1 << 27) > - > -#define GEN11_GU_MISC_IRQ_REGS I915_IRQ_REGS(GEN11_GU_MISC_IMR, \ > - GEN11_GU_MISC_IER, \ > - GEN11_GU_MISC_IIR) > - > -#define GEN11_GFX_MSTR_IRQ _MMIO(0x190010) > -#define GEN11_MASTER_IRQ (1 << 31) > -#define GEN11_PCU_IRQ (1 << 30) > -#define GEN11_GU_MISC_IRQ (1 << 29) > -#define GEN11_DISPLAY_IRQ (1 << 16) > -#define GEN11_GT_DW_IRQ(x) (1 << (x)) > -#define GEN11_GT_DW1_IRQ (1 << 1) > -#define GEN11_GT_DW0_IRQ (1 << 0) > - > #define DG1_MSTR_TILE_INTR _MMIO(0x190008) > #define DG1_MSTR_IRQ REG_BIT(31) > #define DG1_MSTR_TILE(t) REG_BIT(t) > diff --git a/drivers/gpu/drm/i915/intel_clock_gating.c b/drivers/gpu/drm/i915/intel_clock_gating.c > index 1ad31435bd3f..d0400ea2ffc7 100644 > --- a/drivers/gpu/drm/i915/intel_clock_gating.c > +++ b/drivers/gpu/drm/i915/intel_clock_gating.c > @@ -27,6 +27,7 @@ > > #include > #include > +#include > > #include "display/i9xx_plane_regs.h" > #include "display/intel_display.h" > diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c > index c8a51e773086..ae42818ab6e0 100644 > --- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c > +++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c > @@ -6,6 +6,8 @@ > #include > #include > > +#include > + > #include "display/bxt_dpio_phy_regs.h" > #include "display/i9xx_plane_regs.h" > #include "display/i9xx_wm_regs.h" > diff --git a/drivers/gpu/drm/i915/vlv_suspend.c b/drivers/gpu/drm/i915/vlv_suspend.c > index bace7b38329b..1e4343fe5574 100644 > --- a/drivers/gpu/drm/i915/vlv_suspend.c > +++ b/drivers/gpu/drm/i915/vlv_suspend.c > @@ -7,6 +7,7 @@ > #include > > #include > +#include > > #include "gt/intel_gt_regs.h" > > diff --git a/include/drm/intel/intel_gmd_interrupt_regs.h b/include/drm/intel/intel_gmd_interrupt_regs.h > index dc9d5fc29ff6..ce66c4151e76 100644 > --- a/include/drm/intel/intel_gmd_interrupt_regs.h > +++ b/include/drm/intel/intel_gmd_interrupt_regs.h > @@ -40,4 +40,53 @@ > #define I915_ASLE_INTERRUPT (1 << 0) > #define I915_BSD_USER_INTERRUPT (1 << 25) > > +#define GEN8_MASTER_IRQ _MMIO(0x44200) > +#define GEN8_MASTER_IRQ_CONTROL (1 << 31) > +#define GEN8_PCU_IRQ (1 << 30) > +#define GEN8_DE_PCH_IRQ (1 << 23) > +#define GEN8_DE_MISC_IRQ (1 << 22) > +#define GEN8_DE_PORT_IRQ (1 << 20) > +#define GEN8_DE_PIPE_C_IRQ (1 << 18) > +#define GEN8_DE_PIPE_B_IRQ (1 << 17) > +#define GEN8_DE_PIPE_A_IRQ (1 << 16) > +#define GEN8_DE_PIPE_IRQ(pipe) (1 << (16 + (pipe))) > +#define GEN8_GT_VECS_IRQ (1 << 6) > +#define GEN8_GT_GUC_IRQ (1 << 5) > +#define GEN8_GT_PM_IRQ (1 << 4) > +#define GEN8_GT_VCS1_IRQ (1 << 3) /* NB: VCS2 in bspec! */ > +#define GEN8_GT_VCS0_IRQ (1 << 2) /* NB: VCS1 in bpsec! */ > +#define GEN8_GT_BCS_IRQ (1 << 1) > +#define GEN8_GT_RCS_IRQ (1 << 0) > + > +#define GEN11_GU_MISC_ISR _MMIO(0x444f0) > +#define GEN11_GU_MISC_IMR _MMIO(0x444f4) > +#define GEN11_GU_MISC_IIR _MMIO(0x444f8) > +#define GEN11_GU_MISC_IER _MMIO(0x444fc) > +#define GEN11_GU_MISC_GSE (1 << 27) > + > +#define GEN11_GU_MISC_IRQ_REGS I915_IRQ_REGS(GEN11_GU_MISC_IMR, \ > + GEN11_GU_MISC_IER, \ > + GEN11_GU_MISC_IIR) > + > +#define GEN11_GFX_MSTR_IRQ _MMIO(0x190010) > +#define GEN11_MASTER_IRQ (1 << 31) > +#define GEN11_PCU_IRQ (1 << 30) > +#define GEN11_GU_MISC_IRQ (1 << 29) > +#define GEN11_DISPLAY_IRQ (1 << 16) > +#define GEN11_GT_DW_IRQ(x) (1 << (x)) > +#define GEN11_GT_DW1_IRQ (1 << 1) > +#define GEN11_GT_DW0_IRQ (1 << 0) > + > +#define SCPD0 _MMIO(0x209c) /* 915+ only */ > +#define SCPD_FBC_IGNORE_3D (1 << 6) > +#define CSTATE_RENDER_CLOCK_GATE_DISABLE (1 << 5) > + > +#define VLV_IIR_RW _MMIO(VLV_DISPLAY_BASE + 0x2084) > +#define VLV_IER _MMIO(VLV_DISPLAY_BASE + 0x20a0) > +#define VLV_IIR _MMIO(VLV_DISPLAY_BASE + 0x20a4) > +#define VLV_IMR _MMIO(VLV_DISPLAY_BASE + 0x20a8) > +#define VLV_ISR _MMIO(VLV_DISPLAY_BASE + 0x20ac) > +#define VLV_PCBR _MMIO(VLV_DISPLAY_BASE + 0x2120) > +#define VLV_PCBR_ADDR_SHIFT 12 > + > #endif -- Jani Nikula, Intel