* [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
@ 2018-01-29 8:33 Lionel Landwerlin
2018-01-29 8:53 ` ✓ Fi.CI.BAT: success for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Lionel Landwerlin @ 2018-01-29 8:33 UTC (permalink / raw)
To: intel-gfx
This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
Conflicts:
drivers/gpu/drm/i915/i915_pci.c
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
drivers/gpu/drm/i915/i915_pci.c | 96 ++++++++++++++++++++---------------------
1 file changed, 48 insertions(+), 48 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index f28c165fc49d..138228dd7782 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -74,19 +74,19 @@
GEN_DEFAULT_PAGE_SIZES, \
CURSOR_OFFSETS
-static const struct intel_device_info intel_i830_info __initconst = {
+static const struct intel_device_info intel_i830_info = {
GEN2_FEATURES,
.platform = INTEL_I830,
.is_mobile = 1, .cursor_needs_physical = 1,
.num_pipes = 2, /* legal, last one wins */
};
-static const struct intel_device_info intel_i845g_info __initconst = {
+static const struct intel_device_info intel_i845g_info = {
GEN2_FEATURES,
.platform = INTEL_I845G,
};
-static const struct intel_device_info intel_i85x_info __initconst = {
+static const struct intel_device_info intel_i85x_info = {
GEN2_FEATURES,
.platform = INTEL_I85X, .is_mobile = 1,
.num_pipes = 2, /* legal, last one wins */
@@ -94,7 +94,7 @@ static const struct intel_device_info intel_i85x_info __initconst = {
.has_fbc = 1,
};
-static const struct intel_device_info intel_i865g_info __initconst = {
+static const struct intel_device_info intel_i865g_info = {
GEN2_FEATURES,
.platform = INTEL_I865G,
};
@@ -108,7 +108,7 @@ static const struct intel_device_info intel_i865g_info __initconst = {
GEN_DEFAULT_PAGE_SIZES, \
CURSOR_OFFSETS
-static const struct intel_device_info intel_i915g_info __initconst = {
+static const struct intel_device_info intel_i915g_info = {
GEN3_FEATURES,
.platform = INTEL_I915G, .cursor_needs_physical = 1,
.has_overlay = 1, .overlay_needs_physical = 1,
@@ -116,7 +116,7 @@ static const struct intel_device_info intel_i915g_info __initconst = {
.unfenced_needs_alignment = 1,
};
-static const struct intel_device_info intel_i915gm_info __initconst = {
+static const struct intel_device_info intel_i915gm_info = {
GEN3_FEATURES,
.platform = INTEL_I915GM,
.is_mobile = 1,
@@ -128,7 +128,7 @@ static const struct intel_device_info intel_i915gm_info __initconst = {
.unfenced_needs_alignment = 1,
};
-static const struct intel_device_info intel_i945g_info __initconst = {
+static const struct intel_device_info intel_i945g_info = {
GEN3_FEATURES,
.platform = INTEL_I945G,
.has_hotplug = 1, .cursor_needs_physical = 1,
@@ -137,7 +137,7 @@ static const struct intel_device_info intel_i945g_info __initconst = {
.unfenced_needs_alignment = 1,
};
-static const struct intel_device_info intel_i945gm_info __initconst = {
+static const struct intel_device_info intel_i945gm_info = {
GEN3_FEATURES,
.platform = INTEL_I945GM, .is_mobile = 1,
.has_hotplug = 1, .cursor_needs_physical = 1,
@@ -148,14 +148,14 @@ static const struct intel_device_info intel_i945gm_info __initconst = {
.unfenced_needs_alignment = 1,
};
-static const struct intel_device_info intel_g33_info __initconst = {
+static const struct intel_device_info intel_g33_info = {
GEN3_FEATURES,
.platform = INTEL_G33,
.has_hotplug = 1,
.has_overlay = 1,
};
-static const struct intel_device_info intel_pineview_info __initconst = {
+static const struct intel_device_info intel_pineview_info = {
GEN3_FEATURES,
.platform = INTEL_PINEVIEW, .is_mobile = 1,
.has_hotplug = 1,
@@ -172,7 +172,7 @@ static const struct intel_device_info intel_pineview_info __initconst = {
GEN_DEFAULT_PAGE_SIZES, \
CURSOR_OFFSETS
-static const struct intel_device_info intel_i965g_info __initconst = {
+static const struct intel_device_info intel_i965g_info = {
GEN4_FEATURES,
.platform = INTEL_I965G,
.has_overlay = 1,
@@ -180,7 +180,7 @@ static const struct intel_device_info intel_i965g_info __initconst = {
.has_snoop = false,
};
-static const struct intel_device_info intel_i965gm_info __initconst = {
+static const struct intel_device_info intel_i965gm_info = {
GEN4_FEATURES,
.platform = INTEL_I965GM,
.is_mobile = 1, .has_fbc = 1,
@@ -190,13 +190,13 @@ static const struct intel_device_info intel_i965gm_info __initconst = {
.has_snoop = false,
};
-static const struct intel_device_info intel_g45_info __initconst = {
+static const struct intel_device_info intel_g45_info = {
GEN4_FEATURES,
.platform = INTEL_G45,
.ring_mask = RENDER_RING | BSD_RING,
};
-static const struct intel_device_info intel_gm45_info __initconst = {
+static const struct intel_device_info intel_gm45_info = {
GEN4_FEATURES,
.platform = INTEL_GM45,
.is_mobile = 1, .has_fbc = 1,
@@ -215,12 +215,12 @@ static const struct intel_device_info intel_gm45_info __initconst = {
GEN_DEFAULT_PAGE_SIZES, \
CURSOR_OFFSETS
-static const struct intel_device_info intel_ironlake_d_info __initconst = {
+static const struct intel_device_info intel_ironlake_d_info = {
GEN5_FEATURES,
.platform = INTEL_IRONLAKE,
};
-static const struct intel_device_info intel_ironlake_m_info __initconst = {
+static const struct intel_device_info intel_ironlake_m_info = {
GEN5_FEATURES,
.platform = INTEL_IRONLAKE,
.is_mobile = 1, .has_fbc = 1,
@@ -243,12 +243,12 @@ static const struct intel_device_info intel_ironlake_m_info __initconst = {
GEN6_FEATURES, \
.platform = INTEL_SANDYBRIDGE
-static const struct intel_device_info intel_sandybridge_d_gt1_info __initconst = {
+static const struct intel_device_info intel_sandybridge_d_gt1_info = {
SNB_D_PLATFORM,
.gt = 1,
};
-static const struct intel_device_info intel_sandybridge_d_gt2_info __initconst = {
+static const struct intel_device_info intel_sandybridge_d_gt2_info = {
SNB_D_PLATFORM,
.gt = 2,
};
@@ -259,12 +259,12 @@ static const struct intel_device_info intel_sandybridge_d_gt2_info __initconst =
.is_mobile = 1
-static const struct intel_device_info intel_sandybridge_m_gt1_info __initconst = {
+static const struct intel_device_info intel_sandybridge_m_gt1_info = {
SNB_M_PLATFORM,
.gt = 1,
};
-static const struct intel_device_info intel_sandybridge_m_gt2_info __initconst = {
+static const struct intel_device_info intel_sandybridge_m_gt2_info = {
SNB_M_PLATFORM,
.gt = 2,
};
@@ -288,12 +288,12 @@ static const struct intel_device_info intel_sandybridge_m_gt2_info __initconst =
.platform = INTEL_IVYBRIDGE, \
.has_l3_dpf = 1
-static const struct intel_device_info intel_ivybridge_d_gt1_info __initconst = {
+static const struct intel_device_info intel_ivybridge_d_gt1_info = {
IVB_D_PLATFORM,
.gt = 1,
};
-static const struct intel_device_info intel_ivybridge_d_gt2_info __initconst = {
+static const struct intel_device_info intel_ivybridge_d_gt2_info = {
IVB_D_PLATFORM,
.gt = 2,
};
@@ -304,17 +304,17 @@ static const struct intel_device_info intel_ivybridge_d_gt2_info __initconst = {
.is_mobile = 1, \
.has_l3_dpf = 1
-static const struct intel_device_info intel_ivybridge_m_gt1_info __initconst = {
+static const struct intel_device_info intel_ivybridge_m_gt1_info = {
IVB_M_PLATFORM,
.gt = 1,
};
-static const struct intel_device_info intel_ivybridge_m_gt2_info __initconst = {
+static const struct intel_device_info intel_ivybridge_m_gt2_info = {
IVB_M_PLATFORM,
.gt = 2,
};
-static const struct intel_device_info intel_ivybridge_q_info __initconst = {
+static const struct intel_device_info intel_ivybridge_q_info = {
GEN7_FEATURES,
.platform = INTEL_IVYBRIDGE,
.gt = 2,
@@ -322,7 +322,7 @@ static const struct intel_device_info intel_ivybridge_q_info __initconst = {
.has_l3_dpf = 1,
};
-static const struct intel_device_info intel_valleyview_info __initconst = {
+static const struct intel_device_info intel_valleyview_info = {
.platform = INTEL_VALLEYVIEW,
.gen = 7,
.is_lp = 1,
@@ -358,17 +358,17 @@ static const struct intel_device_info intel_valleyview_info __initconst = {
.platform = INTEL_HASWELL, \
.has_l3_dpf = 1
-static const struct intel_device_info intel_haswell_gt1_info __initconst = {
+static const struct intel_device_info intel_haswell_gt1_info = {
HSW_PLATFORM,
.gt = 1,
};
-static const struct intel_device_info intel_haswell_gt2_info __initconst = {
+static const struct intel_device_info intel_haswell_gt2_info = {
HSW_PLATFORM,
.gt = 2,
};
-static const struct intel_device_info intel_haswell_gt3_info __initconst = {
+static const struct intel_device_info intel_haswell_gt3_info = {
HSW_PLATFORM,
.gt = 3,
};
@@ -388,17 +388,17 @@ static const struct intel_device_info intel_haswell_gt3_info __initconst = {
.gen = 8, \
.platform = INTEL_BROADWELL
-static const struct intel_device_info intel_broadwell_gt1_info __initconst = {
+static const struct intel_device_info intel_broadwell_gt1_info = {
BDW_PLATFORM,
.gt = 1,
};
-static const struct intel_device_info intel_broadwell_gt2_info __initconst = {
+static const struct intel_device_info intel_broadwell_gt2_info = {
BDW_PLATFORM,
.gt = 2,
};
-static const struct intel_device_info intel_broadwell_rsvd_info __initconst = {
+static const struct intel_device_info intel_broadwell_rsvd_info = {
BDW_PLATFORM,
.gt = 3,
/* According to the device ID those devices are GT3, they were
@@ -406,13 +406,13 @@ static const struct intel_device_info intel_broadwell_rsvd_info __initconst = {
*/
};
-static const struct intel_device_info intel_broadwell_gt3_info __initconst = {
+static const struct intel_device_info intel_broadwell_gt3_info = {
BDW_PLATFORM,
.gt = 3,
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
};
-static const struct intel_device_info intel_cherryview_info __initconst = {
+static const struct intel_device_info intel_cherryview_info = {
.gen = 8, .num_pipes = 3,
.has_hotplug = 1,
.is_lp = 1,
@@ -455,12 +455,12 @@ static const struct intel_device_info intel_cherryview_info __initconst = {
.gen = 9, \
.platform = INTEL_SKYLAKE
-static const struct intel_device_info intel_skylake_gt1_info __initconst = {
+static const struct intel_device_info intel_skylake_gt1_info = {
SKL_PLATFORM,
.gt = 1,
};
-static const struct intel_device_info intel_skylake_gt2_info __initconst = {
+static const struct intel_device_info intel_skylake_gt2_info = {
SKL_PLATFORM,
.gt = 2,
};
@@ -470,12 +470,12 @@ static const struct intel_device_info intel_skylake_gt2_info __initconst = {
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING
-static const struct intel_device_info intel_skylake_gt3_info __initconst = {
+static const struct intel_device_info intel_skylake_gt3_info = {
SKL_GT3_PLUS_PLATFORM,
.gt = 3,
};
-static const struct intel_device_info intel_skylake_gt4_info __initconst = {
+static const struct intel_device_info intel_skylake_gt4_info = {
SKL_GT3_PLUS_PLATFORM,
.gt = 4,
};
@@ -511,13 +511,13 @@ static const struct intel_device_info intel_skylake_gt4_info __initconst = {
IVB_CURSOR_OFFSETS, \
BDW_COLORS
-static const struct intel_device_info intel_broxton_info __initconst = {
+static const struct intel_device_info intel_broxton_info = {
GEN9_LP_FEATURES,
.platform = INTEL_BROXTON,
.ddb_size = 512,
};
-static const struct intel_device_info intel_geminilake_info __initconst = {
+static const struct intel_device_info intel_geminilake_info = {
GEN9_LP_FEATURES,
.platform = INTEL_GEMINILAKE,
.ddb_size = 1024,
@@ -529,17 +529,17 @@ static const struct intel_device_info intel_geminilake_info __initconst = {
.gen = 9, \
.platform = INTEL_KABYLAKE
-static const struct intel_device_info intel_kabylake_gt1_info __initconst = {
+static const struct intel_device_info intel_kabylake_gt1_info = {
KBL_PLATFORM,
.gt = 1,
};
-static const struct intel_device_info intel_kabylake_gt2_info __initconst = {
+static const struct intel_device_info intel_kabylake_gt2_info = {
KBL_PLATFORM,
.gt = 2,
};
-static const struct intel_device_info intel_kabylake_gt3_info __initconst = {
+static const struct intel_device_info intel_kabylake_gt3_info = {
KBL_PLATFORM,
.gt = 3,
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
@@ -550,17 +550,17 @@ static const struct intel_device_info intel_kabylake_gt3_info __initconst = {
.gen = 9, \
.platform = INTEL_COFFEELAKE
-static const struct intel_device_info intel_coffeelake_gt1_info __initconst = {
+static const struct intel_device_info intel_coffeelake_gt1_info = {
CFL_PLATFORM,
.gt = 1,
};
-static const struct intel_device_info intel_coffeelake_gt2_info __initconst = {
+static const struct intel_device_info intel_coffeelake_gt2_info = {
CFL_PLATFORM,
.gt = 2,
};
-static const struct intel_device_info intel_coffeelake_gt3_info __initconst = {
+static const struct intel_device_info intel_coffeelake_gt3_info = {
CFL_PLATFORM,
.gt = 3,
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
@@ -571,7 +571,7 @@ static const struct intel_device_info intel_coffeelake_gt3_info __initconst = {
.ddb_size = 1024, \
GLK_COLORS
-static const struct intel_device_info intel_cannonlake_gt2_info __initconst = {
+static const struct intel_device_info intel_cannonlake_gt2_info = {
GEN10_FEATURES,
.is_alpha_support = 1,
.platform = INTEL_CANNONLAKE,
@@ -585,7 +585,7 @@ static const struct intel_device_info intel_cannonlake_gt2_info __initconst = {
.ddb_size = 2048, \
.has_csr = 0
-static const struct intel_device_info intel_icelake_11_info __initconst = {
+static const struct intel_device_info intel_icelake_11_info = {
GEN11_FEATURES,
.platform = INTEL_ICELAKE,
.is_alpha_support = 1,
--
2.15.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread
* ✓ Fi.CI.BAT: success for Revert "drm/i915: mark all device info struct with __initconst"
2018-01-29 8:33 [PATCH] Revert "drm/i915: mark all device info struct with __initconst" Lionel Landwerlin
@ 2018-01-29 8:53 ` Patchwork
2018-01-29 9:00 ` [PATCH] " Chris Wilson
` (2 subsequent siblings)
3 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2018-01-29 8:53 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: intel-gfx
== Series Details ==
Series: Revert "drm/i915: mark all device info struct with __initconst"
URL : https://patchwork.freedesktop.org/series/37260/
State : success
== Summary ==
Series 37260v1 Revert "drm/i915: mark all device info struct with __initconst"
https://patchwork.freedesktop.org/api/1.0/series/37260/revisions/1/mbox/
Test debugfs_test:
Subgroup read_all_entries:
dmesg-fail -> DMESG-WARN (fi-elk-e7500) fdo#103989
fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:418s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:424s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:373s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:482s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:280s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:481s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:483s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:473s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:455s
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:573s
fi-elk-e7500 total:224 pass:168 dwarn:10 dfail:0 fail:0 skip:45
fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:279s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:513s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:390s
fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:401s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:410s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:459s
fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:415s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:458s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:500s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:452s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:502s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:583s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:429s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:508s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:528s
fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:484s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:484s
fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:421s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:433s
fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:526s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:400s
Blacklisted hosts:
fi-cnl-y2 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:530s
fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:470s
59275f1cec1d31adab39ddb6ab948519ac8ddffb drm-tip: 2018y-01m-26d-13h-05m-14s UTC integration manifest
ede31d66330c Revert "drm/i915: mark all device info struct with __initconst"
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7804/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
2018-01-29 8:33 [PATCH] Revert "drm/i915: mark all device info struct with __initconst" Lionel Landwerlin
2018-01-29 8:53 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-01-29 9:00 ` Chris Wilson
2018-01-29 10:34 ` Tvrtko Ursulin
2018-01-29 9:02 ` Chris Wilson
2018-01-29 10:32 ` ✗ Fi.CI.IGT: failure for " Patchwork
3 siblings, 1 reply; 13+ messages in thread
From: Chris Wilson @ 2018-01-29 9:00 UTC (permalink / raw)
To: Lionel Landwerlin, intel-gfx
Quoting Lionel Landwerlin (2018-01-29 08:33:46)
> This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
>
> Conflicts:
> drivers/gpu/drm/i915/i915_pci.c
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Mea culpa, completely didn't realise post-module init loading was a
thing.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
It's still on the low hanging fruit list for reducing our bloat. Ideas?
i915_pcidata.ko? How far could we go with that, make all gen specific
code a separate section and unload them after init?
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
2018-01-29 8:33 [PATCH] Revert "drm/i915: mark all device info struct with __initconst" Lionel Landwerlin
2018-01-29 8:53 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-01-29 9:00 ` [PATCH] " Chris Wilson
@ 2018-01-29 9:02 ` Chris Wilson
2018-01-29 9:27 ` Lionel Landwerlin
2018-01-29 10:32 ` ✗ Fi.CI.IGT: failure for " Patchwork
3 siblings, 1 reply; 13+ messages in thread
From: Chris Wilson @ 2018-01-29 9:02 UTC (permalink / raw)
To: Lionel Landwerlin, intel-gfx
Quoting Lionel Landwerlin (2018-01-29 08:33:46)
> This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
>
> Conflicts:
> drivers/gpu/drm/i915/i915_pci.c
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
Fixes: 5b54eddd3920 ("drm/i915: mark all device info struct with __initconst")
So it ends up in the right place.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
2018-01-29 9:02 ` Chris Wilson
@ 2018-01-29 9:27 ` Lionel Landwerlin
2018-01-29 9:57 ` Lukas Wunner
2018-01-29 10:00 ` Jani Nikula
0 siblings, 2 replies; 13+ messages in thread
From: Lionel Landwerlin @ 2018-01-29 9:27 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 29/01/18 09:02, Chris Wilson wrote:
> Quoting Lionel Landwerlin (2018-01-29 08:33:46)
>> This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
>>
>> Conflicts:
>> drivers/gpu/drm/i915/i915_pci.c
>>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
> Fixes: 5b54eddd3920 ("drm/i915: mark all device info struct with __initconst")
>
> So it ends up in the right place.
> -Chris
>
Thanks, pushed.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
2018-01-29 9:27 ` Lionel Landwerlin
@ 2018-01-29 9:57 ` Lukas Wunner
2018-01-29 10:00 ` Jani Nikula
1 sibling, 0 replies; 13+ messages in thread
From: Lukas Wunner @ 2018-01-29 9:57 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: intel-gfx, Chris Murphy
On Mon, Jan 29, 2018 at 09:27:39AM +0000, Lionel Landwerlin wrote:
> On 29/01/18 09:02, Chris Wilson wrote:
> > Quoting Lionel Landwerlin (2018-01-29 08:33:46)
> > > This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
> > >
> > > Conflicts:
> > > drivers/gpu/drm/i915/i915_pci.c
> > >
> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
> > Fixes: 5b54eddd3920 ("drm/i915: mark all device info struct with __initconst")
> >
> > So it ends up in the right place.
> > -Chris
> >
> Thanks, pushed.
This is missing
Reported-by: Chris Murphy <chris@colorremedies.com>
Also, someone please put on the todo list to write an igt test which
unbinds and rebinds the driver to prevent this regression from
reappearing:
echo PCI-ID > /sys/bus/pci/drivers/i915/unbind
echo PCI-ID > /sys/bus/pci/drivers/i915/bind
Thanks,
Lukas
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
2018-01-29 9:27 ` Lionel Landwerlin
2018-01-29 9:57 ` Lukas Wunner
@ 2018-01-29 10:00 ` Jani Nikula
2018-01-30 8:44 ` Jani Nikula
1 sibling, 1 reply; 13+ messages in thread
From: Jani Nikula @ 2018-01-29 10:00 UTC (permalink / raw)
To: Lionel Landwerlin, Chris Wilson, intel-gfx
On Mon, 29 Jan 2018, Lionel Landwerlin <lionel.g.landwerlin@intel.com> wrote:
> On 29/01/18 09:02, Chris Wilson wrote:
>> Quoting Lionel Landwerlin (2018-01-29 08:33:46)
>>> This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
>>>
>>> Conflicts:
>>> drivers/gpu/drm/i915/i915_pci.c
>>>
>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
>> Fixes: 5b54eddd3920 ("drm/i915: mark all device info struct with __initconst")
>>
>> So it ends up in the right place.
>> -Chris
>>
> Thanks, pushed.
Please *always* wait for the full IGT results before pushing.
Please *always* include a self-contained reason *why* in the commit
message instead of relying on Bugzilla: link only.
Please run 'dim fixes <commit>' to get the proper tags; now Cc: stable
is missing. Fixes: alone doesn't cut it now that v4.15 has been
released.
No patch needs to be merged within an hour. There's never such a
rush. Please let's give more people a chance to look at the patches
before they get merged.
Thanks,
Jani.
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* ✗ Fi.CI.IGT: failure for Revert "drm/i915: mark all device info struct with __initconst"
2018-01-29 8:33 [PATCH] Revert "drm/i915: mark all device info struct with __initconst" Lionel Landwerlin
` (2 preceding siblings ...)
2018-01-29 9:02 ` Chris Wilson
@ 2018-01-29 10:32 ` Patchwork
3 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2018-01-29 10:32 UTC (permalink / raw)
To: Lionel Landwerlin; +Cc: intel-gfx
== Series Details ==
Series: Revert "drm/i915: mark all device info struct with __initconst"
URL : https://patchwork.freedesktop.org/series/37260/
State : failure
== Summary ==
Warning: bzip CI_DRM_3686/shard-glkb6/results14.json.bz2 wasn't in correct JSON format
Test kms_sysfs_edid_timing:
warn -> PASS (shard-apl) fdo#100047
Test kms_flip:
Subgroup 2x-plain-flip-fb-recreate-interruptible:
pass -> FAIL (shard-hsw)
Subgroup flip-vs-panning-vs-hang:
pass -> DMESG-WARN (shard-snb) fdo#103821
Subgroup 2x-dpms-vs-vblank-race-interruptible:
pass -> FAIL (shard-hsw)
Test pm_rpm:
Subgroup system-suspend:
pass -> INCOMPLETE (shard-hsw) fdo#103375
Test kms_mmap_write_crc:
skip -> PASS (shard-apl)
Test perf:
Subgroup enable-disable:
fail -> PASS (shard-apl) fdo#103715
Test gem_exec_schedule:
Subgroup preempt-other-render:
pass -> FAIL (shard-apl) fdo#102848
Test kms_cursor_crc:
Subgroup cursor-128x128-suspend:
pass -> SKIP (shard-snb) fdo#103880
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#103821 https://bugs.freedesktop.org/show_bug.cgi?id=103821
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103715 https://bugs.freedesktop.org/show_bug.cgi?id=103715
fdo#102848 https://bugs.freedesktop.org/show_bug.cgi?id=102848
fdo#103880 https://bugs.freedesktop.org/show_bug.cgi?id=103880
shard-apl total:2838 pass:1752 dwarn:1 dfail:0 fail:21 skip:1064 time:12630s
shard-hsw total:2808 pass:1717 dwarn:1 dfail:0 fail:12 skip:1076 time:11824s
shard-snb total:2838 pass:1327 dwarn:2 dfail:0 fail:11 skip:1498 time:6632s
Blacklisted hosts:
shard-kbl total:2825 pass:1816 dwarn:39 dfail:3 fail:23 skip:943 time:9481s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7804/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
2018-01-29 9:00 ` [PATCH] " Chris Wilson
@ 2018-01-29 10:34 ` Tvrtko Ursulin
2018-01-29 10:44 ` Chris Wilson
0 siblings, 1 reply; 13+ messages in thread
From: Tvrtko Ursulin @ 2018-01-29 10:34 UTC (permalink / raw)
To: Chris Wilson, Lionel Landwerlin, intel-gfx
On 29/01/2018 09:00, Chris Wilson wrote:
> Quoting Lionel Landwerlin (2018-01-29 08:33:46)
>> This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
>>
>> Conflicts:
>> drivers/gpu/drm/i915/i915_pci.c
>>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
>> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
>
> Mea culpa, completely didn't realise post-module init loading was a
> thing.
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> It's still on the low hanging fruit list for reducing our bloat. Ideas?
> i915_pcidata.ko? How far could we go with that, make all gen specific
> code a separate section and unload them after init?
There is one maybe easy win with DMI_MATCH business. It modpost was
taught to handle string relocs, one could remove the hardcoded string
storage of 4x79 bytes for every DMI_MATCH entry. We have one large-ish
table which is not __initconst in intel_no_lvds, but I haven't looked at
the rest of the kernel - if all other users are mostly __initconst then
the saving wouldn't be that universally interesting.
One larger code re-org could be to move all genX prefixed functions into
separate .kos and load them dynamically. But it is very difficult to
estimate the saving given how much re-use we have. And the extraction
would probably be quite messy.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
2018-01-29 10:34 ` Tvrtko Ursulin
@ 2018-01-29 10:44 ` Chris Wilson
0 siblings, 0 replies; 13+ messages in thread
From: Chris Wilson @ 2018-01-29 10:44 UTC (permalink / raw)
To: Tvrtko Ursulin, Lionel Landwerlin, intel-gfx
Quoting Tvrtko Ursulin (2018-01-29 10:34:05)
>
> On 29/01/2018 09:00, Chris Wilson wrote:
> > Quoting Lionel Landwerlin (2018-01-29 08:33:46)
> >> This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
> >>
> >> Conflicts:
> >> drivers/gpu/drm/i915/i915_pci.c
> >>
> >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
> >> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> >
> > Mea culpa, completely didn't realise post-module init loading was a
> > thing.
> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> >
> > It's still on the low hanging fruit list for reducing our bloat. Ideas?
> > i915_pcidata.ko? How far could we go with that, make all gen specific
> > code a separate section and unload them after init?
>
> There is one maybe easy win with DMI_MATCH business. It modpost was
> taught to handle string relocs, one could remove the hardcoded string
> storage of 4x79 bytes for every DMI_MATCH entry. We have one large-ish
> table which is not __initconst in intel_no_lvds, but I haven't looked at
> the rest of the kernel - if all other users are mostly __initconst then
> the saving wouldn't be that universally interesting.
>
> One larger code re-org could be to move all genX prefixed functions into
> separate .kos and load them dynamically. But it is very difficult to
> estimate the saving given how much re-use we have. And the extraction
> would probably be quite messy.
I was dreaming of some advanced LTO which could mark used sections at
runtime linking (would need to be more involved so that it's run after
init/probe) and unload the rest. Doing some manual splitting seems like
the easy-ish thing to do in the near term, but I'd like to keep a fat
i915.ko and retrieve data sections from it on probe (just for the
convenience of having only one module). Dream on :)
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
2018-01-29 10:00 ` Jani Nikula
@ 2018-01-30 8:44 ` Jani Nikula
2018-01-31 2:15 ` Rodrigo Vivi
0 siblings, 1 reply; 13+ messages in thread
From: Jani Nikula @ 2018-01-30 8:44 UTC (permalink / raw)
To: Lionel Landwerlin, Chris Wilson, intel-gfx, Rodrigo Vivi
On Mon, 29 Jan 2018, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Mon, 29 Jan 2018, Lionel Landwerlin <lionel.g.landwerlin@intel.com> wrote:
>> On 29/01/18 09:02, Chris Wilson wrote:
>>> Quoting Lionel Landwerlin (2018-01-29 08:33:46)
>>>> This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
>>>>
>>>> Conflicts:
>>>> drivers/gpu/drm/i915/i915_pci.c
>>>>
>>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
>>> Fixes: 5b54eddd3920 ("drm/i915: mark all device info struct with __initconst")
>>>
>>> So it ends up in the right place.
>>> -Chris
>>>
>> Thanks, pushed.
>
> Please *always* wait for the full IGT results before pushing.
>
> Please *always* include a self-contained reason *why* in the commit
> message instead of relying on Bugzilla: link only.
>
> Please run 'dim fixes <commit>' to get the proper tags; now Cc: stable
> is missing. Fixes: alone doesn't cut it now that v4.15 has been
> released.
Rodrigo, please pick this up to drm-intel-next-fixes.
BR,
Jani.
>
> No patch needs to be merged within an hour. There's never such a
> rush. Please let's give more people a chance to look at the patches
> before they get merged.
>
>
> Thanks,
> Jani.
>
>
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
2018-01-30 8:44 ` Jani Nikula
@ 2018-01-31 2:15 ` Rodrigo Vivi
2018-01-31 17:02 ` Lionel Landwerlin
0 siblings, 1 reply; 13+ messages in thread
From: Rodrigo Vivi @ 2018-01-31 2:15 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Tue, Jan 30, 2018 at 08:44:46AM +0000, Jani Nikula wrote:
> On Mon, 29 Jan 2018, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> > On Mon, 29 Jan 2018, Lionel Landwerlin <lionel.g.landwerlin@intel.com> wrote:
> >> On 29/01/18 09:02, Chris Wilson wrote:
> >>> Quoting Lionel Landwerlin (2018-01-29 08:33:46)
> >>>> This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
> >>>>
> >>>> Conflicts:
> >>>> drivers/gpu/drm/i915/i915_pci.c
> >>>>
> >>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
> >>> Fixes: 5b54eddd3920 ("drm/i915: mark all device info struct with __initconst")
> >>>
> >>> So it ends up in the right place.
> >>> -Chris
> >>>
> >> Thanks, pushed.
> >
> > Please *always* wait for the full IGT results before pushing.
> >
> > Please *always* include a self-contained reason *why* in the commit
> > message instead of relying on Bugzilla: link only.
> >
> > Please run 'dim fixes <commit>' to get the proper tags; now Cc: stable
> > is missing. Fixes: alone doesn't cut it now that v4.15 has been
> > released.
>
> Rodrigo, please pick this up to drm-intel-next-fixes.
This particular one conflicted with the icl ones:
++<<<<<<< HEAD
++=======
+ #define GEN11_FEATURES \
+ GEN10_FEATURES, \
+ .gen = 11, \
+ .ddb_size = 2048, \
+ .has_csr = 0
+
+ static const struct intel_device_info intel_icelake_11_info = {
+ GEN11_FEATURES,
+ .platform = INTEL_ICELAKE,
+ .is_alpha_support = 1,
+ .has_resource_streamer = 0,
+ };
+
++>>>>>>> 5db47e37b387... Revert "drm/i915: mark all device info struct with __initconst"
So I'm assuming it is just a matter to remember to fix the next confclit removing initconst from icl?
Thanks for this and all other heads up.
>
> BR,
> Jani.
>
>
> >
> > No patch needs to be merged within an hour. There's never such a
> > rush. Please let's give more people a chance to look at the patches
> > before they get merged.
> >
> >
> > Thanks,
> > Jani.
> >
> >
> >>
> >> _______________________________________________
> >> Intel-gfx mailing list
> >> Intel-gfx@lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] Revert "drm/i915: mark all device info struct with __initconst"
2018-01-31 2:15 ` Rodrigo Vivi
@ 2018-01-31 17:02 ` Lionel Landwerlin
0 siblings, 0 replies; 13+ messages in thread
From: Lionel Landwerlin @ 2018-01-31 17:02 UTC (permalink / raw)
To: Rodrigo Vivi, Jani Nikula; +Cc: intel-gfx
On 31/01/18 02:15, Rodrigo Vivi wrote:
> On Tue, Jan 30, 2018 at 08:44:46AM +0000, Jani Nikula wrote:
>> On Mon, 29 Jan 2018, Jani Nikula <jani.nikula@linux.intel.com> wrote:
>>> On Mon, 29 Jan 2018, Lionel Landwerlin <lionel.g.landwerlin@intel.com> wrote:
>>>> On 29/01/18 09:02, Chris Wilson wrote:
>>>>> Quoting Lionel Landwerlin (2018-01-29 08:33:46)
>>>>>> This reverts commit 5b54eddd3920e9f6f1a6d972454baf350cbae77e.
>>>>>>
>>>>>> Conflicts:
>>>>>> drivers/gpu/drm/i915/i915_pci.c
>>>>>>
>>>>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104805
>>>>> Fixes: 5b54eddd3920 ("drm/i915: mark all device info struct with __initconst")
>>>>>
>>>>> So it ends up in the right place.
>>>>> -Chris
>>>>>
>>>> Thanks, pushed.
>>> Please *always* wait for the full IGT results before pushing.
>>>
>>> Please *always* include a self-contained reason *why* in the commit
>>> message instead of relying on Bugzilla: link only.
>>>
>>> Please run 'dim fixes <commit>' to get the proper tags; now Cc: stable
>>> is missing. Fixes: alone doesn't cut it now that v4.15 has been
>>> released.
>> Rodrigo, please pick this up to drm-intel-next-fixes.
> This particular one conflicted with the icl ones:
>
> ++<<<<<<< HEAD
> ++=======
> + #define GEN11_FEATURES \
> + GEN10_FEATURES, \
> + .gen = 11, \
> + .ddb_size = 2048, \
> + .has_csr = 0
> +
> + static const struct intel_device_info intel_icelake_11_info = {
> + GEN11_FEATURES,
> + .platform = INTEL_ICELAKE,
> + .is_alpha_support = 1,
> + .has_resource_streamer = 0,
> + };
> +
> ++>>>>>>> 5db47e37b387... Revert "drm/i915: mark all device info struct with __initconst"
>
> So I'm assuming it is just a matter to remember to fix the next confclit removing initconst from icl?
Yep, sorry for the conflict.
>
> Thanks for this and all other heads up.
>
>> BR,
>> Jani.
>>
>>
>>> No patch needs to be merged within an hour. There's never such a
>>> rush. Please let's give more people a chance to look at the patches
>>> before they get merged.
>>>
>>>
>>> Thanks,
>>> Jani.
>>>
>>>
>>>> _______________________________________________
>>>> Intel-gfx mailing list
>>>> Intel-gfx@lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>> --
>> Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2018-01-31 17:02 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-29 8:33 [PATCH] Revert "drm/i915: mark all device info struct with __initconst" Lionel Landwerlin
2018-01-29 8:53 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-01-29 9:00 ` [PATCH] " Chris Wilson
2018-01-29 10:34 ` Tvrtko Ursulin
2018-01-29 10:44 ` Chris Wilson
2018-01-29 9:02 ` Chris Wilson
2018-01-29 9:27 ` Lionel Landwerlin
2018-01-29 9:57 ` Lukas Wunner
2018-01-29 10:00 ` Jani Nikula
2018-01-30 8:44 ` Jani Nikula
2018-01-31 2:15 ` Rodrigo Vivi
2018-01-31 17:02 ` Lionel Landwerlin
2018-01-29 10:32 ` ✗ Fi.CI.IGT: failure for " Patchwork
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.