Message ID | 20240604140021.1357502-1-balasubramani.vivekanandan@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915/display/bmg: Add platform descriptor | expand |
LGTM, Reviewed-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> > -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of > Balasubramani Vivekanandan > Sent: Tuesday, June 4, 2024 7:00 AM > To: intel-gfx@lists.freedesktop.org > Cc: Jani Nikula <jani.nikula@linux.intel.com>; Sousa, Gustavo > <gustavo.sousa@intel.com>; Vivekanandan, Balasubramani > <balasubramani.vivekanandan@intel.com> > Subject: [PATCH] drm/i915/display/bmg: Add platform descriptor > > Platform descriptor defined and PCI IDs added for Battlemage. > > Signed-off-by: Balasubramani Vivekanandan > <balasubramani.vivekanandan@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display_device.c | 5 +++++ > drivers/gpu/drm/i915/display/intel_display_device.h | 2 ++ > include/drm/intel/i915_pciids.h | 8 ++++++++ > 3 files changed, 15 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c > b/drivers/gpu/drm/i915/display/intel_display_device.c > index b35422da7f6c..dd7dce4b0e7a 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_device.c > +++ b/drivers/gpu/drm/i915/display/intel_display_device.c > @@ -1110,6 +1110,10 @@ static const struct platform_desc lnl_desc = { > PLATFORM(LUNARLAKE), > }; > > +static const struct platform_desc bmg_desc = { > + PLATFORM(BATTLEMAGE), > +}; > + > __diag_pop(); > > /* > @@ -1178,6 +1182,7 @@ static const struct { > INTEL_DG2_IDS(INTEL_DISPLAY_DEVICE, &dg2_desc), > INTEL_MTL_IDS(INTEL_DISPLAY_DEVICE, &mtl_desc), > INTEL_LNL_IDS(INTEL_DISPLAY_DEVICE, &lnl_desc), > + INTEL_BMG_IDS(INTEL_DISPLAY_DEVICE, &bmg_desc), > }; > > static const struct { > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h > b/drivers/gpu/drm/i915/display/intel_display_device.h > index e1d9947394dc..44cda6c3e4d8 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_device.h > +++ b/drivers/gpu/drm/i915/display/intel_display_device.h > @@ -68,6 +68,8 @@ enum intel_display_platform { > INTEL_DISPLAY_METEORLAKE, > /* Display ver 20 (based on GMD ID) */ > INTEL_DISPLAY_LUNARLAKE, > + /* Display ver 14.1 (based on GMD ID) */ > + INTEL_DISPLAY_BATTLEMAGE, > }; > > enum intel_display_subplatform { > diff --git a/include/drm/intel/i915_pciids.h b/include/drm/intel/i915_pciids.h > index 7ae7ee11ef38..b21374f76df2 100644 > --- a/include/drm/intel/i915_pciids.h > +++ b/include/drm/intel/i915_pciids.h > @@ -789,4 +789,12 @@ > MACRO__(0x64A0, ## __VA_ARGS__), \ > MACRO__(0x64B0, ## __VA_ARGS__) > > +/* BMG */ > +#define INTEL_BMG_IDS(MACRO__, ...) \ > + MACRO__(0xE202, ## __VA_ARGS__), \ > + MACRO__(0xE20B, ## __VA_ARGS__), \ > + MACRO__(0xE20C, ## __VA_ARGS__), \ > + MACRO__(0xE20D, ## __VA_ARGS__), \ > + MACRO__(0xE212, ## __VA_ARGS__) > + > #endif /* _I915_PCIIDS_H */ > -- > 2.25.1
Thanks for the patch. Merged onto drm-intel-next. The CI failure does not seem related to the changes made. --Radhakrishna Sripada > -----Original Message----- > From: Sripada, Radhakrishna > Sent: Thursday, June 6, 2024 3:54 PM > To: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>; > intel-gfx@lists.freedesktop.org > Cc: Jani Nikula <jani.nikula@linux.intel.com>; Sousa, Gustavo > <gustavo.sousa@intel.com>; Vivekanandan, Balasubramani > <balasubramani.vivekanandan@intel.com> > Subject: RE: [PATCH] drm/i915/display/bmg: Add platform descriptor > > LGTM, > Reviewed-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> > > > -----Original Message----- > > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of > > Balasubramani Vivekanandan > > Sent: Tuesday, June 4, 2024 7:00 AM > > To: intel-gfx@lists.freedesktop.org > > Cc: Jani Nikula <jani.nikula@linux.intel.com>; Sousa, Gustavo > > <gustavo.sousa@intel.com>; Vivekanandan, Balasubramani > > <balasubramani.vivekanandan@intel.com> > > Subject: [PATCH] drm/i915/display/bmg: Add platform descriptor > > > > Platform descriptor defined and PCI IDs added for Battlemage. > > > > Signed-off-by: Balasubramani Vivekanandan > > <balasubramani.vivekanandan@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_display_device.c | 5 +++++ > > drivers/gpu/drm/i915/display/intel_display_device.h | 2 ++ > > include/drm/intel/i915_pciids.h | 8 ++++++++ > > 3 files changed, 15 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c > > b/drivers/gpu/drm/i915/display/intel_display_device.c > > index b35422da7f6c..dd7dce4b0e7a 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_device.c > > +++ b/drivers/gpu/drm/i915/display/intel_display_device.c > > @@ -1110,6 +1110,10 @@ static const struct platform_desc lnl_desc = { > > PLATFORM(LUNARLAKE), > > }; > > > > +static const struct platform_desc bmg_desc = { > > + PLATFORM(BATTLEMAGE), > > +}; > > + > > __diag_pop(); > > > > /* > > @@ -1178,6 +1182,7 @@ static const struct { > > INTEL_DG2_IDS(INTEL_DISPLAY_DEVICE, &dg2_desc), > > INTEL_MTL_IDS(INTEL_DISPLAY_DEVICE, &mtl_desc), > > INTEL_LNL_IDS(INTEL_DISPLAY_DEVICE, &lnl_desc), > > + INTEL_BMG_IDS(INTEL_DISPLAY_DEVICE, &bmg_desc), > > }; > > > > static const struct { > > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h > > b/drivers/gpu/drm/i915/display/intel_display_device.h > > index e1d9947394dc..44cda6c3e4d8 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_device.h > > +++ b/drivers/gpu/drm/i915/display/intel_display_device.h > > @@ -68,6 +68,8 @@ enum intel_display_platform { > > INTEL_DISPLAY_METEORLAKE, > > /* Display ver 20 (based on GMD ID) */ > > INTEL_DISPLAY_LUNARLAKE, > > + /* Display ver 14.1 (based on GMD ID) */ > > + INTEL_DISPLAY_BATTLEMAGE, > > }; > > > > enum intel_display_subplatform { > > diff --git a/include/drm/intel/i915_pciids.h b/include/drm/intel/i915_pciids.h > > index 7ae7ee11ef38..b21374f76df2 100644 > > --- a/include/drm/intel/i915_pciids.h > > +++ b/include/drm/intel/i915_pciids.h > > @@ -789,4 +789,12 @@ > > MACRO__(0x64A0, ## __VA_ARGS__), \ > > MACRO__(0x64B0, ## __VA_ARGS__) > > > > +/* BMG */ > > +#define INTEL_BMG_IDS(MACRO__, ...) \ > > + MACRO__(0xE202, ## __VA_ARGS__), \ > > + MACRO__(0xE20B, ## __VA_ARGS__), \ > > + MACRO__(0xE20C, ## __VA_ARGS__), \ > > + MACRO__(0xE20D, ## __VA_ARGS__), \ > > + MACRO__(0xE212, ## __VA_ARGS__) > > + > > #endif /* _I915_PCIIDS_H */ > > -- > > 2.25.1
diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c index b35422da7f6c..dd7dce4b0e7a 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.c +++ b/drivers/gpu/drm/i915/display/intel_display_device.c @@ -1110,6 +1110,10 @@ static const struct platform_desc lnl_desc = { PLATFORM(LUNARLAKE), }; +static const struct platform_desc bmg_desc = { + PLATFORM(BATTLEMAGE), +}; + __diag_pop(); /* @@ -1178,6 +1182,7 @@ static const struct { INTEL_DG2_IDS(INTEL_DISPLAY_DEVICE, &dg2_desc), INTEL_MTL_IDS(INTEL_DISPLAY_DEVICE, &mtl_desc), INTEL_LNL_IDS(INTEL_DISPLAY_DEVICE, &lnl_desc), + INTEL_BMG_IDS(INTEL_DISPLAY_DEVICE, &bmg_desc), }; static const struct { diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h index e1d9947394dc..44cda6c3e4d8 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.h +++ b/drivers/gpu/drm/i915/display/intel_display_device.h @@ -68,6 +68,8 @@ enum intel_display_platform { INTEL_DISPLAY_METEORLAKE, /* Display ver 20 (based on GMD ID) */ INTEL_DISPLAY_LUNARLAKE, + /* Display ver 14.1 (based on GMD ID) */ + INTEL_DISPLAY_BATTLEMAGE, }; enum intel_display_subplatform { diff --git a/include/drm/intel/i915_pciids.h b/include/drm/intel/i915_pciids.h index 7ae7ee11ef38..b21374f76df2 100644 --- a/include/drm/intel/i915_pciids.h +++ b/include/drm/intel/i915_pciids.h @@ -789,4 +789,12 @@ MACRO__(0x64A0, ## __VA_ARGS__), \ MACRO__(0x64B0, ## __VA_ARGS__) +/* BMG */ +#define INTEL_BMG_IDS(MACRO__, ...) \ + MACRO__(0xE202, ## __VA_ARGS__), \ + MACRO__(0xE20B, ## __VA_ARGS__), \ + MACRO__(0xE20C, ## __VA_ARGS__), \ + MACRO__(0xE20D, ## __VA_ARGS__), \ + MACRO__(0xE212, ## __VA_ARGS__) + #endif /* _I915_PCIIDS_H */
Platform descriptor defined and PCI IDs added for Battlemage. Signed-off-by: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com> --- drivers/gpu/drm/i915/display/intel_display_device.c | 5 +++++ drivers/gpu/drm/i915/display/intel_display_device.h | 2 ++ include/drm/intel/i915_pciids.h | 8 ++++++++ 3 files changed, 15 insertions(+)