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

Commit f4d6b1b4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: Remove CONFIG_MULTIMEDIA_USE_ION"

parents 187fda8c b614a9ab

arch/arm/configs/fsm9900-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ CONFIG_MSM_MEMORY_DUMP=y 
CONFIG_MSM_DLOAD_MODE=y

CONFIG_MSM_SPM_V2=y

CONFIG_MSM_L2_SPM=y

CONFIG_MSM_MULTIMEDIA_USE_ION=y

CONFIG_MSM_OCMEM=y

CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

arch/arm/configs/fsm9900_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ CONFIG_MSM_MEMORY_DUMP=y 
CONFIG_MSM_DLOAD_MODE=y

CONFIG_MSM_SPM_V2=y

CONFIG_MSM_L2_SPM=y

CONFIG_MSM_MULTIMEDIA_USE_ION=y

CONFIG_MSM_OCMEM=y

CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

arch/arm/mach-msm/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ config ARCH_MSM8974 
	select CPU_V7

	select MSM_SCM

	select MSM_GPIOMUX

	select MSM_MULTIMEDIA_USE_ION

	select PM_DEVFREQ

	select MSM_DEVFREQ_CPUBW

	select MSM_PIL
@@ -71,7 +70,6 @@ config ARCH_APQ8084 
	select MSM_PIL

	select ENABLE_VMALLOC_SAVINGS

	select MSM_ULTRASOUND_B

	select MSM_MULTIMEDIA_USE_ION

	select MSM_IRQ

	select PINCTRL

	select PINCTRL_MSM_TLMM_V3
@@ -100,7 +98,6 @@ config ARCH_MPQ8092 
	select REGULATOR_RPM_SMD

	select PINCTRL

	select PINCTRL_MSM_TLMM_V3

	select MSM_MULTIMEDIA_USE_ION

	select USB_ARCH_HAS_XHCI

	select MSM_IRQ

	select MSM_SPM_V2
@@ -200,7 +197,6 @@ config ARCH_MSM8610 
	select MSM_RPM_STATS_LOG

	select PINCTRL

	select PINCTRL_MSM_TLMM_V3

	select MSM_MULTIMEDIA_USE_ION

	select MSM_IRQ



config ARCH_MSM8226
@@ -243,7 +239,6 @@ config ARCH_MSM8226 
	select PINCTRL

	select PINCTRL_MSM_TLMM_V3

	select ENABLE_VMALLOC_SAVINGS

	select MSM_MULTIMEDIA_USE_ION

	select MSM_IRQ



config ARCH_MSMSAMARIUM
@@ -274,7 +269,6 @@ config ARCH_MSMSAMARIUM 
	select QMI_ENCDEC

	select PINCTRL

	select PINCTRL_MSM_TLMM_V3

	select MSM_MULTIMEDIA_USE_ION

	select MSM_IRQ

endmenu
@@ -1212,14 +1206,6 @@ config MSM_L2_SPM 
	  Enabling this driver allows configuring L2 SPM for low power modes

	  on supported chipsets.



config MSM_MULTIMEDIA_USE_ION

	bool "Multimedia suport using Ion"

	depends on ION_MSM

	help

	  Enable support for multimedia drivers using Ion for buffer management

	  instead of pmem. Selecting this may also involve userspace

	  dependencies as well.



config MSM_OCMEM

	bool "MSM On-Chip memory driver (OCMEM)"

	help

drivers/video/msm/mdp_ppp.c

+10 −15
Original line number Diff line number Diff line 
/* drivers/video/msm/src/drv/mdp/mdp_ppp.c

 *

 * Copyright (C) 2007 Google Incorporated

 * Copyright (c) 2008-2009, 2012-2013 The Linux Foundation. All rights reserved.

 * Copyright (c) 2008-2009, 2012-2014 The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -1246,9 +1246,7 @@ int get_img(struct mdp_img *img, struct mdp_blit_req *req, 
{

	int put_needed, fb_num, ret = 0;

	struct file *file;

#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION

	struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;

#endif



	if (req->flags & MDP_MEMORY_ID_TYPE_FB) {

		file = fget_light(img->memory_id, &put_needed);
@@ -1270,7 +1268,7 @@ int get_img(struct mdp_img *img, struct mdp_blit_req *req, 
			fput_light(file, put_needed);

		}

	}

#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION



	*srcp_ihdl = ion_import_dma_buf(mfd->iclient, img->memory_id);

	if (IS_ERR_OR_NULL(*srcp_ihdl))

		return PTR_ERR(*srcp_ihdl);
@@ -1280,16 +1278,13 @@ int get_img(struct mdp_img *img, struct mdp_blit_req *req, 
		return ret;

	 else

		return -EINVAL;

#endif



}



void put_img(struct file *p_src_file, struct ion_handle *p_ihdl)

{

#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION

	if (!IS_ERR_OR_NULL(p_ihdl))

		ion_free(ppp_display_iclient, p_ihdl);

#endif

}