* [RESEND 1/3] drm/i915/dsi: filter invalid backlight and CABC ports [not found] <cover.1660664162.git.jani.nikula@intel.com> @ 2022-08-16 15:37 ` Jani Nikula 2022-08-17 8:13 ` [Intel-gfx] " Lisovskiy, Stanislav 2022-08-16 15:37 ` [RESEND 2/3] drm/i915/dsi: fix dual-link DSI backlight and CABC ports for display 11+ Jani Nikula 1 sibling, 1 reply; 6+ messages in thread From: Jani Nikula @ 2022-08-16 15:37 UTC (permalink / raw) To: intel-gfx; +Cc: jani.nikula, stable Avoid using ports that aren't initialized in case the VBT backlight or CABC ports have invalid values. This fixes a NULL pointer dereference of intel_dsi->dsi_hosts[port] in such cases. Cc: stable@vger.kernel.org Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/icl_dsi.c | 7 +++++++ drivers/gpu/drm/i915/display/vlv_dsi.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c index 5dcfa7feffa9..885c74f60366 100644 --- a/drivers/gpu/drm/i915/display/icl_dsi.c +++ b/drivers/gpu/drm/i915/display/icl_dsi.c @@ -2070,7 +2070,14 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) else intel_dsi->ports = BIT(port); + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) + intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports; + intel_dsi->dcs_backlight_ports = intel_connector->panel.vbt.dsi.bl_ports; + + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) + intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports; + intel_dsi->dcs_cabc_ports = intel_connector->panel.vbt.dsi.cabc_ports; for_each_dsi_port(port, intel_dsi->ports) { diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c index b9b1fed99874..35136d26e517 100644 --- a/drivers/gpu/drm/i915/display/vlv_dsi.c +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c @@ -1933,7 +1933,14 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv) else intel_dsi->ports = BIT(port); + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) + intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports; + intel_dsi->dcs_backlight_ports = intel_connector->panel.vbt.dsi.bl_ports; + + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) + intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports; + intel_dsi->dcs_cabc_ports = intel_connector->panel.vbt.dsi.cabc_ports; /* Create a DSI host (and a device) for each port. */ -- 2.34.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [RESEND 1/3] drm/i915/dsi: filter invalid backlight and CABC ports 2022-08-16 15:37 ` [RESEND 1/3] drm/i915/dsi: filter invalid backlight and CABC ports Jani Nikula @ 2022-08-17 8:13 ` Lisovskiy, Stanislav 2022-08-17 8:29 ` Jani Nikula 0 siblings, 1 reply; 6+ messages in thread From: Lisovskiy, Stanislav @ 2022-08-17 8:13 UTC (permalink / raw) To: Jani Nikula; +Cc: intel-gfx, stable On Tue, Aug 16, 2022 at 06:37:20PM +0300, Jani Nikula wrote: > Avoid using ports that aren't initialized in case the VBT backlight or > CABC ports have invalid values. This fixes a NULL pointer dereference of > intel_dsi->dsi_hosts[port] in such cases. > > Cc: stable@vger.kernel.org > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Would be interesting to figure out which one of those actually fixed the https://gitlab.freedesktop.org/drm/intel/-/issues/6476 issue, this one or next one. Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > --- > drivers/gpu/drm/i915/display/icl_dsi.c | 7 +++++++ > drivers/gpu/drm/i915/display/vlv_dsi.c | 7 +++++++ > 2 files changed, 14 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c > index 5dcfa7feffa9..885c74f60366 100644 > --- a/drivers/gpu/drm/i915/display/icl_dsi.c > +++ b/drivers/gpu/drm/i915/display/icl_dsi.c > @@ -2070,7 +2070,14 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) > else > intel_dsi->ports = BIT(port); > > + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) > + intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports; > + > intel_dsi->dcs_backlight_ports = intel_connector->panel.vbt.dsi.bl_ports; > + > + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) > + intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports; > + > intel_dsi->dcs_cabc_ports = intel_connector->panel.vbt.dsi.cabc_ports; > > for_each_dsi_port(port, intel_dsi->ports) { > diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c > index b9b1fed99874..35136d26e517 100644 > --- a/drivers/gpu/drm/i915/display/vlv_dsi.c > +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c > @@ -1933,7 +1933,14 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv) > else > intel_dsi->ports = BIT(port); > > + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) > + intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports; > + > intel_dsi->dcs_backlight_ports = intel_connector->panel.vbt.dsi.bl_ports; > + > + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) > + intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports; > + > intel_dsi->dcs_cabc_ports = intel_connector->panel.vbt.dsi.cabc_ports; > > /* Create a DSI host (and a device) for each port. */ > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [RESEND 1/3] drm/i915/dsi: filter invalid backlight and CABC ports 2022-08-17 8:13 ` [Intel-gfx] " Lisovskiy, Stanislav @ 2022-08-17 8:29 ` Jani Nikula 2022-08-19 9:52 ` Jani Nikula 0 siblings, 1 reply; 6+ messages in thread From: Jani Nikula @ 2022-08-17 8:29 UTC (permalink / raw) To: Lisovskiy, Stanislav; +Cc: intel-gfx, stable On Wed, 17 Aug 2022, "Lisovskiy, Stanislav" <stanislav.lisovskiy@intel.com> wrote: > On Tue, Aug 16, 2022 at 06:37:20PM +0300, Jani Nikula wrote: >> Avoid using ports that aren't initialized in case the VBT backlight or >> CABC ports have invalid values. This fixes a NULL pointer dereference of >> intel_dsi->dsi_hosts[port] in such cases. >> >> Cc: stable@vger.kernel.org >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Would be interesting to figure out which one of those actually fixed the > https://gitlab.freedesktop.org/drm/intel/-/issues/6476 issue, this one > or next one. I asked to test with patch 1 alone first, and it lets them boot without the oops. And it produces the warn added here. But this just filters port C out of bl_ports, and doesn't fix the root cause. Patch 2 should fix the root cause, get rid of the warn and give them functioning backlight. I hope. There was no test results with patches 2&3. :) > Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> Thanks for the review! BR, Jani. > >> --- >> drivers/gpu/drm/i915/display/icl_dsi.c | 7 +++++++ >> drivers/gpu/drm/i915/display/vlv_dsi.c | 7 +++++++ >> 2 files changed, 14 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c >> index 5dcfa7feffa9..885c74f60366 100644 >> --- a/drivers/gpu/drm/i915/display/icl_dsi.c >> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c >> @@ -2070,7 +2070,14 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) >> else >> intel_dsi->ports = BIT(port); >> >> + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) >> + intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports; >> + >> intel_dsi->dcs_backlight_ports = intel_connector->panel.vbt.dsi.bl_ports; >> + >> + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) >> + intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports; >> + >> intel_dsi->dcs_cabc_ports = intel_connector->panel.vbt.dsi.cabc_ports; >> >> for_each_dsi_port(port, intel_dsi->ports) { >> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c >> index b9b1fed99874..35136d26e517 100644 >> --- a/drivers/gpu/drm/i915/display/vlv_dsi.c >> +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c >> @@ -1933,7 +1933,14 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv) >> else >> intel_dsi->ports = BIT(port); >> >> + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) >> + intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports; >> + >> intel_dsi->dcs_backlight_ports = intel_connector->panel.vbt.dsi.bl_ports; >> + >> + if (drm_WARN_ON(&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) >> + intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports; >> + >> intel_dsi->dcs_cabc_ports = intel_connector->panel.vbt.dsi.cabc_ports; >> >> /* Create a DSI host (and a device) for each port. */ >> -- >> 2.34.1 >> -- Jani Nikula, Intel Open Source Graphics Center ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [RESEND 1/3] drm/i915/dsi: filter invalid backlight and CABC ports 2022-08-17 8:29 ` Jani Nikula @ 2022-08-19 9:52 ` Jani Nikula 0 siblings, 0 replies; 6+ messages in thread From: Jani Nikula @ 2022-08-19 9:52 UTC (permalink / raw) To: Lisovskiy, Stanislav; +Cc: intel-gfx, stable On Wed, 17 Aug 2022, Jani Nikula <jani.nikula@intel.com> wrote: > On Wed, 17 Aug 2022, "Lisovskiy, Stanislav" <stanislav.lisovskiy@intel.com> wrote: >> On Tue, Aug 16, 2022 at 06:37:20PM +0300, Jani Nikula wrote: >>> Avoid using ports that aren't initialized in case the VBT backlight or >>> CABC ports have invalid values. This fixes a NULL pointer dereference of >>> intel_dsi->dsi_hosts[port] in such cases. >>> >>> Cc: stable@vger.kernel.org >>> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> >> Would be interesting to figure out which one of those actually fixed the >> https://gitlab.freedesktop.org/drm/intel/-/issues/6476 issue, this one >> or next one. > > I asked to test with patch 1 alone first, and it lets them boot without > the oops. And it produces the warn added here. But this just filters > port C out of bl_ports, and doesn't fix the root cause. Patch 2 should > fix the root cause, get rid of the warn and give them functioning > backlight. I hope. There was no test results with patches 2&3. :) > >> Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > > Thanks for the review! Also, pushed the series to drm-intel-next yesterday. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center ^ permalink raw reply [flat|nested] 6+ messages in thread
* [RESEND 2/3] drm/i915/dsi: fix dual-link DSI backlight and CABC ports for display 11+ [not found] <cover.1660664162.git.jani.nikula@intel.com> 2022-08-16 15:37 ` [RESEND 1/3] drm/i915/dsi: filter invalid backlight and CABC ports Jani Nikula @ 2022-08-16 15:37 ` Jani Nikula 2022-08-17 8:13 ` [Intel-gfx] " Lisovskiy, Stanislav 1 sibling, 1 reply; 6+ messages in thread From: Jani Nikula @ 2022-08-16 15:37 UTC (permalink / raw) To: intel-gfx; +Cc: jani.nikula, stable The VBT dual-link DSI backlight and CABC still use ports A and C, both in Bspec and code, while display 11+ DSI only supports ports A and B. Assume port C actually means port B for display 11+ when parsing VBT. Bspec: 20154 Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6476 Cc: stable@vger.kernel.org Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_bios.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 51dde5bfd956..198a2f4920cc 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -1596,6 +1596,8 @@ static void parse_dsi_backlight_ports(struct drm_i915_private *i915, struct intel_panel *panel, enum port port) { + enum port port_bc = DISPLAY_VER(i915) >= 11 ? PORT_B : PORT_C; + if (!panel->vbt.dsi.config->dual_link || i915->vbt.version < 197) { panel->vbt.dsi.bl_ports = BIT(port); if (panel->vbt.dsi.config->cabc_supported) @@ -1609,11 +1611,11 @@ static void parse_dsi_backlight_ports(struct drm_i915_private *i915, panel->vbt.dsi.bl_ports = BIT(PORT_A); break; case DL_DCS_PORT_C: - panel->vbt.dsi.bl_ports = BIT(PORT_C); + panel->vbt.dsi.bl_ports = BIT(port_bc); break; default: case DL_DCS_PORT_A_AND_C: - panel->vbt.dsi.bl_ports = BIT(PORT_A) | BIT(PORT_C); + panel->vbt.dsi.bl_ports = BIT(PORT_A) | BIT(port_bc); break; } @@ -1625,12 +1627,12 @@ static void parse_dsi_backlight_ports(struct drm_i915_private *i915, panel->vbt.dsi.cabc_ports = BIT(PORT_A); break; case DL_DCS_PORT_C: - panel->vbt.dsi.cabc_ports = BIT(PORT_C); + panel->vbt.dsi.cabc_ports = BIT(port_bc); break; default: case DL_DCS_PORT_A_AND_C: panel->vbt.dsi.cabc_ports = - BIT(PORT_A) | BIT(PORT_C); + BIT(PORT_A) | BIT(port_bc); break; } } -- 2.34.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [RESEND 2/3] drm/i915/dsi: fix dual-link DSI backlight and CABC ports for display 11+ 2022-08-16 15:37 ` [RESEND 2/3] drm/i915/dsi: fix dual-link DSI backlight and CABC ports for display 11+ Jani Nikula @ 2022-08-17 8:13 ` Lisovskiy, Stanislav 0 siblings, 0 replies; 6+ messages in thread From: Lisovskiy, Stanislav @ 2022-08-17 8:13 UTC (permalink / raw) To: Jani Nikula; +Cc: intel-gfx, stable On Tue, Aug 16, 2022 at 06:37:21PM +0300, Jani Nikula wrote: > The VBT dual-link DSI backlight and CABC still use ports A and C, both > in Bspec and code, while display 11+ DSI only supports ports A and > B. Assume port C actually means port B for display 11+ when parsing VBT. > > Bspec: 20154 > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6476 > Cc: stable@vger.kernel.org > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > --- > drivers/gpu/drm/i915/display/intel_bios.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > index 51dde5bfd956..198a2f4920cc 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -1596,6 +1596,8 @@ static void parse_dsi_backlight_ports(struct drm_i915_private *i915, > struct intel_panel *panel, > enum port port) > { > + enum port port_bc = DISPLAY_VER(i915) >= 11 ? PORT_B : PORT_C; > + > if (!panel->vbt.dsi.config->dual_link || i915->vbt.version < 197) { > panel->vbt.dsi.bl_ports = BIT(port); > if (panel->vbt.dsi.config->cabc_supported) > @@ -1609,11 +1611,11 @@ static void parse_dsi_backlight_ports(struct drm_i915_private *i915, > panel->vbt.dsi.bl_ports = BIT(PORT_A); > break; > case DL_DCS_PORT_C: > - panel->vbt.dsi.bl_ports = BIT(PORT_C); > + panel->vbt.dsi.bl_ports = BIT(port_bc); > break; > default: > case DL_DCS_PORT_A_AND_C: > - panel->vbt.dsi.bl_ports = BIT(PORT_A) | BIT(PORT_C); > + panel->vbt.dsi.bl_ports = BIT(PORT_A) | BIT(port_bc); > break; > } > > @@ -1625,12 +1627,12 @@ static void parse_dsi_backlight_ports(struct drm_i915_private *i915, > panel->vbt.dsi.cabc_ports = BIT(PORT_A); > break; > case DL_DCS_PORT_C: > - panel->vbt.dsi.cabc_ports = BIT(PORT_C); > + panel->vbt.dsi.cabc_ports = BIT(port_bc); > break; > default: > case DL_DCS_PORT_A_AND_C: > panel->vbt.dsi.cabc_ports = > - BIT(PORT_A) | BIT(PORT_C); > + BIT(PORT_A) | BIT(port_bc); > break; > } > } > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-08-19 9:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1660664162.git.jani.nikula@intel.com>
2022-08-16 15:37 ` [RESEND 1/3] drm/i915/dsi: filter invalid backlight and CABC ports Jani Nikula
2022-08-17 8:13 ` [Intel-gfx] " Lisovskiy, Stanislav
2022-08-17 8:29 ` Jani Nikula
2022-08-19 9:52 ` Jani Nikula
2022-08-16 15:37 ` [RESEND 2/3] drm/i915/dsi: fix dual-link DSI backlight and CABC ports for display 11+ Jani Nikula
2022-08-17 8:13 ` [Intel-gfx] " Lisovskiy, Stanislav
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).