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

Commit 9d5f5458 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fbdev: Make changes to enable compilation for MDSS FB driver"

parents bccc48e7 beaf9c86

drivers/video/fbdev/msm/mdss.h

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/msm-bus.h>

#include <linux/file.h>

#include <linux/dma-direction.h>

#include <linux/dma-buf.h>



#include "mdss_panel.h"
@@ -474,7 +475,6 @@ struct mdss_data_type { 


	struct mdss_intr hist_intr;



	struct ion_client *iclient;

	int iommu_attached;



	struct debug_bus *dbg_bus;

drivers/video/fbdev/msm/mdss_dba_utils.c

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


#include <video/msm_dba.h>

#include <linux/extcon.h>

#include <../../../extcon/extcon.h>



#include "mdss_dba_utils.h"

#include "mdss_hdmi_edid.h"

drivers/video/fbdev/msm/mdss_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -968,7 +968,7 @@ static int mdss_debug_set_panic_signal(struct mdss_mdp_pipe *pipe_pool, 


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

		pipe = pipe_pool + i;

		if (pipe && (atomic_read(&pipe->kref.refcount) != 0) &&

		if (pipe && (refcount_read(&pipe->kref.refcount) != 0) &&

			mdss_mdp_panic_signal_support_mode(mdata)) {

			mdss_mdp_pipe_panic_signal_ctrl(pipe, enable);

			pr_debug("pnum:%d count:%d img:%dx%d ",
@@ -981,7 +981,7 @@ static int mdss_debug_set_panic_signal(struct mdss_mdp_pipe *pipe_pool, 
			cnt++;

		} else if (pipe) {

			pr_debug("Inactive pipe num:%d supported:%d\n",

			       atomic_read(&pipe->kref.refcount),

			       refcount_read(&pipe->kref.refcount),

			       mdss_mdp_panic_signal_support_mode(mdata));

		}

	}

drivers/video/fbdev/msm/mdss_dsi.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/gpio.h>

#include <linux/err.h>

#include <linux/regulator/consumer.h>

#include <linux/leds-qpnp-wled.h>

#include <linux/clk.h>

#include <linux/uaccess.h>

#include <linux/msm-bus.h>

drivers/video/fbdev/msm/mdss_dsi_clk.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
 */



#define pr_fmt(fmt) "mdss-dsi-clk:[%s] " fmt, __func__

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

#include <linux/clk.h>

#include <linux/list.h>