Patch "drm/gma500: Sanity-check pipe index" has been added to the 4.4-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
drm/gma500: Sanity-check pipe index
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-gma500-sanity-check-pipe-index.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
4f250706211cdb949f7580d4fe4dd1fd646de693Mon Sep 17 00:00:00 2001
From: Thierry Reding <[email protected]>
Date: Tue, 15 Dec 2015 12:20:49 +0100
Subject: drm/gma500: Sanity-check pipe index
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Thierry Reding <[email protected]>
commit 4f250706211cdb949f7580d4fe4dd1fd646de693 upstream.
If the DSI output isn't connected, then mdfld_dsi_encoder_get_pipe() will return -1. The mdfld_dsi_dp_mode_set() function doesn't properly check for this condition and causes the following compiler warnings:
CC drivers/gpu/drm/gma500/mdfld_dsi_dpi.o drivers/gpu/drm/gma500/mdfld_dsi_dpi.c: In function ‘mdfld_dsi_dpi_mode_set’: drivers/gpu/drm/gma500/mdfld_dsi_dpi.c:828:35: warning: array subscript is below array bounds [-Warray-bounds] u32 pipeconf = dev_priv->pipeconf[pipe]; ^ drivers/gpu/drm/gma500/mdfld_dsi_dpi.c:829:33: warning: array subscript is below array bounds [-Warray-bounds] u32 dspcntr = dev_priv->dspcntr[pipe]; ^
Fix this by checking for a valid pipe before indexing the pipeconf and dspcntr arrays.
--- drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/gma500/mdfld_dsi_dpi.c +7 -3
@@ -821,14 +821,18 @@ void mdfld_dsi_dpi_mode_set(struct drm_estruct drm_device *dev = dsi_config->dev;struct drm_psb_private *dev_priv = dev->dev_private;int pipe =mdfld_dsi_encoder_get_pipe (dsi_encoder); -u32 pipeconf_reg =PIPEACONF ;u32 dspcntr_reg =DSPACNTR ; +u32 pipeconf, dspcntr; -u32 pipeconf = dev_priv->pipeconf[pipe]; -u32 dspcntr = dev_priv->dspcntr[pipe];u32 mipi =MIPI_PORT_EN |PASS_FROM_SPHY_TO_AFE |SEL_FLOPPED_HSTX ; +if (WARN_ON (pipe <0 )) +return ; + + pipeconf = dev_priv->pipeconf[pipe]; + dspcntr = dev_priv->dspcntr[pipe]; +if (pipe) { pipeconf_reg =PIPECCONF ; dspcntr_reg =DSPCCNTR ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/arm-tegra-select-usb_ulpi-from-ehci-rather-than-platform.patch queue-4.4/drm-gma500-sanity-check-pipe-index.patch