Commit 4df9c1ae authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Jani Nikula

drm/i915: rename display.version to display.ver

The macro we use to check is called DISPLAY_VER(). While using this
macro and the new ones being added in following changes I made the
mistake multiple times when mixing both "ver" and "version". Although
it's usually better to prefer the complete name, the shorhand
DISPLAY_VER() / GRAPHICS_VER / MEDIA_VER are clear and cause less
visual polution.

Another issue is when copying the variable to other places.
"display.version" would be copied to a "display_version" variable which
is long and would make people abbreviate as "version", or "display_ver".
In the first case it's not always clear what version refers to, and in
the second case it just hints it should be the name in the first place.

So, in the same way use used "gen" rather than "generation", use "ver"
instead of "version".
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210413051002.92589-3-lucas.demarchi@intel.com
parent 27ec10b3
...@@ -1237,7 +1237,7 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev) ...@@ -1237,7 +1237,7 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev)
#define INTEL_GEN(dev_priv) (INTEL_INFO(dev_priv)->gen) #define INTEL_GEN(dev_priv) (INTEL_INFO(dev_priv)->gen)
#define INTEL_DEVID(dev_priv) (RUNTIME_INFO(dev_priv)->device_id) #define INTEL_DEVID(dev_priv) (RUNTIME_INFO(dev_priv)->device_id)
#define DISPLAY_VER(i915) (INTEL_INFO(i915)->display.version) #define DISPLAY_VER(i915) (INTEL_INFO(i915)->display.ver)
#define IS_DISPLAY_RANGE(i915, from, until) \ #define IS_DISPLAY_RANGE(i915, from, until) \
(DISPLAY_VER(i915) >= (from) && DISPLAY_VER(i915) <= (until)) (DISPLAY_VER(i915) >= (from) && DISPLAY_VER(i915) <= (until))
#define IS_DISPLAY_VER(i915, v) (DISPLAY_VER(i915) == (v)) #define IS_DISPLAY_VER(i915, v) (DISPLAY_VER(i915) == (v))
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "i915_selftest.h" #include "i915_selftest.h"
#define PLATFORM(x) .platform = (x) #define PLATFORM(x) .platform = (x)
#define GEN(x) .gen = (x), .gen_mask = BIT((x) - 1), .display.version = (x) #define GEN(x) .gen = (x), .gen_mask = BIT((x) - 1), .display.ver = (x)
#define I845_PIPE_OFFSETS \ #define I845_PIPE_OFFSETS \
.pipe_offsets = { \ .pipe_offsets = { \
...@@ -723,7 +723,7 @@ static const struct intel_device_info bxt_info = { ...@@ -723,7 +723,7 @@ static const struct intel_device_info bxt_info = {
static const struct intel_device_info glk_info = { static const struct intel_device_info glk_info = {
GEN9_LP_FEATURES, GEN9_LP_FEATURES,
PLATFORM(INTEL_GEMINILAKE), PLATFORM(INTEL_GEMINILAKE),
.display.version = 10, .display.ver = 10,
.ddb_size = 1024, .ddb_size = 1024,
GLK_COLORS, GLK_COLORS,
}; };
......
...@@ -189,7 +189,7 @@ struct intel_device_info { ...@@ -189,7 +189,7 @@ struct intel_device_info {
#undef DEFINE_FLAG #undef DEFINE_FLAG
struct { struct {
u8 version; u8 ver;
#define DEFINE_FLAG(name) u8 name:1 #define DEFINE_FLAG(name) u8 name:1
DEV_INFO_DISPLAY_FOR_EACH_FLAG(DEFINE_FLAG); DEV_INFO_DISPLAY_FOR_EACH_FLAG(DEFINE_FLAG);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment