drm/i915: replace platform flags with a platform enum
Subsystems (2)
RFC PATCH 1/1 drm/i915: replace platform flags with a platform enum
The platform flags in device info are (mostly) mutually exclusive. Replace the flags with an enum. Add the platform enum also for platforms that previously didn't have a flag, and give them codename logging in dmesg.
Pineview remains an exception, the platform being G33 for that.
---
Untested TGIF patch. ;)
--- drivers/gpu/drm/i915/i915_debugfs.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 76 +++++++++++++++++++------------- drivers/gpu/drm/i915/i915_gpu_error.c | 1 + drivers/gpu/drm/i915/i915_pci.c | 53 +++++++++++++--------- drivers/gpu/drm/i915/intel_device_info.c | 40 ++++++++++++++++- 5 files changed, 117 insertions(+), 54 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
@@ -77,6 +77,7 @@ static int i915_capabilities(struct seq_file *m, void *data)const struct intel_device_info *info =INTEL_INFO (dev_priv);seq_printf (m,"gen: %d\n" ,INTEL_GEN (dev_priv)); +seq_printf (m,"platform: %s\n" ,intel_platform_name (info->platform));seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev_priv));#define PRINT_FLAG (x) seq_printf(m, #x ": %s\n", yesno(info->x))DEV_INFO_FOR_EACH_FLAG (PRINT_FLAG );
drivers/gpu/drm/i915/i915_drv.h +45 -31
119 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gpu_error.c +1 -0
@@ -565,6 +565,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, }err_printf (m,"Reset count: %u\n" , error->reset_count);err_printf (m,"Suspend count: %u\n" , error->suspend_count); +err_printf (m,"Platform: %s\n" ,intel_platform_name (error->device_info.platform));err_printf (m,"PCI ID: 0x%04x\n" , pdev->device);err_printf (m,"PCI Revision: 0x%02x\n" , pdev->revision); err_printf(m, "PCI Subsystem: %04x:%04x\n",
drivers/gpu/drm/i915/i915_pci.c +31 -22
230 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.c +39 -1
@@ -24,11 +24,49 @@#include "i915_drv.h" +#define PLATFORM_NAME (x) [INTEL_##x] = #x +static const char *const platform_names[] = { +PLATFORM_NAME (I830 ), +PLATFORM_NAME (I845G ), +PLATFORM_NAME (I85X ), +PLATFORM_NAME (I865G ), +PLATFORM_NAME (I915G ), +PLATFORM_NAME (I915GM ), +PLATFORM_NAME (I945G ), +PLATFORM_NAME (I945GM ), +PLATFORM_NAME (G33 ), +PLATFORM_NAME (G4X ), +PLATFORM_NAME (PINEVIEW ), +PLATFORM_NAME (BROADWATER ), +PLATFORM_NAME (CRESTLINE ), +PLATFORM_NAME (IRONLAKE ), +PLATFORM_NAME (SANDYBRIDGE ), +PLATFORM_NAME (IVYBRIDGE ), +PLATFORM_NAME (VALLEYVIEW ), +PLATFORM_NAME (CHERRYVIEW ), +PLATFORM_NAME (HASWELL ), +PLATFORM_NAME (BROADWELL ), +PLATFORM_NAME (SKYLAKE ), +PLATFORM_NAME (BROXTON ), +PLATFORM_NAME (KABYLAKE ), +}; +#undef PLATFORM_NAME + +const char *intel_platform_name (enum intel_platform platform) +{ +if (WARN_ON_ONCE (platform >=ARRAY_SIZE (platform_names) || + platform_names[platform] ==NULL )) +return "<unknown>" ; + +return platform_names[platform]; +} +void intel_device_info_dump (struct drm_i915_private *dev_priv) {const struct intel_device_info *info = &dev_priv->info; -DRM_DEBUG_DRIVER ("i915 device info: gen=%i, pciid=0x%04x rev=0x%02x" , +DRM_DEBUG_DRIVER ("i915 device info: %s gen=%i pciid=0x%04x rev=0x%02x" , +intel_platform_name (info->platform), info->gen, dev_priv->drm.pdev->device, dev_priv->drm.pdev->revision);
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 78 lines · Jani Nikula
The platform flags in device info are (mostly) mutually exclusive. Replace the flags with an enum. Add the platform enum also for platforms that previously didn't have a flag, and give them codename logging in dmesg.
Pineview remains an exception, the platform being G33 for that.
Signed-off-by Jani Nikula <[email protected]>---
Untested TGIF patch. ;)
--- drivers/gpu/drm/i915/i915_debugfs.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 76 +++++++++++++++++++------------- drivers/gpu/drm/i915/i915_gpu_error.c | 1 + drivers/gpu/drm/i915/i915_pci.c | 53 +++++++++++++--------- drivers/gpu/drm/i915/intel_device_info.c | 40 ++++++++++++++++- 5 files changed, 117 insertions(+), 54 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +1
-0@@ -77,6 +77,7 @@ static int i915_capabilities(struct seq_file *m, void *data)const struct intel_device_info *info =INTEL_INFO (dev_priv);seq_printf (m,"gen: %d\n" ,INTEL_GEN (dev_priv)); +seq_printf (m,"platform: %s\n" ,intel_platform_name (info->platform));seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev_priv));#define PRINT_FLAG (x) seq_printf(m, #x ": %s\n", yesno(info->x))DEV_INFO_FOR_EACH_FLAG (PRINT_FLAG );drivers/gpu/drm/i915/i915_drv.h +13
-16@@ -659,24 +659,8 @@ struct intel_csr { };#define DEV_INFO_FOR_EACH_FLAG (func) \ -/* Keep is_* in chronological order */ \ func(is_mobile); \ - func(is_i85x); \ - func(is_i915g); \ - func(is_i945gm); \ - func(is_g33); \ - func(is_g4x); \ func(is_pineview); \ - func(is_broadwater); \ - func(is_crestline); \ - func(is_ivybridge); \ - func(is_valleyview); \ - func(is_cherryview); \ - func(is_haswell); \ - func(is_broadwell); \ - func(is_skylake); \ - func(is_broxton); \ - func(is_kabylake); \ func(is_alpha_support); \/* Keep has_* in alphabetical order */ \func (has_64bit_reloc); \@@ -726,6 +710,34 @@ static inline unsigned int sseu_subslice_total(const struct sseu_dev_info *sseu)return hweight8 (sseu->slice_mask) *hweight8 (sseu->subslice_mask); } +/* Keep in chronological order */ +enum intel_platform { +INTEL_PLATFORM_UNINITIALIZED =0 , +INTEL_I830 , +INTEL_I845G , +INTEL_I85X , +INTEL_I865G , +INTEL_I915G , +INTEL_I915GM , +INTEL_I945G , +INTEL_I945GM , +INTEL_G33 , +INTEL_G4X ,
drivers/gpu/drm/i915/i915_drv.h static inline unsigned int sseu_subslice_total(const struct sseu_dev_info *sseu) · line 735
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +10
-0+INTEL_PINEVIEW , +INTEL_BROADWATER , +INTEL_CRESTLINE , +INTEL_IRONLAKE , +INTEL_SANDYBRIDGE , +INTEL_IVYBRIDGE , +INTEL_VALLEYVIEW , +INTEL_CHERRYVIEW , +INTEL_HASWELL , + INTEL_BROADWELL,
My earlier review fail. chv/bsw should be after bdw.
I expect Tvrtko to take this for a spin and see how this compares against the current bittests.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Jani Nikula
The platform flags in device info are (mostly) mutually exclusive. Replace the flags with an enum. Add the platform enum also for platforms that previously didn't have a flag, and give them codename logging in dmesg.
It just saddens me a bit that it prevents the compiler optimisation of our IS_THIS || IS_THAT || IS_TAT ugliness. :I On the basis on that I cannot quite make myself to support it, although it conceptually does make more sense.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Tvrtko Ursulin
Quoted 4 lines · Jani Nikula
The platform flags in device info are (mostly) mutually exclusive. Replace the flags with an enum. Add the platform enum also for platforms that previously didn't have a flag, and give them codename logging in dmesg.
It just saddens me a bit that it prevents the compiler optimisation of our
IS_THIS||IS_THAT||IS_TATugliness. :I On the basis on that I cannot quite make myself to support it, although it conceptually does make more sense.
Personally I think making more sense conceptually trumps possible compiler optimizations, especially when the code paths where this actually matters are extremely rare. (Can you even point me at an example where this makes a difference?)
That said, does doing something silly like this make a difference:
enum intel_platform {
INTEL_PLATFORM_UNINITIALIZED = 0,
INTEL_I830 = BIT(0),
INTEL_I845G = BIT(1),
INTEL_I85X = BIT(2),
INTEL_I865G = BIT(3),
INTEL_I915G = BIT(4),
INTEL_I915GM = BIT(5),
INTEL_I945G = BIT(6),
INTEL_I945GM = BIT(7),
INTEL_G33 = BIT(8),
INTEL_G4X = BIT(9),
INTEL_PINEVIEW = BIT(10),
INTEL_BROADWATER = BIT(11),
INTEL_CRESTLINE = BIT(12),
INTEL_IRONLAKE = BIT(13),
INTEL_SANDYBRIDGE = BIT(14),
INTEL_IVYBRIDGE = BIT(15),
INTEL_VALLEYVIEW = BIT(16),
INTEL_CHERRYVIEW = BIT(17),
INTEL_HASWELL = BIT(18),
INTEL_BROADWELL = BIT(19),
INTEL_SKYLAKE = BIT(20),
INTEL_BROXTON = BIT(21),
INTEL_KABYLAKE = BIT(22),
};BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 12 lines · Jani Nikula
Quoted 10 lines · Tvrtko Ursulin
Quoted 4 lines · Jani Nikula
The platform flags in device info are (mostly) mutually exclusive. Replace the flags with an enum. Add the platform enum also for platforms that previously didn't have a flag, and give them codename logging in dmesg.
It just saddens me a bit that it prevents the compiler optimisation of our
IS_THIS||IS_THAT||IS_TATugliness. :I On the basis on that I cannot quite make myself to support it, although it conceptually does make more sense.
Quoted 4 lines
Personally I think making more sense conceptually trumps possible compiler optimizations, especially when the code paths where this actually matters are extremely rare. (Can you even point me at an example where this makes a difference?)
Without thinking deeply, all instances like IS_HASWELL || IS_BROADWELL, IS_SKYLAKE || IS_KABYLAKE, or IS_VALLEYVIEW || IS_CHERRYVIEW. Quick grep shows that there is at least around 170 instances of those. There might be more, I don't know. At least the ones I listed all currently translate to a single conditional in the generated code.
I am not saying these are all on performance critical paths or anything, just that on balance, for me the sweetness of the optimisation cancels out the ugliness of the code (which is often unavoidable). Losing that and ending up with compare ladders in the code would just be a bit sad.
Quoted 20 lines
That said, does doing something silly like this make a difference:
enum intel_platform { INTEL_PLATFORM_UNINITIALIZED = 0, INTEL_I830 = BIT(0), INTEL_I845G = BIT(1), INTEL_I85X = BIT(2), INTEL_I865G = BIT(3), INTEL_I915G = BIT(4), INTEL_I915GM = BIT(5), INTEL_I945G = BIT(6), INTEL_I945GM = BIT(7), INTEL_G33 = BIT(8), INTEL_G4X = BIT(9), INTEL_PINEVIEW = BIT(10), INTEL_BROADWATER = BIT(11), INTEL_CRESTLINE = BIT(12), INTEL_IRONLAKE = BIT(13), INTEL_SANDYBRIDGE = BIT(14), INTEL_IVYBRIDGE = BIT(15),
Quoted 8 lines
INTEL_VALLEYVIEW = BIT(16), INTEL_CHERRYVIEW = BIT(17), INTEL_HASWELL = BIT(18), INTEL_BROADWELL = BIT(19), INTEL_SKYLAKE = BIT(20), INTEL_BROXTON = BIT(21), INTEL_KABYLAKE = BIT(22), };
I could live with that. Probably best to compare the code size before and after just to verify there are no surprises.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 24 lines · Tvrtko Ursulin
Quoted 12 lines · Jani Nikula
Quoted 10 lines · Tvrtko Ursulin
Quoted 4 lines · Jani Nikula
The platform flags in device info are (mostly) mutually exclusive. Replace the flags with an enum. Add the platform enum also for platforms that previously didn't have a flag, and give them codename logging in dmesg.
It just saddens me a bit that it prevents the compiler optimisation of our
IS_THIS||IS_THAT||IS_TATugliness. :I On the basis on that I cannot quite make myself to support it, although it conceptually does make more sense.Quoted 4 lines
Personally I think making more sense conceptually trumps possible compiler optimizations, especially when the code paths where this actually matters are extremely rare. (Can you even point me at an example where this makes a difference?)
Without thinking deeply, all instances like
IS_HASWELL||IS_BROADWELL,IS_SKYLAKE||IS_KABYLAKE, orIS_VALLEYVIEW||IS_CHERRYVIEW. Quick grep shows that there is at least around 170 instances of those. There might be more, I don't know. At least the ones I listed all currently translate to a single conditional in the generated code.
Quoted 4 lines
I am not saying these are all on performance critical paths or anything, just that on balance, for me the sweetness of the optimisation cancels out the ugliness of the code (which is often unavoidable). Losing that and ending up with compare ladders in the code would just be a bit sad.
It doesn't persuade me much if something enables sweet optimizations that nobody can perceive in real life.
Please also note that this brings decent codename debug prints to dmesg, for all platforms, instead of a bunch of irrelevant is_platform = no for every platform.
Quoted 29 lines
Quoted 20 lines
That said, does doing something silly like this make a difference:
enum intel_platform { INTEL_PLATFORM_UNINITIALIZED = 0, INTEL_I830 = BIT(0), INTEL_I845G = BIT(1), INTEL_I85X = BIT(2), INTEL_I865G = BIT(3), INTEL_I915G = BIT(4), INTEL_I915GM = BIT(5), INTEL_I945G = BIT(6), INTEL_I945GM = BIT(7), INTEL_G33 = BIT(8), INTEL_G4X = BIT(9), INTEL_PINEVIEW = BIT(10), INTEL_BROADWATER = BIT(11), INTEL_CRESTLINE = BIT(12), INTEL_IRONLAKE = BIT(13), INTEL_SANDYBRIDGE = BIT(14), INTEL_IVYBRIDGE = BIT(15),Quoted 8 lines
INTEL_VALLEYVIEW = BIT(16), INTEL_CHERRYVIEW = BIT(17), INTEL_HASWELL = BIT(18), INTEL_BROADWELL = BIT(19), INTEL_SKYLAKE = BIT(20), INTEL_BROXTON = BIT(21), INTEL_KABYLAKE = BIT(22), };
Quoted 2 lines
I could live with that. Probably best to compare the code size before and after just to verify there are no surprises.
current nightly:
text data bss dec hex filename
1254149 43528 2048 1299725 13d50d drivers/gpu/drm/i915/i915.ko
original platform enum patch:
text data bss dec hex filename
1254456 43529 2048 1300033 13d641 drivers/gpu/drm/i915/i915.ko
the same with BIT() for platform enums:
text data bss dec hex filename
34811672 43529 2048 34857249 213e121 drivers/gpu/drm/i915/i915.ko
Holy cow, what happened there?!
Anyway the nightly -> original patch change is just a 300 byte increase in text size.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: replace platform flags with a platform enum
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: replace platform flags with a platform enum
URL : https://patchwork.freedesktop.org/series/15558/
State : success
== Summary ==
Series 15558v1 drm/i915: replace platform flags with a platform enum
https://patchwork.freedesktop.org/api/1.0/series/15558/revisions/1/mbox/
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
05104adb7446f310fad4e36f22d4c84ffafa31fc drm-intel-nightly: 2016y-11m-18d-13h-10m-16s UTC integration manifest 00a1f4d drm/i915: replace platform flags with a platform enum
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3056/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 71 lines · Jani Nikula
The platform flags in device info are (mostly) mutually exclusive. Replace the flags with an enum. Add the platform enum also for platforms that previously didn't have a flag, and give them codename logging in dmesg.
Pineview remains an exception, the platform being G33 for that.
Signed-off-by Jani Nikula <[email protected]>---
Untested TGIF patch. ;)
--- drivers/gpu/drm/i915/i915_debugfs.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 76 +++++++++++++++++++------------- drivers/gpu/drm/i915/i915_gpu_error.c | 1 + drivers/gpu/drm/i915/i915_pci.c | 53 +++++++++++++--------- drivers/gpu/drm/i915/intel_device_info.c | 40 ++++++++++++++++- 5 files changed, 117 insertions(+), 54 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +1
-0@@ -77,6 +77,7 @@ static int i915_capabilities(struct seq_file *m, void *data)const struct intel_device_info *info =INTEL_INFO (dev_priv);seq_printf (m,"gen: %d\n" ,INTEL_GEN (dev_priv)); +seq_printf (m,"platform: %s\n" ,intel_platform_name (info->platform));seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev_priv));#define PRINT_FLAG (x) seq_printf(m, #x ": %s\n", yesno(info->x))DEV_INFO_FOR_EACH_FLAG (PRINT_FLAG );drivers/gpu/drm/i915/i915_drv.h +6
-16@@ -659,24 +659,8 @@ struct intel_csr { };#define DEV_INFO_FOR_EACH_FLAG (func) \ -/* Keep is_* in chronological order */ \ func(is_mobile); \ - func(is_i85x); \ - func(is_i915g); \ - func(is_i945gm); \ - func(is_g33); \ - func(is_g4x); \ func(is_pineview); \ - func(is_broadwater); \ - func(is_crestline); \ - func(is_ivybridge); \ - func(is_valleyview); \ - func(is_cherryview); \ - func(is_haswell); \ - func(is_broadwell); \ - func(is_skylake); \ - func(is_broxton); \ - func(is_kabylake); \ func(is_alpha_support); \/* Keep has_* in alphabetical order */ \func (has_64bit_reloc); \@@ -726,6 +710,34 @@ static inline unsigned int sseu_subslice_total(const struct sseu_dev_info *sseu)return hweight8 (sseu->slice_mask) *hweight8 (sseu->subslice_mask); } +/* Keep in chronological order */ +enum intel_platform { +INTEL_PLATFORM_UNINITIALIZED =0 , +INTEL_I830 , +INTEL_I845G , +INTEL_I85X ,
drivers/gpu/drm/i915/i915_drv.h static inline unsigned int sseu_subslice_total(const struct sseu_dev_info *sseu) · line 728
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +10
-0+INTEL_I865G , +INTEL_I915G , +INTEL_I915GM , +INTEL_I945G , +INTEL_I945GM , +INTEL_G33 , +INTEL_G4X , +INTEL_PINEVIEW , +INTEL_BROADWATER , + INTEL_CRESTLINE,
The order here is rather wonky.
Assuming we want to keep roughly to the gen based order, then we'd have:
G33/BLB
PNV
965G/BW
965GM/CL
G4X/ELK
GM45/CTG
OTOH if we want to order based on the chipset side of things (which might be closer to a chronological order I believe) we would have:
965G/BW
965GM/CL
G33/BLB
PNV
G4X/ELK
GM45/CTG
Well, pnv might have to come after elk/ctg to actually to fit into the chronological order correctly.
This also highlights the issue we're rather inconsistent with the number vs. codename thing. I think if we want to keep using both we should draw a clear line where we switch. I think I would at least flip bw/cl over to the number scheme if we want to keep to the number scheme for the older parts.
drivers/gpu/drm/i915/i915_drv.h static inline unsigned int sseu_subslice_total(const struct sseu_dev_info *sseu) · line 735
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +7
-0+INTEL_IRONLAKE , +INTEL_SANDYBRIDGE , +INTEL_IVYBRIDGE , +INTEL_VALLEYVIEW , +INTEL_CHERRYVIEW , +INTEL_HASWELL , + INTEL_BROADWELL,
And as Chris noted this should be (based on either gen or chronological order):
IVB
VLV
HSW
BDW
CHV
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.h +5
-0+INTEL_SKYLAKE , +INTEL_BROXTON , + INTEL_KABYLAKE, +}; +
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx