From: Jani Nikula <jani.nikula@intel.com>
To: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Subject: Re: [PATCH 2/2] drm/i915: move FBC_RT_BASE register macros to intel_gt_regs.h
Date: Fri, 20 Nov 2026 16:38:27 +0200 [thread overview]
Message-ID: <8fbc6c44d165f967e85e7431c59efd3575e79bee@intel.com> (raw)
In-Reply-To: <av8X3kGJ99JEAT0u@intel.com>
On Thu, 19 Nov 2026, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Thu, Nov 19, 2026 at 05:16:44PM +0200, Jani Nikula wrote:
>> The FBC_RT_BASE registers are in the SVL unit, not display. Move them to
>> intel_gt_regs.h, and reducing display includes from i915 core in the
>> process.
>
> Yeah, we don't use the FBC hardware render tracking so we have no
> need for these in the display code. I was worried we might still be
> writing them anyway, but looks like I removed all that in
> commit b339088d81c8 ("drm/i915: Don't write IVB_FBC_RT_BASE") and
> commit 644398586f00 ("drm/i915/fbc: Remove the FBC_RT_BASE setup for
> ILK/SNB")
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Thanks, pushed both to din.
>
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/display/intel_fbc_regs.h | 7 -------
>> drivers/gpu/drm/i915/gt/intel_gt_regs.h | 7 +++++++
>> drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 --
>> 3 files changed, 7 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_fbc_regs.h b/drivers/gpu/drm/i915/display/intel_fbc_regs.h
>> index 4178e602d7d7..3ce018ebb27c 100644
>> --- a/drivers/gpu/drm/i915/display/intel_fbc_regs.h
>> +++ b/drivers/gpu/drm/i915/display/intel_fbc_regs.h
>> @@ -111,19 +111,12 @@
>> #define XE3_FBC_DIRTY_CTL(fbc_id) _MMIO_PIPE((fbc_id), 0x43234, 0x43274)
>> #define FBC_DIRTY_RECT_EN REG_BIT(31)
>>
>> -#define ILK_FBC_RT_BASE _MMIO(0x2128)
>> -#define ILK_FBC_RT_VALID REG_BIT(0)
>> -#define SNB_FBC_FRONT_BUFFER REG_BIT(1)
>> -
>> #define SNB_DPFC_CTL_SA _MMIO(0x100100)
>> #define SNB_DPFC_FENCE_EN REG_BIT(29)
>> #define SNB_DPFC_FENCENO_MASK REG_GENMASK(4, 0)
>> #define SNB_DPFC_FENCENO(fence) REG_FIELD_PREP(SNB_DPFC_FENCENO_MASK, (fence))
>> #define SNB_DPFC_CPU_FENCE_OFFSET _MMIO(0x100104)
>>
>> -#define IVB_FBC_RT_BASE _MMIO(0x7020)
>> -#define IVB_FBC_RT_BASE_UPPER _MMIO(0x7024)
>> -
>> #define MSG_FBC_REND_STATE(fbc_id) _MMIO_PIPE((fbc_id), 0x50380, 0x50384)
>> #define FBC_REND_NUKE REG_BIT(2)
>> #define FBC_REND_CACHE_CLEAN REG_BIT(1)
>> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
>> index 3ba9b2206b79..7b892fa50088 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h
>> +++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
>> @@ -202,6 +202,10 @@
>> #define CM0_DEPTH_WRITE_DISABLE (1 << 1)
>> #define CM0_RC_OP_FLUSH_DISABLE (1 << 0)
>>
>> +#define ILK_FBC_RT_BASE _MMIO(0x2128)
>> +#define ILK_FBC_RT_VALID REG_BIT(0)
>> +#define SNB_FBC_FRONT_BUFFER REG_BIT(1)
>> +
>> #define GFX_FLSH_CNTL _MMIO(0x2170) /* 915+ only */
>>
>> /*
>> @@ -471,6 +475,9 @@
>> #define HZ_DEPTH_TEST_LE_GE_OPT_DISABLE REG_BIT(13)
>> #define BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE REG_BIT(3)
>>
>> +#define IVB_FBC_RT_BASE _MMIO(0x7020)
>> +#define IVB_FBC_RT_BASE_UPPER _MMIO(0x7024)
>> +
>> #define XEHP_CULLBIT2 MCR_REG(0x7030)
>>
>> #define GEN8_L3CNTLREG _MMIO(0x7034)
>> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
>> index 24ea5d8d529c..a2f00fc8589d 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
>> @@ -20,8 +20,6 @@
>> #include "intel_ring.h"
>> #include "intel_workarounds.h"
>>
>> -#include "display/intel_fbc_regs.h"
>> -
>> /**
>> * DOC: Hardware workarounds
>> *
>> --
>> 2.47.3
--
Jani Nikula, Intel
next prev parent reply other threads:[~2026-11-20 14:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 15:16 [PATCH 1/2] drm/i915: drop unnecessary display/ includes Jani Nikula
2026-11-19 15:16 ` [PATCH 2/2] drm/i915: move FBC_RT_BASE register macros to intel_gt_regs.h Jani Nikula
2026-11-19 15:38 ` Ville Syrjälä
2026-11-20 14:38 ` Jani Nikula [this message]
2026-11-19 15:24 ` [PATCH 1/2] drm/i915: drop unnecessary display/ includes sashiko-bot
2026-11-19 16:30 ` ✓ CI.KUnit: success for series starting with [1/2] " Patchwork
2026-11-19 16:37 ` [PATCH 1/2] " Ville Syrjälä
2026-11-19 17:07 ` ✓ Xe.CI.BAT: success for series starting with [1/2] " Patchwork
2026-11-19 18:17 ` ✓ i915.CI.BAT: " Patchwork
2026-11-20 19:43 ` ✗ i915.CI.Full: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8fbc6c44d165f967e85e7431c59efd3575e79bee@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.