Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>,
	Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [Intel-xe] [PATCH] fixup! drm/i915/display: Remaining changes to make xe compile
Date: Thu, 11 May 2023 15:29:01 +0300	[thread overview]
Message-ID: <20230511122901.872670-1-jani.nikula@intel.com> (raw)

I don't think the ifdef is needed anymore.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_reg_defs.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg_defs.h b/drivers/gpu/drm/i915/i915_reg_defs.h
index eac5a4141bfa..622d603080f9 100644
--- a/drivers/gpu/drm/i915/i915_reg_defs.h
+++ b/drivers/gpu/drm/i915/i915_reg_defs.h
@@ -231,12 +231,8 @@ typedef struct {
  * simply operations on the register's offset and don't care about the MCR vs
  * non-MCR nature of the register.
  */
-#ifdef I915
 #define i915_mmio_reg_offset(r) \
 	_Generic((r), i915_reg_t: (r).reg, i915_mcr_reg_t: (r).reg)
-#else
-#define i915_mmio_reg_offset(r) ((r).reg)
-#endif
 #define i915_mmio_reg_equal(a, b) (i915_mmio_reg_offset(a) == i915_mmio_reg_offset(b))
 #define i915_mmio_reg_valid(r) (!i915_mmio_reg_equal(r, INVALID_MMIO_REG))
 
-- 
2.39.2


             reply	other threads:[~2023-05-11 12:29 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-11 12:29 Jani Nikula [this message]
2023-05-11 12:31 ` [Intel-xe] ✓ CI.Patch_applied: success for fixup! drm/i915/display: Remaining changes to make xe compile (rev2) Patchwork
2023-05-11 12:32 ` [Intel-xe] ✗ CI.KUnit: failure " Patchwork
2023-05-11 22:24 ` [Intel-xe] [PATCH] fixup! drm/i915/display: Remaining changes to make xe compile Lucas De Marchi
2023-05-12  7:28   ` Jani Nikula
2023-05-12  9:42 ` [Intel-xe] ✗ CI.Patch_applied: failure for fixup! drm/i915/display: Remaining changes to make xe compile (rev2) Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2023-08-03 10:53 [Intel-xe] [PATCH] fixup! drm/i915/display: Remaining changes to make xe compile Jani Nikula
2023-08-07 22:09 ` Rodrigo Vivi
2023-08-08  7:46   ` Jani Nikula
2023-05-11  9:28 Jani Nikula
2023-05-16 20:59 ` Rodrigo Vivi
2023-05-17  7:53   ` Jani Nikula

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=20230511122901.872670-1-jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=lucas.demarchi@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox