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

Commit 288edc57 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: Increase the max layer count to 13"

parents 0dc637a1 5475f94c

drivers/video/fbdev/msm/mdss_fb.c

+1 −0
Original line number Diff line number Diff line
@@ -4697,6 +4697,7 @@ static int mdss_fb_atomic_commit_ioctl(struct fb_info *info, 
	input_layer_list = commit.commit_v1.input_layers;



	if (layer_count > MAX_LAYER_COUNT) {

		pr_err("invalid layer count :%d\n", layer_count);

		ret = -EINVAL;

		goto err;

	} else if (layer_count) {

drivers/video/fbdev/msm/mdss_mdp.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 


#define XIN_HALT_TIMEOUT_US	0x4000



#define MAX_LAYER_COUNT		0xC

#define MAX_LAYER_COUNT		0xD



/* For SRC QSEED3, when user space does not send the scaler information,

 * this flag allows pixel _extension to be programmed when scaler is disabled