| Message ID | 1438847501-28454-1-git-send-email-xiong.y.zhang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Aug 06, 2015 at 03:51:36PM +0800, Xiong Zhang wrote: > From: Rodrigo Vivi <rodrigo.vivi@intel.com> > > There are OEMs using DDI-E out there, > so let's enable it. > > Unfortunately there is no detection bit for DDI-E > So we need to rely on VBT for that. > > I also need to give credits to Xiong since before seing > his approach to check info->support_* I was creating an ugly > vbt->ddie_sfuse_strap in order to propagate the ddi presence info > > Credits-to: "Zhang, Xiong Y" <xiong.y.zhang@intel.com> > Cc: "Zhang, Xiong Y" <xiong.y.zhang@intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Enable patches like these should be last in the series, since before all the other stuff things will simply be broken. -Daniel > --- > drivers/gpu/drm/i915/intel_bios.c | 14 +++++++------- > drivers/gpu/drm/i915/intel_bios.h | 2 ++ > drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ > 3 files changed, 18 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c > index 2ff9eb0..55b5072 100644 > --- a/drivers/gpu/drm/i915/intel_bios.c > +++ b/drivers/gpu/drm/i915/intel_bios.c > @@ -898,19 +898,19 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, > /* Each DDI port can have more than one value on the "DVO Port" field, > * so look for all the possible values for each port and abort if more > * than one is found. */ > - int dvo_ports[][2] = { > - {DVO_PORT_HDMIA, DVO_PORT_DPA}, > - {DVO_PORT_HDMIB, DVO_PORT_DPB}, > - {DVO_PORT_HDMIC, DVO_PORT_DPC}, > - {DVO_PORT_HDMID, DVO_PORT_DPD}, > - {DVO_PORT_CRT, -1 /* Port E can only be DVO_PORT_CRT */ }, > + int dvo_ports[][3] = { > + {DVO_PORT_HDMIA, DVO_PORT_DPA, -1}, > + {DVO_PORT_HDMIB, DVO_PORT_DPB, -1}, > + {DVO_PORT_HDMIC, DVO_PORT_DPC, -1}, > + {DVO_PORT_HDMID, DVO_PORT_DPD, -1}, > + {DVO_PORT_CRT, DVO_PORT_HDMIE, DVO_PORT_DPE}, > }; > > /* Find the child device to use, abort if more than one found. */ > for (i = 0; i < dev_priv->vbt.child_dev_num; i++) { > it = dev_priv->vbt.child_dev + i; > > - for (j = 0; j < 2; j++) { > + for (j = 0; j < 3; j++) { > if (dvo_ports[port][j] == -1) > break; > > diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h > index f7ad6a5..02255d8 100644 > --- a/drivers/gpu/drm/i915/intel_bios.h > +++ b/drivers/gpu/drm/i915/intel_bios.h > @@ -764,6 +764,8 @@ int intel_parse_bios(struct drm_device *dev); > #define DVO_PORT_DPC 8 > #define DVO_PORT_DPD 9 > #define DVO_PORT_DPA 10 > +#define DVO_PORT_DPE 11 > +#define DVO_PORT_HDMIE 12 > #define DVO_PORT_MIPIA 21 > #define DVO_PORT_MIPIB 22 > #define DVO_PORT_MIPIC 23 > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index af0bcfe..aaa34b8 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -14123,6 +14123,15 @@ static void intel_setup_outputs(struct drm_device *dev) > intel_ddi_init(dev, PORT_C); > if (found & SFUSE_STRAP_DDID_DETECTED) > intel_ddi_init(dev, PORT_D); > + /* > + * On SKL we don't have a way to detect DDI-E so we rely on VBT. > + */ > + if (IS_SKYLAKE(dev) && > + (dev_priv->vbt.ddi_port_info[PORT_E].supports_dp || > + dev_priv->vbt.ddi_port_info[PORT_E].supports_dvi || > + dev_priv->vbt.ddi_port_info[PORT_E].supports_hdmi)) > + intel_ddi_init(dev, PORT_E); > + > } else if (HAS_PCH_SPLIT(dev)) { > int found; > dpd_is_edp = intel_dp_is_edp(dev, PORT_D); > -- > 2.1.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, Aug 06, 2015 at 03:51:36PM +0800, Xiong Zhang wrote: > From: Rodrigo Vivi <rodrigo.vivi@intel.com> > > There are OEMs using DDI-E out there, > so let's enable it. > > Unfortunately there is no detection bit for DDI-E > So we need to rely on VBT for that. > > I also need to give credits to Xiong since before seing > his approach to check info->support_* I was creating an ugly > vbt->ddie_sfuse_strap in order to propagate the ddi presence info > > Credits-to: "Zhang, Xiong Y" <xiong.y.zhang@intel.com> > Cc: "Zhang, Xiong Y" <xiong.y.zhang@intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> btw how is this series related to http://lists.freedesktop.org/archives/intel-gfx/2015-April/065227.html Do we need that still? Can you please include that patch in your series if so? -Daniel > --- > drivers/gpu/drm/i915/intel_bios.c | 14 +++++++------- > drivers/gpu/drm/i915/intel_bios.h | 2 ++ > drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ > 3 files changed, 18 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c > index 2ff9eb0..55b5072 100644 > --- a/drivers/gpu/drm/i915/intel_bios.c > +++ b/drivers/gpu/drm/i915/intel_bios.c > @@ -898,19 +898,19 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, > /* Each DDI port can have more than one value on the "DVO Port" field, > * so look for all the possible values for each port and abort if more > * than one is found. */ > - int dvo_ports[][2] = { > - {DVO_PORT_HDMIA, DVO_PORT_DPA}, > - {DVO_PORT_HDMIB, DVO_PORT_DPB}, > - {DVO_PORT_HDMIC, DVO_PORT_DPC}, > - {DVO_PORT_HDMID, DVO_PORT_DPD}, > - {DVO_PORT_CRT, -1 /* Port E can only be DVO_PORT_CRT */ }, > + int dvo_ports[][3] = { > + {DVO_PORT_HDMIA, DVO_PORT_DPA, -1}, > + {DVO_PORT_HDMIB, DVO_PORT_DPB, -1}, > + {DVO_PORT_HDMIC, DVO_PORT_DPC, -1}, > + {DVO_PORT_HDMID, DVO_PORT_DPD, -1}, > + {DVO_PORT_CRT, DVO_PORT_HDMIE, DVO_PORT_DPE}, > }; > > /* Find the child device to use, abort if more than one found. */ > for (i = 0; i < dev_priv->vbt.child_dev_num; i++) { > it = dev_priv->vbt.child_dev + i; > > - for (j = 0; j < 2; j++) { > + for (j = 0; j < 3; j++) { > if (dvo_ports[port][j] == -1) > break; > > diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h > index f7ad6a5..02255d8 100644 > --- a/drivers/gpu/drm/i915/intel_bios.h > +++ b/drivers/gpu/drm/i915/intel_bios.h > @@ -764,6 +764,8 @@ int intel_parse_bios(struct drm_device *dev); > #define DVO_PORT_DPC 8 > #define DVO_PORT_DPD 9 > #define DVO_PORT_DPA 10 > +#define DVO_PORT_DPE 11 > +#define DVO_PORT_HDMIE 12 > #define DVO_PORT_MIPIA 21 > #define DVO_PORT_MIPIB 22 > #define DVO_PORT_MIPIC 23 > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index af0bcfe..aaa34b8 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -14123,6 +14123,15 @@ static void intel_setup_outputs(struct drm_device *dev) > intel_ddi_init(dev, PORT_C); > if (found & SFUSE_STRAP_DDID_DETECTED) > intel_ddi_init(dev, PORT_D); > + /* > + * On SKL we don't have a way to detect DDI-E so we rely on VBT. > + */ > + if (IS_SKYLAKE(dev) && > + (dev_priv->vbt.ddi_port_info[PORT_E].supports_dp || > + dev_priv->vbt.ddi_port_info[PORT_E].supports_dvi || > + dev_priv->vbt.ddi_port_info[PORT_E].supports_hdmi)) > + intel_ddi_init(dev, PORT_E); > + > } else if (HAS_PCH_SPLIT(dev)) { > int found; > dpd_is_edp = intel_dp_is_edp(dev, PORT_D); > -- > 2.1.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, 2015-08-06 at 15:30 +0200, Daniel Vetter wrote: > On Thu, Aug 06, 2015 at 03:51:36PM +0800, Xiong Zhang wrote: > > From: Rodrigo Vivi <rodrigo.vivi@intel.com> > > > > There are OEMs using DDI-E out there, > > so let's enable it. > > > > Unfortunately there is no detection bit for DDI-E > > So we need to rely on VBT for that. > > > > I also need to give credits to Xiong since before seing > > his approach to check info->support_* I was creating an ugly > > vbt->ddie_sfuse_strap in order to propagate the ddi presence info > > > > Credits-to: "Zhang, Xiong Y" <xiong.y.zhang@intel.com> > > Cc: "Zhang, Xiong Y" <xiong.y.zhang@intel.com> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Enable patches like these should be last in the series, since before all > the other stuff things will simply be broken. ops, my bad... totally agree... I will rebase locally here moving this up... > -Daniel > > > --- > > drivers/gpu/drm/i915/intel_bios.c | 14 +++++++------- > > drivers/gpu/drm/i915/intel_bios.h | 2 ++ > > drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ > > 3 files changed, 18 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c > > index 2ff9eb0..55b5072 100644 > > --- a/drivers/gpu/drm/i915/intel_bios.c > > +++ b/drivers/gpu/drm/i915/intel_bios.c > > @@ -898,19 +898,19 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, > > /* Each DDI port can have more than one value on the "DVO Port" field, > > * so look for all the possible values for each port and abort if more > > * than one is found. */ > > - int dvo_ports[][2] = { > > - {DVO_PORT_HDMIA, DVO_PORT_DPA}, > > - {DVO_PORT_HDMIB, DVO_PORT_DPB}, > > - {DVO_PORT_HDMIC, DVO_PORT_DPC}, > > - {DVO_PORT_HDMID, DVO_PORT_DPD}, > > - {DVO_PORT_CRT, -1 /* Port E can only be DVO_PORT_CRT */ }, > > + int dvo_ports[][3] = { > > + {DVO_PORT_HDMIA, DVO_PORT_DPA, -1}, > > + {DVO_PORT_HDMIB, DVO_PORT_DPB, -1}, > > + {DVO_PORT_HDMIC, DVO_PORT_DPC, -1}, > > + {DVO_PORT_HDMID, DVO_PORT_DPD, -1}, > > + {DVO_PORT_CRT, DVO_PORT_HDMIE, DVO_PORT_DPE}, > > }; > > > > /* Find the child device to use, abort if more than one found. */ > > for (i = 0; i < dev_priv->vbt.child_dev_num; i++) { > > it = dev_priv->vbt.child_dev + i; > > > > - for (j = 0; j < 2; j++) { > > + for (j = 0; j < 3; j++) { > > if (dvo_ports[port][j] == -1) > > break; > > > > diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h > > index f7ad6a5..02255d8 100644 > > --- a/drivers/gpu/drm/i915/intel_bios.h > > +++ b/drivers/gpu/drm/i915/intel_bios.h > > @@ -764,6 +764,8 @@ int intel_parse_bios(struct drm_device *dev); > > #define DVO_PORT_DPC 8 > > #define DVO_PORT_DPD 9 > > #define DVO_PORT_DPA 10 > > +#define DVO_PORT_DPE 11 > > +#define DVO_PORT_HDMIE 12 > > #define DVO_PORT_MIPIA 21 > > #define DVO_PORT_MIPIB 22 > > #define DVO_PORT_MIPIC 23 > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index af0bcfe..aaa34b8 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -14123,6 +14123,15 @@ static void intel_setup_outputs(struct drm_device *dev) > > intel_ddi_init(dev, PORT_C); > > if (found & SFUSE_STRAP_DDID_DETECTED) > > intel_ddi_init(dev, PORT_D); > > + /* > > + * On SKL we don't have a way to detect DDI-E so we rely on VBT. > > + */ > > + if (IS_SKYLAKE(dev) && > > + (dev_priv->vbt.ddi_port_info[PORT_E].supports_dp || > > + dev_priv->vbt.ddi_port_info[PORT_E].supports_dvi || > > + dev_priv->vbt.ddi_port_info[PORT_E].supports_hdmi)) > > + intel_ddi_init(dev, PORT_E); > > + > > } else if (HAS_PCH_SPLIT(dev)) { > > int found; > > dpd_is_edp = intel_dp_is_edp(dev, PORT_D); > > -- > > 2.1.4 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
On Thu, 2015-08-06 at 17:14 +0200, Daniel Vetter wrote: > On Thu, Aug 06, 2015 at 03:51:36PM +0800, Xiong Zhang wrote: > > From: Rodrigo Vivi <rodrigo.vivi@intel.com> > > > > There are OEMs using DDI-E out there, > > so let's enable it. > > > > Unfortunately there is no detection bit for DDI-E > > So we need to rely on VBT for that. > > > > I also need to give credits to Xiong since before seing > > his approach to check info->support_* I was creating an ugly > > vbt->ddie_sfuse_strap in order to propagate the ddi presence info > > > > Credits-to: "Zhang, Xiong Y" <xiong.y.zhang@intel.com> > > Cc: "Zhang, Xiong Y" <xiong.y.zhang@intel.com> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > btw how is this series related to > > http://lists.freedesktop.org/archives/intel-gfx/2015-April/065227.html > > Do we need that still? Can you please include that patch in your series if > so? yes, that patch is related because DDI-A and DDI-E shares 2 lanes... when DDI-E is in use DDI-A needs to be configured to use only 2 lanes and 4 otherwise. However the approach on that patch was wrong anyway since on the last line we see that DDI_A_4_LANES was being set unconditionally already. So I believe we probably need to unset or avoid setting this when vbt tells ddi-e is in use instead of setting it when ddi-e is not used like in that patch. Thanks > -Daniel > > > --- > > drivers/gpu/drm/i915/intel_bios.c | 14 +++++++------- > > drivers/gpu/drm/i915/intel_bios.h | 2 ++ > > drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ > > 3 files changed, 18 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c > > index 2ff9eb0..55b5072 100644 > > --- a/drivers/gpu/drm/i915/intel_bios.c > > +++ b/drivers/gpu/drm/i915/intel_bios.c > > @@ -898,19 +898,19 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, > > /* Each DDI port can have more than one value on the "DVO Port" field, > > * so look for all the possible values for each port and abort if more > > * than one is found. */ > > - int dvo_ports[][2] = { > > - {DVO_PORT_HDMIA, DVO_PORT_DPA}, > > - {DVO_PORT_HDMIB, DVO_PORT_DPB}, > > - {DVO_PORT_HDMIC, DVO_PORT_DPC}, > > - {DVO_PORT_HDMID, DVO_PORT_DPD}, > > - {DVO_PORT_CRT, -1 /* Port E can only be DVO_PORT_CRT */ }, > > + int dvo_ports[][3] = { > > + {DVO_PORT_HDMIA, DVO_PORT_DPA, -1}, > > + {DVO_PORT_HDMIB, DVO_PORT_DPB, -1}, > > + {DVO_PORT_HDMIC, DVO_PORT_DPC, -1}, > > + {DVO_PORT_HDMID, DVO_PORT_DPD, -1}, > > + {DVO_PORT_CRT, DVO_PORT_HDMIE, DVO_PORT_DPE}, > > }; > > > > /* Find the child device to use, abort if more than one found. */ > > for (i = 0; i < dev_priv->vbt.child_dev_num; i++) { > > it = dev_priv->vbt.child_dev + i; > > > > - for (j = 0; j < 2; j++) { > > + for (j = 0; j < 3; j++) { > > if (dvo_ports[port][j] == -1) > > break; > > > > diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h > > index f7ad6a5..02255d8 100644 > > --- a/drivers/gpu/drm/i915/intel_bios.h > > +++ b/drivers/gpu/drm/i915/intel_bios.h > > @@ -764,6 +764,8 @@ int intel_parse_bios(struct drm_device *dev); > > #define DVO_PORT_DPC 8 > > #define DVO_PORT_DPD 9 > > #define DVO_PORT_DPA 10 > > +#define DVO_PORT_DPE 11 > > +#define DVO_PORT_HDMIE 12 > > #define DVO_PORT_MIPIA 21 > > #define DVO_PORT_MIPIB 22 > > #define DVO_PORT_MIPIC 23 > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index af0bcfe..aaa34b8 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -14123,6 +14123,15 @@ static void intel_setup_outputs(struct drm_device *dev) > > intel_ddi_init(dev, PORT_C); > > if (found & SFUSE_STRAP_DDID_DETECTED) > > intel_ddi_init(dev, PORT_D); > > + /* > > + * On SKL we don't have a way to detect DDI-E so we rely on VBT. > > + */ > > + if (IS_SKYLAKE(dev) && > > + (dev_priv->vbt.ddi_port_info[PORT_E].supports_dp || > > + dev_priv->vbt.ddi_port_info[PORT_E].supports_dvi || > > + dev_priv->vbt.ddi_port_info[PORT_E].supports_hdmi)) > > + intel_ddi_init(dev, PORT_E); > > + > > } else if (HAS_PCH_SPLIT(dev)) { > > int found; > > dpd_is_edp = intel_dp_is_edp(dev, PORT_D); > > -- > > 2.1.4 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 2ff9eb0..55b5072 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -898,19 +898,19 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, /* Each DDI port can have more than one value on the "DVO Port" field, * so look for all the possible values for each port and abort if more * than one is found. */ - int dvo_ports[][2] = { - {DVO_PORT_HDMIA, DVO_PORT_DPA}, - {DVO_PORT_HDMIB, DVO_PORT_DPB}, - {DVO_PORT_HDMIC, DVO_PORT_DPC}, - {DVO_PORT_HDMID, DVO_PORT_DPD}, - {DVO_PORT_CRT, -1 /* Port E can only be DVO_PORT_CRT */ }, + int dvo_ports[][3] = { + {DVO_PORT_HDMIA, DVO_PORT_DPA, -1}, + {DVO_PORT_HDMIB, DVO_PORT_DPB, -1}, + {DVO_PORT_HDMIC, DVO_PORT_DPC, -1}, + {DVO_PORT_HDMID, DVO_PORT_DPD, -1}, + {DVO_PORT_CRT, DVO_PORT_HDMIE, DVO_PORT_DPE}, }; /* Find the child device to use, abort if more than one found. */ for (i = 0; i < dev_priv->vbt.child_dev_num; i++) { it = dev_priv->vbt.child_dev + i; - for (j = 0; j < 2; j++) { + for (j = 0; j < 3; j++) { if (dvo_ports[port][j] == -1) break; diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h index f7ad6a5..02255d8 100644 --- a/drivers/gpu/drm/i915/intel_bios.h +++ b/drivers/gpu/drm/i915/intel_bios.h @@ -764,6 +764,8 @@ int intel_parse_bios(struct drm_device *dev); #define DVO_PORT_DPC 8 #define DVO_PORT_DPD 9 #define DVO_PORT_DPA 10 +#define DVO_PORT_DPE 11 +#define DVO_PORT_HDMIE 12 #define DVO_PORT_MIPIA 21 #define DVO_PORT_MIPIB 22 #define DVO_PORT_MIPIC 23 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index af0bcfe..aaa34b8 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14123,6 +14123,15 @@ static void intel_setup_outputs(struct drm_device *dev) intel_ddi_init(dev, PORT_C); if (found & SFUSE_STRAP_DDID_DETECTED) intel_ddi_init(dev, PORT_D); + /* + * On SKL we don't have a way to detect DDI-E so we rely on VBT. + */ + if (IS_SKYLAKE(dev) && + (dev_priv->vbt.ddi_port_info[PORT_E].supports_dp || + dev_priv->vbt.ddi_port_info[PORT_E].supports_dvi || + dev_priv->vbt.ddi_port_info[PORT_E].supports_hdmi)) + intel_ddi_init(dev, PORT_E); + } else if (HAS_PCH_SPLIT(dev)) { int found; dpd_is_edp = intel_dp_is_edp(dev, PORT_D);