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

Commit b2603ebd 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: set the mdp core clock rate on 8x10"

parents 4ae4d503 2ced325f

drivers/video/msm/mdss/mdp3.c

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

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

 * Copyright (C) 2007 Google Incorporated

 *

 * This software is licensed under the terms of the GNU General Public
@@ -1858,6 +1858,9 @@ static int mdp3_continuous_splash_on(struct mdss_panel_data *pdata) 
	mdp3_clk_set_rate(MDP3_CLK_VSYNC, MDP_VSYNC_CLK_RATE,

			MDP3_CLIENT_DMA_P);



	mdp3_clk_set_rate(MDP3_CLK_CORE, MDP_CORE_CLK_RATE,

			MDP3_CLIENT_DMA_P);



	rc = mdp3_clk_prepare();

	if (rc) {

		pr_err("fail to prepare clk\n");

drivers/video/msm/mdss/mdp3.h

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

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

 * Copyright (C) 2007 Google Incorporated

 *

 * This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,7 @@ 
#include "mdss_fb.h"



#define MDP_VSYNC_CLK_RATE	19200000

#define MDP_CORE_CLK_RATE	100000000

#define KOFF_TIMEOUT msecs_to_jiffies(84)



enum  {

drivers/video/msm/mdss/mdp3_ctrl.c

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

/* Copyright (c) 2013-2014, 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
@@ -25,7 +25,6 @@ 
#include "mdp3.h"

#include "mdp3_ppp.h"



#define MDP_CORE_CLK_RATE	100000000

#define VSYNC_EXPIRE_TICK	4



static void mdp3_ctrl_pan_display(struct msm_fb_data_type *mfd,