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

Commit 56941927 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: Add support to halt MDSS axi ports"

parents 2902485b ef869fd4

drivers/video/msm/mdss/mdss_mdp.c

+49 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/iommu.h>

#include <linux/iopoll.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/pm.h>
@@ -55,6 +56,8 @@ 
#include "mdss_panel.h"

#include "mdss_debug.h"



#define AXI_HALT_TIMEOUT_US	0x4000



struct mdss_data_type *mdss_res;



static int mdss_fb_mem_get_iommu_domain(void)
@@ -135,6 +138,52 @@ static int mdss_mdp_parse_dt_misc(struct platform_device *pdev); 
static int mdss_mdp_parse_dt_ad_cfg(struct platform_device *pdev);

static int mdss_mdp_parse_dt_bus_scale(struct platform_device *pdev);



/**

 * mdss_mdp_vbif_axi_halt() - Halt MDSS AXI ports

 * @mdata: pointer to the global mdss data structure.

 *

 * Check if MDSS AXI ports are idle or not. If not send a halt request and

 * wait for it be idle.

 *

 * This function can be called during deep suspend, display off or for

 * debugging purposes. On success it should be assumed that AXI ports are in

 * idle state and would not fetch any more data. This function cannot be

 * called from interrupt context.

 */

int mdss_mdp_vbif_axi_halt(struct mdss_data_type *mdata)

{

	bool is_idle;

	int rc = 0;

	u32 reg_val, idle_mask, status;



	idle_mask = BIT(4);

	if (mdata->axi_port_cnt == 2)

		idle_mask |= BIT(5);



	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);

	reg_val = readl_relaxed(mdata->vbif_base + MMSS_VBIF_AXI_HALT_CTRL1);



	is_idle = (reg_val & idle_mask) ? true : false;

	if (!is_idle) {

		pr_err("axi is not idle. halt_ctrl1=%d\n", reg_val);



		writel_relaxed(1, mdata->vbif_base + MMSS_VBIF_AXI_HALT_CTRL0);



		rc = readl_poll_timeout(mdata->vbif_base +

			MMSS_VBIF_AXI_HALT_CTRL1, status, (status & idle_mask),

			1000, AXI_HALT_TIMEOUT_US);

		if (rc == -ETIMEDOUT)

			pr_err("VBIF axi is not halting. TIMEDOUT.\n");

		else

			pr_debug("VBIF axi is halted\n");



		writel_relaxed(0, mdata->vbif_base + MMSS_VBIF_AXI_HALT_CTRL0);

	}

	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);



	return rc;

}



u32 mdss_mdp_fb_stride(u32 fb_index, u32 xres, int bpp)

{

	/* The adreno GPU hardware requires that the pitch be aligned to

drivers/video/msm/mdss/mdss_mdp.h

+1 −0
Original line number Diff line number Diff line
@@ -639,6 +639,7 @@ int mdss_mdp_pipe_destroy(struct mdss_mdp_pipe *pipe); 
int mdss_mdp_pipe_queue_data(struct mdss_mdp_pipe *pipe,

			     struct mdss_mdp_data *src_data);

int mdss_mdp_pipe_fetch_halt(struct mdss_mdp_pipe *pipe);

int mdss_mdp_vbif_axi_halt(struct mdss_data_type *mdata);



int mdss_mdp_data_check(struct mdss_mdp_data *data,

			struct mdss_mdp_plane_sizes *ps);

drivers/video/msm/mdss/mdss_mdp_hwio.h

+2 −0
Original line number Diff line number Diff line
@@ -569,5 +569,7 @@ enum mdss_mdp_pingpong_index { 
/* following offsets are with respect to MDP VBIF base */

#define MMSS_VBIF_XIN_HALT_CTRL0	0x200

#define MMSS_VBIF_XIN_HALT_CTRL1	0x204

#define MMSS_VBIF_AXI_HALT_CTRL0	0x208

#define MMSS_VBIF_AXI_HALT_CTRL1	0x20C



#endif