Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46d987af authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'ipu-fixes-3.18' of git://git.pengutronix.de/git/pza/linux into drm-next 

IPUv3 fixes for v3.18

* tag 'ipu-fixes-3.18' of git://git.pengutronix.de/git/pza/linux:
  gpu: ipu-v3: Kconfig: Remove SOC_IMX6SL from IMX_IPUV3_CORE Kconfig
  gpu: ipu-v3: ipu-smfc: Do not leave DEBUG defined
  gpu: ipu-v3: Return proper error on ipu_add_client_devices error path
  gpu: ipu-v3: Select GENERIC_IRQ_CHIP to fix build error
parents 7bbc1920 c7750e83

drivers/gpu/ipu-v3/Kconfig

+2 −1
Original line number Diff line number Diff line 
config IMX_IPUV3_CORE

	tristate "IPUv3 core support"

	depends on SOC_IMX5 || SOC_IMX6Q || SOC_IMX6SL || ARCH_MULTIPLATFORM

	depends on SOC_IMX5 || SOC_IMX6Q || ARCH_MULTIPLATFORM

	depends on RESET_CONTROLLER

	select GENERIC_IRQ_CHIP

	help

	  Choose this if you have a i.MX5/6 system and want to use the Image

	  Processing Unit. This option only enables IPU base support.

drivers/gpu/ipu-v3/ipu-common.c

+3 −1
Original line number Diff line number Diff line
@@ -1060,9 +1060,11 @@ static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base) 
				id++, &reg->pdata, sizeof(reg->pdata));

		}



		if (IS_ERR(pdev))

		if (IS_ERR(pdev)) {

			ret = PTR_ERR(pdev);

			goto err_register;

		}

	}



	return 0;

drivers/gpu/ipu-v3/ipu-smfc.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */

#define DEBUG

#include <linux/export.h>

#include <linux/types.h>

#include <linux/init.h>