Skip to content

Commit

Permalink
Revert "drm/i915/dsi: filter invalid backlight and CABC ports"
Browse files Browse the repository at this point in the history
This reverts commit d9d2625 which is
commit 607f417 upstream.

This is part of a series of i915 patches that were backported to 5.19.12
but found to be incomplete and caused problems on many systems so they
are being reverted.

Reported-by: Jerry Ling <jiling@cern.ch>
Reported-by: Hans de Goede <hdegoede@redhat.com>
Cc: Thorsten Leemhuis <regressions@leemhuis.info>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Sasha Levin <sashal@kernel.org>
Link: https://lore.kernel.org/all/55905860-adf9-312c-69cc-491ac8ce1a8b@cern.ch/
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
gregkh committed Oct 4, 2022
1 parent bef6a9b commit 10c7b39
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
7 changes: 0 additions & 7 deletions drivers/gpu/drm/i915/display/icl_dsi.c
Expand Up @@ -2072,14 +2072,7 @@ 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) {
Expand Down
7 changes: 0 additions & 7 deletions drivers/gpu/drm/i915/display/vlv_dsi.c
Expand Up @@ -1933,14 +1933,7 @@ 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. */
Expand Down

0 comments on commit 10c7b39

Please sign in to comment.