drm/i915/display: add platform group for g4x

Add support for defining aliases for platform groups, such as g4x that
covers both g45 and gm45.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/947bdbc03913838383d75b3e07cf340100cbb5bb.1730144869.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index ea886a1b2c0948e4db225cc071086f8136f5869f..cf9eb6add6bfbf9f191bb01fa9dcc765cc288821 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -54,6 +54,13 @@ struct platform_desc {
        .platforms._platform = 1,                \
        .name = #_platform
 
+/*
+ * Group platform alias that matches multiple platforms. For aliases such as g4x
+ * that covers both g45 and gm45.
+ */
+#define PLATFORM_GROUP(_platform)              \
+       .platforms._platform = 1
+
 #define ID(id) (id)
 
 static const struct intel_display_device_info no_display = {};
@@ -388,6 +395,7 @@ static const struct platform_desc i965gm_desc = {
 
 static const struct platform_desc g45_desc = {
        PLATFORM(g45),
+       PLATFORM_GROUP(g4x),
        .info = &(const struct intel_display_device_info) {
                GEN4_DISPLAY,
 
@@ -397,6 +405,7 @@ static const struct platform_desc g45_desc = {
 
 static const struct platform_desc gm45_desc = {
        PLATFORM(gm45),
+       PLATFORM_GROUP(g4x),
        .info = &(const struct intel_display_device_info) {
                GEN4_DISPLAY,
                .supports_tv = 1,

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
index 71944d1834018aee92c4af0cbca4b8254c2e580b..1df3b9340d99fc3973a511a063abc0e24ac34a3b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.h
+++ b/drivers/gpu/drm/i915/display/intel_display_device.h
@@ -38,6 +38,7 @@ struct drm_printer;
        func(i965gm) \
        func(g45) \
        func(gm45) \
+       func(g4x) /* group alias for g45 and gm45 */ \
        /* Display ver 5 */ \
        func(ironlake) \
        /* Display ver 6 */ \