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

Commit 1f2fc9ec authored by abeykun's avatar abeykun Committed by Gerrit - the friendly Code Review server
Browse files

drm/msm/sde: move pixel format flags to bitmap 



Patch changes type of pixel format flags from u32 to bitmap.

Change-Id: I117f3737d78d22b9bd6d78abdb8e96f52fc4e874
Signed-off-by: default avatarAlexander Beykun <abeykun@codeaurora.org>
parent bedc84f4

drivers/gpu/drm/msm/sde/sde_formats.c

+5 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ bp, flg, fm, np) \ 
	.unpack_count = uc,                                               \

	.bpp = bp,                                                        \

	.fetch_mode = fm,                                                 \

	.flag = flg,                                                      \

	.flag = {(flg)},                                                  \

	.num_planes = np                                                  \

}
@@ -63,7 +63,7 @@ alpha, chroma, count, bp, flg, fm, np) \ 
	.unpack_count = count,                                            \

	.bpp = bp,                                                        \

	.fetch_mode = fm,                                                 \

	.flag = flg,                                                      \

	.flag = {(flg)},                                                  \

	.num_planes = np                                                  \

}
@@ -80,7 +80,7 @@ alpha, chroma, count, bp, flg, fm, np) \ 
	.unpack_count = 2,                                                \

	.bpp = 2,                                                         \

	.fetch_mode = fm,                                                 \

	.flag = flg,                                                      \

	.flag = {(flg)},                                                  \

	.num_planes = np                                                  \

}
@@ -97,7 +97,7 @@ alpha, chroma, count, bp, flg, fm, np) \ 
	.unpack_count = 2,                                                \

	.bpp = 2,                                                         \

	.fetch_mode = fm,                                                 \

	.flag = flg,                                                      \

	.flag = {(flg)},                                                  \

	.num_planes = np                                                  \

}
@@ -115,7 +115,7 @@ flg, fm, np) \ 
	.unpack_count = 1,                                                \

	.bpp = bp,                                                        \

	.fetch_mode = fm,                                                 \

	.flag = flg,                                                      \

	.flag = {(flg)},                                                  \

	.num_planes = np                                                  \

}

drivers/gpu/drm/msm/sde/sde_hw_mdss.h

+12 −5
Original line number Diff line number Diff line
@@ -41,11 +41,18 @@ 
#define SDE_MAX_DE_CURVES		3

#endif



#define SDE_FORMAT_FLAG_YUV		(1 << 0)

#define SDE_FORMAT_FLAG_DX		(1 << 1)

enum sde_format_flags {

	SDE_FORMAT_FLAG_YUV_BIT,

	SDE_FORMAT_FLAG_DX_BIT,

	SDE_FORMAT_FLAG_BIT_MAX,

};



#define SDE_FORMAT_IS_YUV(X)		((X)->flag & SDE_FORMAT_FLAG_YUV)

#define SDE_FORMAT_IS_DX(X)		((X)->flag & SDE_FORMAT_FLAG_DX)

#define SDE_FORMAT_FLAG_YUV		BIT(SDE_FORMAT_FLAG_YUV_BIT)

#define SDE_FORMAT_FLAG_DX		BIT(SDE_FORMAT_FLAG_DX_BIT)

#define SDE_FORMAT_IS_YUV(X)		\

	(test_bit(SDE_FORMAT_FLAG_YUV_BIT, (X)->flag))

#define SDE_FORMAT_IS_DX(X)		\

	(test_bit(SDE_FORMAT_FLAG_DX_BIT, (X)->flag))

#define SDE_FORMAT_IS_LINEAR(X)		((X)->fetch_mode == SDE_FETCH_LINEAR)

#define SDE_FORMAT_IS_UBWC(X)		((X)->fetch_mode == SDE_FETCH_UBWC)
@@ -357,7 +364,7 @@ struct sde_format { 
	u8 alpha_enable;

	u8 num_planes;

	enum sde_fetch_type fetch_mode;

	u32 flag;

	DECLARE_BITMAP(flag, SDE_FORMAT_FLAG_BIT_MAX);

	u16 tile_width;

	u16 tile_height;

};