Commit 06812bd9 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Add missing commas to dbuf tables 



The preferred style is to sprinkle commas after each array and
structure initialization, whether or not it happens to be the
last element/member (only exception being sentinel entries which
never have anything after them). This leads to much prettier
diffs if/when new elements/members get added to the end of the
initialization. We're not bound by some ancient silly mandate
to omit the final comma.

Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200225171125.28885-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 5ef2c353

drivers/gpu/drm/i915/intel_pm.c

+44 −44
Original line number Diff line number Diff line
@@ -4174,49 +4174,49 @@ static const struct dbuf_slice_conf_entry icl_allowed_dbufs[] = 
	{

		.active_pipes = BIT(PIPE_A),

		.dbuf_mask = {

			[PIPE_A] = BIT(DBUF_S1)

		}

			[PIPE_A] = BIT(DBUF_S1),

		},

	},

	{

		.active_pipes = BIT(PIPE_B),

		.dbuf_mask = {

			[PIPE_B] = BIT(DBUF_S1)

		}

			[PIPE_B] = BIT(DBUF_S1),

		},

	},

	{

		.active_pipes = BIT(PIPE_A) | BIT(PIPE_B),

		.dbuf_mask = {

			[PIPE_A] = BIT(DBUF_S1),

			[PIPE_B] = BIT(DBUF_S2)

		}

			[PIPE_B] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_C),

		.dbuf_mask = {

			[PIPE_C] = BIT(DBUF_S2)

		}

			[PIPE_C] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_A) | BIT(PIPE_C),

		.dbuf_mask = {

			[PIPE_A] = BIT(DBUF_S1),

			[PIPE_C] = BIT(DBUF_S2)

		}

			[PIPE_C] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_B) | BIT(PIPE_C),

		.dbuf_mask = {

			[PIPE_B] = BIT(DBUF_S1),

			[PIPE_C] = BIT(DBUF_S2)

		}

			[PIPE_C] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C),

		.dbuf_mask = {

			[PIPE_A] = BIT(DBUF_S1),

			[PIPE_B] = BIT(DBUF_S1),

			[PIPE_C] = BIT(DBUF_S2)

		}

			[PIPE_C] = BIT(DBUF_S2),

		},

	},

};
@@ -4236,100 +4236,100 @@ static const struct dbuf_slice_conf_entry tgl_allowed_dbufs[] = 
	{

		.active_pipes = BIT(PIPE_A),

		.dbuf_mask = {

			[PIPE_A] = BIT(DBUF_S1) | BIT(DBUF_S2)

		}

			[PIPE_A] = BIT(DBUF_S1) | BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_B),

		.dbuf_mask = {

			[PIPE_B] = BIT(DBUF_S1) | BIT(DBUF_S2)

		}

			[PIPE_B] = BIT(DBUF_S1) | BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_A) | BIT(PIPE_B),

		.dbuf_mask = {

			[PIPE_A] = BIT(DBUF_S2),

			[PIPE_B] = BIT(DBUF_S1)

		}

			[PIPE_B] = BIT(DBUF_S1),

		},

	},

	{

		.active_pipes = BIT(PIPE_C),

		.dbuf_mask = {

			[PIPE_C] = BIT(DBUF_S2) | BIT(DBUF_S1)

		}

			[PIPE_C] = BIT(DBUF_S2) | BIT(DBUF_S1),

		},

	},

	{

		.active_pipes = BIT(PIPE_A) | BIT(PIPE_C),

		.dbuf_mask = {

			[PIPE_A] = BIT(DBUF_S1),

			[PIPE_C] = BIT(DBUF_S2)

		}

			[PIPE_C] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_B) | BIT(PIPE_C),

		.dbuf_mask = {

			[PIPE_B] = BIT(DBUF_S1),

			[PIPE_C] = BIT(DBUF_S2)

		}

			[PIPE_C] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C),

		.dbuf_mask = {

			[PIPE_A] = BIT(DBUF_S1),

			[PIPE_B] = BIT(DBUF_S1),

			[PIPE_C] = BIT(DBUF_S2)

		}

			[PIPE_C] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_D),

		.dbuf_mask = {

			[PIPE_D] = BIT(DBUF_S2) | BIT(DBUF_S1)

		}

			[PIPE_D] = BIT(DBUF_S2) | BIT(DBUF_S1),

		},

	},

	{

		.active_pipes = BIT(PIPE_A) | BIT(PIPE_D),

		.dbuf_mask = {

			[PIPE_A] = BIT(DBUF_S1),

			[PIPE_D] = BIT(DBUF_S2)

		}

			[PIPE_D] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_B) | BIT(PIPE_D),

		.dbuf_mask = {

			[PIPE_B] = BIT(DBUF_S1),

			[PIPE_D] = BIT(DBUF_S2)

		}

			[PIPE_D] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_D),

		.dbuf_mask = {

			[PIPE_A] = BIT(DBUF_S1),

			[PIPE_B] = BIT(DBUF_S1),

			[PIPE_D] = BIT(DBUF_S2)

		}

			[PIPE_D] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_C) | BIT(PIPE_D),

		.dbuf_mask = {

			[PIPE_C] = BIT(DBUF_S1),

			[PIPE_D] = BIT(DBUF_S2)

		}

			[PIPE_D] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_A) | BIT(PIPE_C) | BIT(PIPE_D),

		.dbuf_mask = {

			[PIPE_A] = BIT(DBUF_S1),

			[PIPE_C] = BIT(DBUF_S2),

			[PIPE_D] = BIT(DBUF_S2)

		}

			[PIPE_D] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),

		.dbuf_mask = {

			[PIPE_B] = BIT(DBUF_S1),

			[PIPE_C] = BIT(DBUF_S2),

			[PIPE_D] = BIT(DBUF_S2)

		}

			[PIPE_D] = BIT(DBUF_S2),

		},

	},

	{

		.active_pipes = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),
@@ -4337,8 +4337,8 @@ static const struct dbuf_slice_conf_entry tgl_allowed_dbufs[] = 
			[PIPE_A] = BIT(DBUF_S1),

			[PIPE_B] = BIT(DBUF_S1),

			[PIPE_C] = BIT(DBUF_S2),

			[PIPE_D] = BIT(DBUF_S2)

		}

			[PIPE_D] = BIT(DBUF_S2),

		},

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE