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

Commit 61eb05a2 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: fix MDP3 compilation"

parents 02e95177 9af58768

drivers/video/msm/mdss/mdp3.c

+5 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 * Copyright (C) 2007 Google Incorporated

 *

 * This software is licensed under the terms of the GNU General Public
@@ -40,13 +40,10 @@ 
#include <linux/clk/msm-clk.h>

#include <linux/regulator/rpm-smd-regulator.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/msm_memtypes.h>



#include "mdp3.h"

#include "mdss_fb.h"
@@ -55,6 +52,10 @@ 
#include "mdp3_ppp.h"

#include "mdss_debug.h"



#ifndef EXPORT_COMPAT

#define EXPORT_COMPAT(x)

#endif



#define MISR_POLL_SLEEP                 2000

#define MISR_POLL_TIMEOUT               32000

#define MDP3_REG_CAPTURED_DSI_PCLK_MASK 1

drivers/video/msm/mdss/mdp3.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 2016, The Linux Foundation. All rights reserved.

 * Copyright (C) 2007 Google Incorporated

 *

 * This program is free software; you can redistribute it and/or modify
@@ -166,6 +166,7 @@ struct mdp3_img_data { 
	int p_need;

	struct file *srcp_file;

	struct ion_handle *srcp_ihdl;

	struct fd srcp_f;

};



extern struct mdp3_hw_resource *mdp3_res;

drivers/video/msm/mdss/mdp3_ctrl.c

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -22,6 +22,7 @@ 
#include <linux/delay.h>

#include <linux/dma-buf.h>



#include "mdss_dsi_clk.h"

#include "mdp3_ctrl.h"

#include "mdp3.h"

#include "mdp3_ppp.h"