* [PATCH] drm/i915/bios: add DP max link rate to VBT child device struct
@ 2018-01-18 15:04 Jani Nikula
2018-01-18 15:16 ` David Weinehall
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Jani Nikula @ 2018-01-18 15:04 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Rodrigo Vivi
Update VBT defs to reflect revision 216. While at it, default the
expected child device struct size to sizeof the size rather than a
hardcoded value.
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_bios.c | 8 +++++---
drivers/gpu/drm/i915/intel_vbt_defs.h | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 51108ffc28d1..b820d595ebc8 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1323,11 +1323,13 @@ parse_general_definitions(struct drm_i915_private *dev_priv,
expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE;
} else if (bdb->version == 195) {
expected_size = 37;
- } else if (bdb->version <= 197) {
+ } else if (bdb->version <= 215) {
expected_size = 38;
+ } else if (bdb->version <= 216) {
+ expected_size = 39;
} else {
- expected_size = 38;
- BUILD_BUG_ON(sizeof(*child) < 38);
+ expected_size = sizeof(*child);
+ BUILD_BUG_ON(sizeof(*child) < 39);
DRM_DEBUG_DRIVER("Expected child device config size for VBT version %u not known; assuming %u\n",
bdb->version, expected_size);
}
diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
index e3d7745a9151..bbb173e116b3 100644
--- a/drivers/gpu/drm/i915/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
@@ -412,6 +412,8 @@ struct child_device_config {
u16 dp_gpio_pin_num; /* 195 */
u8 dp_iboost_level:4; /* 196 */
u8 hdmi_iboost_level:4; /* 196 */
+ u8 dp_max_link_rate_reserved:6; /* 216 */
+ u8 dp_max_link_rate:2; /* 216 CNL+ */
} __packed;
struct bdb_general_definitions {
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915/bios: add DP max link rate to VBT child device struct
2018-01-18 15:04 [PATCH] drm/i915/bios: add DP max link rate to VBT child device struct Jani Nikula
@ 2018-01-18 15:16 ` David Weinehall
2018-01-18 15:31 ` Jani Nikula
2018-01-18 15:33 ` [PATCH v2] " Jani Nikula
2018-01-18 16:26 ` ✓ Fi.CI.BAT: success for drm/i915/bios: add DP max link rate to VBT child device struct (rev2) Patchwork
2018-01-18 20:29 ` ✗ Fi.CI.IGT: failure " Patchwork
2 siblings, 2 replies; 11+ messages in thread
From: David Weinehall @ 2018-01-18 15:16 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Rodrigo Vivi
On Thu, Jan 18, 2018 at 05:04:59PM +0200, Jani Nikula wrote:
> Update VBT defs to reflect revision 216. While at it, default the
> expected child device struct size to sizeof the size rather than a
> hardcoded value.
>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_bios.c | 8 +++++---
> drivers/gpu/drm/i915/intel_vbt_defs.h | 2 ++
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index 51108ffc28d1..b820d595ebc8 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -1323,11 +1323,13 @@ parse_general_definitions(struct drm_i915_private *dev_priv,
> expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE;
> } else if (bdb->version == 195) {
> expected_size = 37;
> - } else if (bdb->version <= 197) {
> + } else if (bdb->version <= 215) {
> expected_size = 38;
> + } else if (bdb->version <= 216) {
> + expected_size = 39;
> } else {
> - expected_size = 38;
> - BUILD_BUG_ON(sizeof(*child) < 38);
> + expected_size = sizeof(*child);
> + BUILD_BUG_ON(sizeof(*child) < 39);
> DRM_DEBUG_DRIVER("Expected child device config size for VBT version %u not known; assuming %u\n",
> bdb->version, expected_size);
> }
> diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
> index e3d7745a9151..bbb173e116b3 100644
> --- a/drivers/gpu/drm/i915/intel_vbt_defs.h
> +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
> @@ -412,6 +412,8 @@ struct child_device_config {
> u16 dp_gpio_pin_num; /* 195 */
> u8 dp_iboost_level:4; /* 196 */
> u8 hdmi_iboost_level:4; /* 196 */
> + u8 dp_max_link_rate_reserved:6; /* 216 */
> + u8 dp_max_link_rate:2; /* 216 CNL+ */
Isn't the bitorder wrong here?
> } __packed;
>
> struct bdb_general_definitions {
> --
> 2.11.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915/bios: add DP max link rate to VBT child device struct
2018-01-18 15:16 ` David Weinehall
@ 2018-01-18 15:31 ` Jani Nikula
2018-01-18 15:38 ` Ville Syrjälä
2018-01-18 15:33 ` [PATCH v2] " Jani Nikula
1 sibling, 1 reply; 11+ messages in thread
From: Jani Nikula @ 2018-01-18 15:31 UTC (permalink / raw)
To: David Weinehall; +Cc: intel-gfx, Rodrigo Vivi
On Thu, 18 Jan 2018, David Weinehall <david.weinehall@linux.intel.com> wrote:
> On Thu, Jan 18, 2018 at 05:04:59PM +0200, Jani Nikula wrote:
>> Update VBT defs to reflect revision 216. While at it, default the
>> expected child device struct size to sizeof the size rather than a
>> hardcoded value.
>>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
>
>> ---
>> drivers/gpu/drm/i915/intel_bios.c | 8 +++++---
>> drivers/gpu/drm/i915/intel_vbt_defs.h | 2 ++
>> 2 files changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>> index 51108ffc28d1..b820d595ebc8 100644
>> --- a/drivers/gpu/drm/i915/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>> @@ -1323,11 +1323,13 @@ parse_general_definitions(struct drm_i915_private *dev_priv,
>> expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE;
>> } else if (bdb->version == 195) {
>> expected_size = 37;
>> - } else if (bdb->version <= 197) {
>> + } else if (bdb->version <= 215) {
>> expected_size = 38;
>> + } else if (bdb->version <= 216) {
>> + expected_size = 39;
>> } else {
>> - expected_size = 38;
>> - BUILD_BUG_ON(sizeof(*child) < 38);
>> + expected_size = sizeof(*child);
>> + BUILD_BUG_ON(sizeof(*child) < 39);
>> DRM_DEBUG_DRIVER("Expected child device config size for VBT version %u not known; assuming %u\n",
>> bdb->version, expected_size);
>> }
>> diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
>> index e3d7745a9151..bbb173e116b3 100644
>> --- a/drivers/gpu/drm/i915/intel_vbt_defs.h
>> +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
>> @@ -412,6 +412,8 @@ struct child_device_config {
>> u16 dp_gpio_pin_num; /* 195 */
>> u8 dp_iboost_level:4; /* 196 */
>> u8 hdmi_iboost_level:4; /* 196 */
>> + u8 dp_max_link_rate_reserved:6; /* 216 */
>> + u8 dp_max_link_rate:2; /* 216 CNL+ */
>
> Isn't the bitorder wrong here?
*facepalm*
>
>> } __packed;
>>
>> struct bdb_general_definitions {
>> --
>> 2.11.0
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915/bios: add DP max link rate to VBT child device struct
2018-01-18 15:31 ` Jani Nikula
@ 2018-01-18 15:38 ` Ville Syrjälä
0 siblings, 0 replies; 11+ messages in thread
From: Ville Syrjälä @ 2018-01-18 15:38 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Rodrigo Vivi
On Thu, Jan 18, 2018 at 05:31:45PM +0200, Jani Nikula wrote:
> On Thu, 18 Jan 2018, David Weinehall <david.weinehall@linux.intel.com> wrote:
> > On Thu, Jan 18, 2018 at 05:04:59PM +0200, Jani Nikula wrote:
> >> Update VBT defs to reflect revision 216. While at it, default the
> >> expected child device struct size to sizeof the size rather than a
> >> hardcoded value.
> >>
> >> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> >
> >
> >> ---
> >> drivers/gpu/drm/i915/intel_bios.c | 8 +++++---
> >> drivers/gpu/drm/i915/intel_vbt_defs.h | 2 ++
> >> 2 files changed, 7 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> >> index 51108ffc28d1..b820d595ebc8 100644
> >> --- a/drivers/gpu/drm/i915/intel_bios.c
> >> +++ b/drivers/gpu/drm/i915/intel_bios.c
> >> @@ -1323,11 +1323,13 @@ parse_general_definitions(struct drm_i915_private *dev_priv,
> >> expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE;
> >> } else if (bdb->version == 195) {
> >> expected_size = 37;
> >> - } else if (bdb->version <= 197) {
> >> + } else if (bdb->version <= 215) {
> >> expected_size = 38;
> >> + } else if (bdb->version <= 216) {
> >> + expected_size = 39;
> >> } else {
> >> - expected_size = 38;
> >> - BUILD_BUG_ON(sizeof(*child) < 38);
> >> + expected_size = sizeof(*child);
> >> + BUILD_BUG_ON(sizeof(*child) < 39);
> >> DRM_DEBUG_DRIVER("Expected child device config size for VBT version %u not known; assuming %u\n",
> >> bdb->version, expected_size);
> >> }
> >> diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
> >> index e3d7745a9151..bbb173e116b3 100644
> >> --- a/drivers/gpu/drm/i915/intel_vbt_defs.h
> >> +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
> >> @@ -412,6 +412,8 @@ struct child_device_config {
> >> u16 dp_gpio_pin_num; /* 195 */
> >> u8 dp_iboost_level:4; /* 196 */
> >> u8 hdmi_iboost_level:4; /* 196 */
> >> + u8 dp_max_link_rate_reserved:6; /* 216 */
> >> + u8 dp_max_link_rate:2; /* 216 CNL+ */
> >
> > Isn't the bitorder wrong here?
>
> *facepalm*
Maybe we should add a comment specifying how we expect them
bitfields to work here. I can never remember which way they go.
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2] drm/i915/bios: add DP max link rate to VBT child device struct
2018-01-18 15:16 ` David Weinehall
2018-01-18 15:31 ` Jani Nikula
@ 2018-01-18 15:33 ` Jani Nikula
2018-01-18 20:12 ` Rodrigo Vivi
2018-01-19 13:22 ` Ville Syrjälä
1 sibling, 2 replies; 11+ messages in thread
From: Jani Nikula @ 2018-01-18 15:33 UTC (permalink / raw)
To: David Weinehall, Jani Nikula; +Cc: intel-gfx, Rodrigo Vivi
Update VBT defs to reflect revision 216. While at it, default the
expected child device struct size to sizeof the size rather than a
hardcoded value.
v2: Fix bit order (David)
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_bios.c | 8 +++++---
drivers/gpu/drm/i915/intel_vbt_defs.h | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 51108ffc28d1..b820d595ebc8 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1323,11 +1323,13 @@ parse_general_definitions(struct drm_i915_private *dev_priv,
expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE;
} else if (bdb->version == 195) {
expected_size = 37;
- } else if (bdb->version <= 197) {
+ } else if (bdb->version <= 215) {
expected_size = 38;
+ } else if (bdb->version <= 216) {
+ expected_size = 39;
} else {
- expected_size = 38;
- BUILD_BUG_ON(sizeof(*child) < 38);
+ expected_size = sizeof(*child);
+ BUILD_BUG_ON(sizeof(*child) < 39);
DRM_DEBUG_DRIVER("Expected child device config size for VBT version %u not known; assuming %u\n",
bdb->version, expected_size);
}
diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
index e3d7745a9151..98dff6058d3c 100644
--- a/drivers/gpu/drm/i915/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
@@ -412,6 +412,8 @@ struct child_device_config {
u16 dp_gpio_pin_num; /* 195 */
u8 dp_iboost_level:4; /* 196 */
u8 hdmi_iboost_level:4; /* 196 */
+ u8 dp_max_link_rate:2; /* 216 CNL+ */
+ u8 dp_max_link_rate_reserved:6; /* 216 */
} __packed;
struct bdb_general_definitions {
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v2] drm/i915/bios: add DP max link rate to VBT child device struct
2018-01-18 15:33 ` [PATCH v2] " Jani Nikula
@ 2018-01-18 20:12 ` Rodrigo Vivi
2018-01-18 20:14 ` Rodrigo Vivi
2018-01-19 13:22 ` Ville Syrjälä
1 sibling, 1 reply; 11+ messages in thread
From: Rodrigo Vivi @ 2018-01-18 20:12 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Thu, Jan 18, 2018 at 03:33:10PM +0000, Jani Nikula wrote:
> Update VBT defs to reflect revision 216. While at it, default the
> expected child device struct size to sizeof the size rather than a
> hardcoded value.
>
> v2: Fix bit order (David)
>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_bios.c | 8 +++++---
> drivers/gpu/drm/i915/intel_vbt_defs.h | 2 ++
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index 51108ffc28d1..b820d595ebc8 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -1323,11 +1323,13 @@ parse_general_definitions(struct drm_i915_private *dev_priv,
> expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE;
> } else if (bdb->version == 195) {
> expected_size = 37;
> - } else if (bdb->version <= 197) {
> + } else if (bdb->version <= 215) {
> expected_size = 38;
> + } else if (bdb->version <= 216) {
> + expected_size = 39;
> } else {
> - expected_size = 38;
> - BUILD_BUG_ON(sizeof(*child) < 38);
> + expected_size = sizeof(*child);
> + BUILD_BUG_ON(sizeof(*child) < 39);
> DRM_DEBUG_DRIVER("Expected child device config size for VBT version %u not known; assuming %u\n",
> bdb->version, expected_size);
> }
> diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
> index e3d7745a9151..98dff6058d3c 100644
> --- a/drivers/gpu/drm/i915/intel_vbt_defs.h
> +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
> @@ -412,6 +412,8 @@ struct child_device_config {
> u16 dp_gpio_pin_num; /* 195 */
> u8 dp_iboost_level:4; /* 196 */
> u8 hdmi_iboost_level:4; /* 196 */
> + u8 dp_max_link_rate:2; /* 216 CNL+ */
> + u8 dp_max_link_rate_reserved:6; /* 216 */
> } __packed;
>
> struct bdb_general_definitions {
> --
> 2.11.0
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH v2] drm/i915/bios: add DP max link rate to VBT child device struct
2018-01-18 20:12 ` Rodrigo Vivi
@ 2018-01-18 20:14 ` Rodrigo Vivi
0 siblings, 0 replies; 11+ messages in thread
From: Rodrigo Vivi @ 2018-01-18 20:14 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Thu, Jan 18, 2018 at 08:12:18PM +0000, Rodrigo Vivi wrote:
> On Thu, Jan 18, 2018 at 03:33:10PM +0000, Jani Nikula wrote:
> > Update VBT defs to reflect revision 216. While at it, default the
> > expected child device struct size to sizeof the size rather than a
> > hardcoded value.
> >
> > v2: Fix bit order (David)
> >
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
and merged... thanks
>
>
> > ---
> > drivers/gpu/drm/i915/intel_bios.c | 8 +++++---
> > drivers/gpu/drm/i915/intel_vbt_defs.h | 2 ++
> > 2 files changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> > index 51108ffc28d1..b820d595ebc8 100644
> > --- a/drivers/gpu/drm/i915/intel_bios.c
> > +++ b/drivers/gpu/drm/i915/intel_bios.c
> > @@ -1323,11 +1323,13 @@ parse_general_definitions(struct drm_i915_private *dev_priv,
> > expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE;
> > } else if (bdb->version == 195) {
> > expected_size = 37;
> > - } else if (bdb->version <= 197) {
> > + } else if (bdb->version <= 215) {
> > expected_size = 38;
> > + } else if (bdb->version <= 216) {
> > + expected_size = 39;
> > } else {
> > - expected_size = 38;
> > - BUILD_BUG_ON(sizeof(*child) < 38);
> > + expected_size = sizeof(*child);
> > + BUILD_BUG_ON(sizeof(*child) < 39);
> > DRM_DEBUG_DRIVER("Expected child device config size for VBT version %u not known; assuming %u\n",
> > bdb->version, expected_size);
> > }
> > diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
> > index e3d7745a9151..98dff6058d3c 100644
> > --- a/drivers/gpu/drm/i915/intel_vbt_defs.h
> > +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
> > @@ -412,6 +412,8 @@ struct child_device_config {
> > u16 dp_gpio_pin_num; /* 195 */
> > u8 dp_iboost_level:4; /* 196 */
> > u8 hdmi_iboost_level:4; /* 196 */
> > + u8 dp_max_link_rate:2; /* 216 CNL+ */
> > + u8 dp_max_link_rate_reserved:6; /* 216 */
> > } __packed;
> >
> > struct bdb_general_definitions {
> > --
> > 2.11.0
> >
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] drm/i915/bios: add DP max link rate to VBT child device struct
2018-01-18 15:33 ` [PATCH v2] " Jani Nikula
2018-01-18 20:12 ` Rodrigo Vivi
@ 2018-01-19 13:22 ` Ville Syrjälä
2018-01-19 13:35 ` Jani Nikula
1 sibling, 1 reply; 11+ messages in thread
From: Ville Syrjälä @ 2018-01-19 13:22 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Rodrigo Vivi
On Thu, Jan 18, 2018 at 05:33:10PM +0200, Jani Nikula wrote:
> Update VBT defs to reflect revision 216. While at it, default the
> expected child device struct size to sizeof the size rather than a
> hardcoded value.
>
> v2: Fix bit order (David)
>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_bios.c | 8 +++++---
> drivers/gpu/drm/i915/intel_vbt_defs.h | 2 ++
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index 51108ffc28d1..b820d595ebc8 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -1323,11 +1323,13 @@ parse_general_definitions(struct drm_i915_private *dev_priv,
> expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE;
> } else if (bdb->version == 195) {
> expected_size = 37;
> - } else if (bdb->version <= 197) {
> + } else if (bdb->version <= 215) {
> expected_size = 38;
> + } else if (bdb->version <= 216) {
> + expected_size = 39;
> } else {
> - expected_size = 38;
> - BUILD_BUG_ON(sizeof(*child) < 38);
> + expected_size = sizeof(*child);
> + BUILD_BUG_ON(sizeof(*child) < 39);
> DRM_DEBUG_DRIVER("Expected child device config size for VBT version %u not known; assuming %u\n",
> bdb->version, expected_size);
> }
> diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
> index e3d7745a9151..98dff6058d3c 100644
> --- a/drivers/gpu/drm/i915/intel_vbt_defs.h
> +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
> @@ -412,6 +412,8 @@ struct child_device_config {
> u16 dp_gpio_pin_num; /* 195 */
> u8 dp_iboost_level:4; /* 196 */
> u8 hdmi_iboost_level:4; /* 196 */
> + u8 dp_max_link_rate:2; /* 216 CNL+ */
BTW is someone going to actually hook this up?
> + u8 dp_max_link_rate_reserved:6; /* 216 */
> } __packed;
>
> struct bdb_general_definitions {
> --
> 2.11.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH v2] drm/i915/bios: add DP max link rate to VBT child device struct
2018-01-19 13:22 ` Ville Syrjälä
@ 2018-01-19 13:35 ` Jani Nikula
0 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2018-01-19 13:35 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx, Rodrigo Vivi
On Fri, 19 Jan 2018, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Thu, Jan 18, 2018 at 05:33:10PM +0200, Jani Nikula wrote:
>> Update VBT defs to reflect revision 216. While at it, default the
>> expected child device struct size to sizeof the size rather than a
>> hardcoded value.
>>
>> v2: Fix bit order (David)
>>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_bios.c | 8 +++++---
>> drivers/gpu/drm/i915/intel_vbt_defs.h | 2 ++
>> 2 files changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>> index 51108ffc28d1..b820d595ebc8 100644
>> --- a/drivers/gpu/drm/i915/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>> @@ -1323,11 +1323,13 @@ parse_general_definitions(struct drm_i915_private *dev_priv,
>> expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE;
>> } else if (bdb->version == 195) {
>> expected_size = 37;
>> - } else if (bdb->version <= 197) {
>> + } else if (bdb->version <= 215) {
>> expected_size = 38;
>> + } else if (bdb->version <= 216) {
>> + expected_size = 39;
>> } else {
>> - expected_size = 38;
>> - BUILD_BUG_ON(sizeof(*child) < 38);
>> + expected_size = sizeof(*child);
>> + BUILD_BUG_ON(sizeof(*child) < 39);
>> DRM_DEBUG_DRIVER("Expected child device config size for VBT version %u not known; assuming %u\n",
>> bdb->version, expected_size);
>> }
>> diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
>> index e3d7745a9151..98dff6058d3c 100644
>> --- a/drivers/gpu/drm/i915/intel_vbt_defs.h
>> +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
>> @@ -412,6 +412,8 @@ struct child_device_config {
>> u16 dp_gpio_pin_num; /* 195 */
>> u8 dp_iboost_level:4; /* 196 */
>> u8 hdmi_iboost_level:4; /* 196 */
>> + u8 dp_max_link_rate:2; /* 216 CNL+ */
>
> BTW is someone going to actually hook this up?
Patches welcome! ;)
J.
>
>> + u8 dp_max_link_rate_reserved:6; /* 216 */
>> } __packed;
>>
>> struct bdb_general_definitions {
>> --
>> 2.11.0
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915/bios: add DP max link rate to VBT child device struct (rev2)
2018-01-18 15:04 [PATCH] drm/i915/bios: add DP max link rate to VBT child device struct Jani Nikula
2018-01-18 15:16 ` David Weinehall
@ 2018-01-18 16:26 ` Patchwork
2018-01-18 20:29 ` ✗ Fi.CI.IGT: failure " Patchwork
2 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2018-01-18 16:26 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/bios: add DP max link rate to VBT child device struct (rev2)
URL : https://patchwork.freedesktop.org/series/36701/
State : success
== Summary ==
Series 36701v2 drm/i915/bios: add DP max link rate to VBT child device struct
https://patchwork.freedesktop.org/api/1.0/series/36701/revisions/2/mbox/
Test debugfs_test:
Subgroup read_all_entries:
dmesg-warn -> DMESG-FAIL (fi-elk-e7500) fdo#103989
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
fail -> PASS (fi-gdg-551) fdo#102575
Test kms_chamelium:
Subgroup dp-crc-fast:
dmesg-fail -> PASS (fi-kbl-7500u) fdo#103841
fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:420s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:429s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:373s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:483s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:281s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:485s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:490s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:465s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:466s
fi-elk-e7500 total:224 pass:168 dwarn:9 dfail:1 fail:0 skip:45
fi-gdg-551 total:288 pass:180 dwarn:0 dfail:0 fail:0 skip:108 time:277s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:511s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:398s
fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:399s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:411s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:456s
fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:418s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:462s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:501s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:454s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:500s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:588s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:428s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:507s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:535s
fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:487s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:476s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:432s
fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:525s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:398s
Blacklisted hosts:
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:576s
fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:469s
fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:420s
2c42c3d90f29dc7e0914c7b4498f4da93f0e5ac8 drm-tip: 2018y-01m-18d-15h-19m-38s UTC integration manifest
ee2e24cadbf7 drm/i915/bios: add DP max link rate to VBT child device struct
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7712/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* ✗ Fi.CI.IGT: failure for drm/i915/bios: add DP max link rate to VBT child device struct (rev2)
2018-01-18 15:04 [PATCH] drm/i915/bios: add DP max link rate to VBT child device struct Jani Nikula
2018-01-18 15:16 ` David Weinehall
2018-01-18 16:26 ` ✓ Fi.CI.BAT: success for drm/i915/bios: add DP max link rate to VBT child device struct (rev2) Patchwork
@ 2018-01-18 20:29 ` Patchwork
2 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2018-01-18 20:29 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/bios: add DP max link rate to VBT child device struct (rev2)
URL : https://patchwork.freedesktop.org/series/36701/
State : failure
== Summary ==
Warning: bzip Patchwork_7712/shard-hsw1/results34.json.bz2 wasn't in correct JSON format
Test perf:
Subgroup blocking:
pass -> FAIL (shard-hsw) fdo#102252
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-render:
fail -> PASS (shard-snb) fdo#101623
Test kms_flip:
Subgroup 2x-plain-flip-fb-recreate-interruptible:
pass -> FAIL (shard-hsw)
Subgroup flip-vs-modeset-vs-hang-interruptible:
dmesg-warn -> PASS (shard-snb) fdo#104311
Subgroup plain-flip-fb-recreate-interruptible:
pass -> FAIL (shard-hsw) fdo#100368
Test kms_flip_event_leak:
pass -> SKIP (shard-snb)
Test kms_draw_crc:
Subgroup draw-method-xrgb8888-mmap-cpu-untiled:
skip -> PASS (shard-snb)
Subgroup draw-method-rgb565-blt-untiled:
skip -> PASS (shard-snb)
Test kms_chv_cursor_fail:
Subgroup pipe-a-256x256-bottom-edge:
skip -> PASS (shard-snb)
Test kms_universal_plane:
Subgroup disable-primary-vs-flip-pipe-b:
skip -> PASS (shard-snb)
Test drv_suspend:
Subgroup sysfs-reader:
pass -> SKIP (shard-hsw)
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#104311 https://bugs.freedesktop.org/show_bug.cgi?id=104311
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
shard-hsw total:2676 pass:1679 dwarn:1 dfail:0 fail:12 skip:983 time:15183s
shard-snb total:2753 pass:1317 dwarn:1 dfail:0 fail:11 skip:1424 time:7929s
Blacklisted hosts:
shard-apl total:2753 pass:1716 dwarn:1 dfail:0 fail:21 skip:1015 time:13942s
shard-kbl total:2745 pass:1829 dwarn:1 dfail:0 fail:24 skip:890 time:10330s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7712/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-01-19 13:30 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-18 15:04 [PATCH] drm/i915/bios: add DP max link rate to VBT child device struct Jani Nikula
2018-01-18 15:16 ` David Weinehall
2018-01-18 15:31 ` Jani Nikula
2018-01-18 15:38 ` Ville Syrjälä
2018-01-18 15:33 ` [PATCH v2] " Jani Nikula
2018-01-18 20:12 ` Rodrigo Vivi
2018-01-18 20:14 ` Rodrigo Vivi
2018-01-19 13:22 ` Ville Syrjälä
2018-01-19 13:35 ` Jani Nikula
2018-01-18 16:26 ` ✓ Fi.CI.BAT: success for drm/i915/bios: add DP max link rate to VBT child device struct (rev2) Patchwork
2018-01-18 20:29 ` ✗ Fi.CI.IGT: failure " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.