| Message ID | 20241008223741.82790-2-matthew.s.atwood@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add xe3lpd edp enabling | expand |
On Tue, Oct 08, 2024 at 03:37:32PM -0700, Matt Atwood wrote: > From: Clint Taylor <clinton.a.taylor@intel.com> > > xe3_lpd display is functionally identical to xe2_lpd for now so reuse > the device description. A separate xe3 definition will be added in the > future if/when new feature flags are required. > > Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com> > Signed-off-by: Matt Atwood <matthew.s.atwood@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display_device.c | 6 ++++++ > drivers/gpu/drm/i915/display/intel_display_device.h | 2 ++ > include/drm/intel/i915_pciids.h | 12 ++++++++++++ > 3 files changed, 20 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c > index f33062322c66..aa22189e3853 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_device.c > +++ b/drivers/gpu/drm/i915/display/intel_display_device.c > @@ -1252,6 +1252,10 @@ static const struct platform_desc bmg_desc = { > PLATFORM(BATTLEMAGE), > }; > > +static const struct platform_desc ptl_desc = { > + PLATFORM(PANTHERLAKE), > +}; > + > __diag_pop(); > > /* > @@ -1322,6 +1326,7 @@ static const struct { > INTEL_MTL_IDS(INTEL_DISPLAY_DEVICE, &mtl_desc), > INTEL_LNL_IDS(INTEL_DISPLAY_DEVICE, &lnl_desc), > INTEL_BMG_IDS(INTEL_DISPLAY_DEVICE, &bmg_desc), > + INTEL_PTL_IDS(INTEL_DISPLAY_DEVICE, &ptl_desc), > }; > > static const struct { > @@ -1332,6 +1337,7 @@ static const struct { > { 14, 0, &xe_lpdp_display }, > { 14, 1, &xe2_hpd_display }, > { 20, 0, &xe2_lpd_display }, > + { 30, 0, &xe2_lpd_display }, > }; > > static const struct intel_display_device_info * > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h > index 3ef537fa551a..071a36b51f79 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_device.h > +++ b/drivers/gpu/drm/i915/display/intel_display_device.h > @@ -70,6 +70,8 @@ enum intel_display_platform { > INTEL_DISPLAY_LUNARLAKE, > /* Display ver 14.1 (based on GMD ID) */ > INTEL_DISPLAY_BATTLEMAGE, > + /* Display ver 30 (based on GMD ID) */ > + INTEL_DISPLAY_PANTHERLAKE, > }; > > enum intel_display_subplatform { > diff --git a/include/drm/intel/i915_pciids.h b/include/drm/intel/i915_pciids.h > index 02156c6f79b6..6b92f8c3731b 100644 > --- a/include/drm/intel/i915_pciids.h > +++ b/include/drm/intel/i915_pciids.h > @@ -794,4 +794,16 @@ > MACRO__(0xE20D, ## __VA_ARGS__), \ > MACRO__(0xE212, ## __VA_ARGS__) > > +/* PTL */ > +#define INTEL_PTL_IDS(MACRO__, ...) \ > + MACRO__(0xB080, ## __VA_ARGS__), \ > + MACRO__(0xB081, ## __VA_ARGS__), \ > + MACRO__(0xB082, ## __VA_ARGS__), \ > + MACRO__(0xB090, ## __VA_ARGS__), \ > + MACRO__(0xB091, ## __VA_ARGS__), \ > + MACRO__(0xB092, ## __VA_ARGS__), \ > + MACRO__(0xB0A0, ## __VA_ARGS__), \ > + MACRO__(0xB0A1, ## __VA_ARGS__), \ > + MACRO__(0xB0A2, ## __VA_ARGS__) > + > #endif /* _I915_PCIIDS_H */ > -- > 2.45.0 >
diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c index f33062322c66..aa22189e3853 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.c +++ b/drivers/gpu/drm/i915/display/intel_display_device.c @@ -1252,6 +1252,10 @@ static const struct platform_desc bmg_desc = { PLATFORM(BATTLEMAGE), }; +static const struct platform_desc ptl_desc = { + PLATFORM(PANTHERLAKE), +}; + __diag_pop(); /* @@ -1322,6 +1326,7 @@ static const struct { INTEL_MTL_IDS(INTEL_DISPLAY_DEVICE, &mtl_desc), INTEL_LNL_IDS(INTEL_DISPLAY_DEVICE, &lnl_desc), INTEL_BMG_IDS(INTEL_DISPLAY_DEVICE, &bmg_desc), + INTEL_PTL_IDS(INTEL_DISPLAY_DEVICE, &ptl_desc), }; static const struct { @@ -1332,6 +1337,7 @@ static const struct { { 14, 0, &xe_lpdp_display }, { 14, 1, &xe2_hpd_display }, { 20, 0, &xe2_lpd_display }, + { 30, 0, &xe2_lpd_display }, }; static const struct intel_display_device_info * diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h index 3ef537fa551a..071a36b51f79 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.h +++ b/drivers/gpu/drm/i915/display/intel_display_device.h @@ -70,6 +70,8 @@ enum intel_display_platform { INTEL_DISPLAY_LUNARLAKE, /* Display ver 14.1 (based on GMD ID) */ INTEL_DISPLAY_BATTLEMAGE, + /* Display ver 30 (based on GMD ID) */ + INTEL_DISPLAY_PANTHERLAKE, }; enum intel_display_subplatform { diff --git a/include/drm/intel/i915_pciids.h b/include/drm/intel/i915_pciids.h index 02156c6f79b6..6b92f8c3731b 100644 --- a/include/drm/intel/i915_pciids.h +++ b/include/drm/intel/i915_pciids.h @@ -794,4 +794,16 @@ MACRO__(0xE20D, ## __VA_ARGS__), \ MACRO__(0xE212, ## __VA_ARGS__) +/* PTL */ +#define INTEL_PTL_IDS(MACRO__, ...) \ + MACRO__(0xB080, ## __VA_ARGS__), \ + MACRO__(0xB081, ## __VA_ARGS__), \ + MACRO__(0xB082, ## __VA_ARGS__), \ + MACRO__(0xB090, ## __VA_ARGS__), \ + MACRO__(0xB091, ## __VA_ARGS__), \ + MACRO__(0xB092, ## __VA_ARGS__), \ + MACRO__(0xB0A0, ## __VA_ARGS__), \ + MACRO__(0xB0A1, ## __VA_ARGS__), \ + MACRO__(0xB0A2, ## __VA_ARGS__) + #endif /* _I915_PCIIDS_H */