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

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

Merge "msm: mdss: compile mdss drivers with arm 64-bit toolchain"

parents 288bb603 5d413d9f

drivers/video/msm/mdss/mdss_compat_utils.c

+14 −14
Original line number Diff line number Diff line
@@ -537,9 +537,9 @@ static int __to_user_igc_lut_data( 
			sizeof(uint32_t)))

		return -EFAULT;



	if (get_user(data, &igc_lut->c0_c1_data) ||

	if (get_user(data, (unsigned long *) &igc_lut->c0_c1_data) ||

	    put_user((compat_caddr_t) data, &igc_lut32->c0_c1_data) ||

	    get_user(data, &igc_lut->c2_data) ||

	    get_user(data, (unsigned long *) &igc_lut->c2_data) ||

	    put_user((compat_caddr_t) data, &igc_lut32->c2_data))

		return -EFAULT;
@@ -768,7 +768,7 @@ static int __to_user_hist_lut_data( 
			sizeof(uint32_t)))

		return -EFAULT;



	if (get_user(data, &hist_lut->data) ||

	if (get_user(data, (unsigned long *) &hist_lut->data) ||

	    put_user((compat_caddr_t) data, &hist_lut32->data))

		return -EFAULT;
@@ -894,7 +894,7 @@ static int __to_user_qseed_cfg( 
			sizeof(uint32_t)))

		return -EFAULT;



	if (get_user(data, &qseed_data->data) ||

	if (get_user(data, (unsigned long *) &qseed_data->data) ||

	    put_user((compat_caddr_t) data, &qseed_data32->data))

		return -EFAULT;
@@ -1156,9 +1156,9 @@ static int __to_user_pa_v2_data( 
			sizeof(uint32_t)))

		return -EFAULT;



	if (get_user(data, &pa_v2_data->six_zone_curve_p0) ||

	if (get_user(data, (unsigned long *) &pa_v2_data->six_zone_curve_p0) ||

	    put_user((compat_caddr_t) data, &pa_v2_data32->six_zone_curve_p0) ||

	    get_user(data, &pa_v2_data->six_zone_curve_p1) ||

	    get_user(data, (unsigned long *) &pa_v2_data->six_zone_curve_p1) ||

	    put_user((compat_caddr_t) data, &pa_v2_data32->six_zone_curve_p1))

		return -EFAULT;
@@ -1326,19 +1326,19 @@ static int __to_user_gamut_cfg_data( 
		return 0;



	for (i = 0; i < MDP_GAMUT_TABLE_NUM; i++) {

		if (get_user(data, &gamut_cfg->r_tbl[i]) ||

		if (get_user(data, (unsigned long *) &gamut_cfg->r_tbl[i]) ||

		    put_user((compat_caddr_t)data, &gamut_cfg32->r_tbl[i]))

			return -EFAULT;

	}



	for (i = 0; i < MDP_GAMUT_TABLE_NUM; i++) {

		if (get_user(data, &gamut_cfg->g_tbl[i]) ||

		if (get_user(data, (unsigned long *) &gamut_cfg->g_tbl[i]) ||

		    put_user((compat_caddr_t)data, &gamut_cfg32->g_tbl[i]))

			return -EFAULT;

	}



	for (i = 0; i < MDP_GAMUT_TABLE_NUM; i++) {

		if (get_user(data, &gamut_cfg->b_tbl[i]) ||

		if (get_user(data, (unsigned long *) &gamut_cfg->b_tbl[i]) ||

		    put_user((compat_caddr_t)data, &gamut_cfg32->g_tbl[i]))

			return -EFAULT;

	}
@@ -1683,7 +1683,7 @@ static int __to_user_calib_config_buffer( 
			sizeof(uint32_t)))

		return -EFAULT;



	if (get_user(data, &calib_buffer->buffer) ||

	if (get_user(data, (unsigned long *) &calib_buffer->buffer) ||

	    put_user((compat_caddr_t) data, &calib_buffer32->buffer))

		return -EFAULT;
@@ -2165,13 +2165,13 @@ static int __to_user_hist_data( 
			sizeof(uint8_t)))

		return -EFAULT;



	if (get_user(data, &hist_data->c0) ||

	if (get_user(data, (unsigned long *) &hist_data->c0) ||

	    put_user((compat_caddr_t) data, &hist_data32->c0) ||

	    get_user(data, &hist_data->c1) ||

	    get_user(data, (unsigned long *) &hist_data->c1) ||

	    put_user((compat_caddr_t) data, &hist_data32->c1) ||

	    get_user(data, &hist_data->c2) ||

	    get_user(data, (unsigned long *) &hist_data->c2) ||

	    put_user((compat_caddr_t) data, &hist_data32->c2) ||

	    get_user(data, &hist_data->extra_info) ||

	    get_user(data, (unsigned long *) &hist_data->extra_info) ||

	    put_user((compat_caddr_t) data, &hist_data32->extra_info))

		return -EFAULT;

drivers/video/msm/mdss/mdss_dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ static int mdss_dsi_event_handler(struct mdss_panel_data *pdata, 
		rc = mdss_dsi_ctl_partial_update(pdata);

		break;

	case MDSS_EVENT_DSI_ULPS_CTRL:

		rc = mdss_dsi_ulps_config(ctrl_pdata, (int)arg);

		rc = mdss_dsi_ulps_config(ctrl_pdata, (int)(unsigned long) arg);

		break;

	default:

		pr_debug("%s: unhandled event=%d\n", __func__, event);

drivers/video/msm/mdss/mdss_dsi.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#include <linux/list.h>

#include <linux/mdss_io_util.h>

#include <mach/scm-io.h>

#include <linux/irqreturn.h>

#include <linux/pinctrl/consumer.h>

drivers/video/msm/mdss/mdss_fb.c

+6 −4
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/msm_mdp.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/proc_fs.h>

#include <linux/pm_runtime.h>

#include <linux/slab.h>
@@ -46,11 +47,8 @@ 
#include <linux/file.h>

#include <linux/kthread.h>



#include <mach/board.h>

#include <mach/memory.h>

#include <linux/qcom_iommu.h>

#include <linux/msm_iommu_domains.h>

#include <mach/msm_memtypes.h>



#include "mdss_fb.h"
@@ -60,6 +58,10 @@ 
#define MDSS_FB_NUM 2

#endif



#ifndef EXPORT_COMPAT

#define EXPORT_COMPAT(x)

#endif



#define MAX_FBI_LIST 32

static struct fb_info *fbi_list[MAX_FBI_LIST];

static int fbi_list_index;
@@ -1145,7 +1147,7 @@ int mdss_fb_alloc_fb_ion_memory(struct msm_fb_data_type *mfd) 
		goto fb_mmap_failed;

	}



	pr_debug("alloc 0x%xB vaddr = %p (%pa iova) for fb%d\n", size, vaddr,

	pr_debug("alloc 0x%zuB vaddr = %p (%pa iova) for fb%d\n", size, vaddr,

			&mfd->iova, mfd->index);



	mfd->fbi->screen_base = (char *) vaddr;

drivers/video/msm/mdss/mdss_mdp.c

+5 −9
Original line number Diff line number Diff line
@@ -41,14 +41,10 @@ 
#include <linux/uaccess.h>

#include <linux/clk/msm-clk.h>



#include <mach/board.h>

#include <mach/hardware.h>

#include <linux/msm-bus.h>

#include <linux/msm-bus-board.h>

#include <linux/qcom_iommu.h>

#include <linux/msm_iommu_domains.h>

#include <mach/memory.h>

#include <mach/msm_memtypes.h>

#include <linux/msm-bus.h>

#include <linux/msm-bus-board.h>



#include "mdss.h"

#include "mdss_fb.h"
@@ -1654,14 +1650,14 @@ static void mdss_mdp_parse_dt_pipe_sw_reset(struct platform_device *pdev, 
static int  mdss_mdp_parse_dt_pipe_clk_ctrl(struct platform_device *pdev,

	char *prop_name, struct mdss_mdp_pipe *pipe_list, u32 npipes)

{

	int rc = 0;

	int rc = 0, temp;

	size_t len;

	const u32 *arr;



	arr = of_get_property(pdev->dev.of_node, prop_name, (int *) &len);

	arr = of_get_property(pdev->dev.of_node, prop_name, &temp);

	if (arr) {

		int i, j;



		len = (size_t) temp;

		len /= sizeof(u32);

		for (i = 0, j = 0; i < len; j++) {

			struct mdss_mdp_pipe *pipe = NULL;