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

Commit ef5bd71e authored by Padmanabhan Komanduru's avatar Padmanabhan Komanduru
Browse files

drm/msm/dp: rename the enums for DP test bit depth 



Rename the enums for test bit depth. This is needed to avoid
compilation errors once the SDE DP driver aligns closer to the
upstream DRM DP helper definitions.

Change-Id: I092d30b52a19955b64be3fcf574e34f6900c3474
Signed-off-by: default avatarPadmanabhan Komanduru <pkomandu@codeaurora.org>
parent 089d1cb5

drivers/gpu/drm/msm/dp/dp_ctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ static void dp_ctrl_config_ctrl(struct dp_ctrl_private *ctrl) 
	tbd = ctrl->link->get_test_bits_depth(ctrl->link,

			ctrl->panel->pinfo.bpp);



	if (tbd == DP_TEST_BIT_DEPTH_UNKNOWN)

		tbd = DP_TEST_BIT_DEPTH_8;

	if (tbd == DP_TBD_UNKNOWN)

		tbd = DP_TBD_8;



	config |= tbd << 8;

drivers/gpu/drm/msm/dp/dp_link.c

+19 −19
Original line number Diff line number Diff line
@@ -136,16 +136,16 @@ static inline u32 dp_link_bit_depth_to_bpp(enum test_bit_depth tbd) 
	 *    3. Assume 3 color components

	 */

	switch (tbd) {

	case DP_TEST_BIT_DEPTH_6:

	case DP_TBD_6:

		bpp = 18;

		break;

	case DP_TEST_BIT_DEPTH_8:

	case DP_TBD_8:

		bpp = 24;

		break;

	case DP_TEST_BIT_DEPTH_10:

	case DP_TBD_10:

		bpp = 30;

		break;

	case DP_TEST_BIT_DEPTH_UNKNOWN:

	case DP_TBD_UNKNOWN:

	default:

		bpp = 0;

	}
@@ -501,9 +501,9 @@ static bool dp_link_is_bit_depth_valid(u32 tbd) 
{

	/* DP_TEST_VIDEO_PATTERN_NONE is treated as invalid */

	switch (tbd) {

	case DP_TEST_BIT_DEPTH_6:

	case DP_TEST_BIT_DEPTH_8:

	case DP_TEST_BIT_DEPTH_10:

	case DP_TBD_6:

	case DP_TBD_8:

	case DP_TBD_10:

		return true;

	default:

		return false;
@@ -513,13 +513,13 @@ static bool dp_link_is_bit_depth_valid(u32 tbd) 
static char *dp_link_bit_depth_to_string(u32 tbd)

{

	switch (tbd) {

	case DP_TEST_BIT_DEPTH_6:

		return DP_LINK_ENUM_STR(DP_TEST_BIT_DEPTH_6);

	case DP_TEST_BIT_DEPTH_8:

		return DP_LINK_ENUM_STR(DP_TEST_BIT_DEPTH_8);

	case DP_TEST_BIT_DEPTH_10:

		return DP_LINK_ENUM_STR(DP_TEST_BIT_DEPTH_10);

	case DP_TEST_BIT_DEPTH_UNKNOWN:

	case DP_TBD_6:

		return DP_LINK_ENUM_STR(DP_TBD_6);

	case DP_TBD_8:

		return DP_LINK_ENUM_STR(DP_TBD_8);

	case DP_TBD_10:

		return DP_LINK_ENUM_STR(DP_TBD_10);

	case DP_TBD_UNKNOWN:

	default:

		return "unknown";

	}
@@ -1348,7 +1348,7 @@ static int dp_link_process_audio_pattern_request(struct dp_link_private *link) 
static void dp_link_reset_data(struct dp_link_private *link)

{

	link->request = (const struct dp_link_request){ 0 };

	link->request.test_bit_depth = DP_TEST_BIT_DEPTH_UNKNOWN;

	link->request.test_bit_depth = DP_TBD_UNKNOWN;



	link->dp_link.test_requested = 0;

}
@@ -1541,16 +1541,16 @@ static u32 dp_link_get_test_bits_depth(struct dp_link *dp_link, u32 bpp) 
	 */

	switch (bpp) {

	case 18:

		tbd = DP_TEST_BIT_DEPTH_6;

		tbd = DP_TBD_6;

		break;

	case 24:

		tbd = DP_TEST_BIT_DEPTH_8;

		tbd = DP_TBD_8;

		break;

	case 30:

		tbd = DP_TEST_BIT_DEPTH_10;

		tbd = DP_TBD_10;

		break;

	default:

		tbd = DP_TEST_BIT_DEPTH_UNKNOWN;

		tbd = DP_TBD_UNKNOWN;

		break;

	}

drivers/gpu/drm/msm/dp/dp_link.h

+4 −4
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ enum status_update { 
};



enum test_bit_depth {

	DP_TEST_BIT_DEPTH_6 = 0x00,

	DP_TEST_BIT_DEPTH_8 = 0x01,

	DP_TEST_BIT_DEPTH_10 = 0x02,

	DP_TEST_BIT_DEPTH_UNKNOWN = 0xFFFFFFFF,

	DP_TBD_6 = 0x00,

	DP_TBD_8 = 0x01,

	DP_TBD_10 = 0x02,

	DP_TBD_UNKNOWN = 0xFFFFFFFF,

};



struct dp_link {