Skip to contentSkip to conversation

fixup! drm/i915/display: Remaining changes to make xe compile

PATCH In review Jani Nikula 3 participants 6 messages May 11, 2023 – May 12, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fixup! drm/i915/display: Remaining changes to make xe compile

I don't think the ifdef is needed anymore.

Cc Lucas De Marchi <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg_defs.h | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/i915_reg_defs.h +0 -4
index eac5a4141bfa..622d603080f9 100644
@@ -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))
 
Signature · 1 line
2.39.2
#1 lore raw

[Intel-xe] ✓ CI.Patch_applied: success for fixup! drm/i915/display: Remaining changes to make xe compile (rev2)

== Series Details ==

== Series Details ==

Series: fixup! drm/i915/display: Remaining changes to make xe compile (rev2)
URL : https://patchwork.freedesktop.org/series/117621/
State : success

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: === Base commit: ca8f59eea fixup! drm/xe/display: Add intel_pps support too === git am output follows ===
Applying: fixup! drm/i915/display: Remaining changes to make xe compile

#2 lore raw

[Intel-xe] ✗ CI.KUnit: failure for fixup! drm/i915/display: Remaining changes to make xe compile (rev2)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: fixup! drm/i915/display: Remaining changes to make xe compile (rev2)
URL : https://patchwork.freedesktop.org/series/117621/
State : failure

== Summary ==

+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig ERROR:root:make[1]: Entering directory '/kernel/.kunit'
***
*** The source tree is not clean, please run 'make ARCH=um mrproper'
*** in /kernel
***
make[1]: *** [/kernel/Makefile:646: outputmakefile] Error 1
make[1]: Leaving directory '/kernel/.kunit'
make: *** [Makefile:226: __sub-make] Error 2

[12:32:14] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:

$ make ARCH=um O=.kunit olddefconfig
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel
Reviewed-by on v1 1/1
#3 lore raw
In reply to Jani Nikula
Quoted 4 lines · Jani Nikula

I don't think the ifdef is needed anymore.

Cc Lucas De Marchi <[email protected]>

correct, it went away in a squash to drm/xe: Introduce a new DRM driver for Intel GPUs that removed the define

#define i915_mcr_reg_t i915_reg_t

(and the ifdef here was to workaround a compiler break due to that since
_Generic() would then be passed 2 identical types )

Lucas De Marchi

Quoted 24 lines

---
drivers/gpu/drm/i915/i915_reg_defs.h | 4 ----

1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/i915_reg_defs.h +0 -4
index eac5a4141bfa..622d603080f9 100644
@@ -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))
 
Signature · 1 line
2.39.2
#4 lore raw
Quoted 9 lines · Lucas De Marchi
Quoted 4 lines · Jani Nikula

I don't think the ifdef is needed anymore.

Cc Lucas De Marchi <[email protected]>

correct, it went away in a squash to drm/xe: Introduce a new DRM driver for Intel GPUs that removed the define

Quoted 6 lines

#define i915_mcr_reg_t i915_reg_t

(and the ifdef here was to workaround a compiler break due to that since
_Generic() would then be passed 2 identical types )

Thanks, pushed.

Quoted 28 lines

Lucas De Marchi

Quoted 24 lines

---
drivers/gpu/drm/i915/i915_reg_defs.h | 4 ----

1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/i915_reg_defs.h +0 -4
index eac5a4141bfa..622d603080f9 100644
@@ -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))
 
Signature · 1 line
2.39.2
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#5 lore raw

[Intel-xe] ✗ CI.Patch_applied: failure for fixup! drm/i915/display: Remaining changes to make xe compile (rev2)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: fixup! drm/i915/display: Remaining changes to make xe compile (rev2)
URL : https://patchwork.freedesktop.org/series/117621/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: === Base commit: a9affcc66 fixup! drm/i915/display: Remaining changes to make xe compile === git am output follows ===
error: patch failed: drivers/gpu/drm/i915/i915_reg_defs.h:231
error: drivers/gpu/drm/i915/i915_reg_defs.h: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: fixup! drm/i915/display: Remaining changes to make xe compile Patch failed at 0001 fixup! drm/i915/display: Remaining changes to make xe compile When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".