Merge "drm/msm: The domain number in GEM should be 6" (2b08f3d4) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/gpu/drm/msm/msm_drv.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,8 @@
	* Copyright (C) 2013 Red Hat		* Copyright (C) 2013 Red Hat
	* Author: Rob Clark <robdclark@gmail.com>		* Author: Rob Clark <robdclark@gmail.com>
	*		*
			* Copyright (c) 2017 The Linux Foundation. All rights reserved.
			*
	* This program is free software; you can redistribute it and/or modify it		* This program is free software; you can redistribute it and/or modify it
	* under the terms of the GNU General Public License version 2 as published by		* under the terms of the GNU General Public License version 2 as published by
	* the Free Software Foundation.		* the Free Software Foundation.
	@@ -58,7 +60,7 @@ struct msm_rd_state;
	struct msm_perf_state;		struct msm_perf_state;
	struct msm_gem_submit;		struct msm_gem_submit;

	#define NUM_DOMAINS 4 /* one for KMS, then one per gpu core (?) */		#define NUM_DOMAINS 6 /* four for KMS, then two for GPU */
	#define MAX_CRTCS 8		#define MAX_CRTCS 8
	#define MAX_PLANES 12		#define MAX_PLANES 12
	#define MAX_ENCODERS 8		#define MAX_ENCODERS 8