Commit a43d0a00 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding
Browse files

drm/tegra: dc: Rename supports_blending to has_legacy_blending 



Older Tegra chips do support blending as well. Rename the SoC info entry
.supports_blending to .has_legacy_blending to eliminate the confusion.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 3dae08bc

drivers/gpu/drm/tegra/dc.c

+10 −10
Original line number Diff line number Diff line
@@ -508,10 +508,10 @@ static void tegra_dc_setup_window(struct tegra_plane *plane, 


	tegra_plane_writel(plane, value, DC_WIN_WIN_OPTIONS);



	if (dc->soc->supports_blending)

		tegra_plane_setup_blending(plane, window);

	else

	if (dc->soc->has_legacy_blending)

		tegra_plane_setup_blending_legacy(plane);

	else

		tegra_plane_setup_blending(plane, window);

}



static const u32 tegra20_primary_formats[] = {
@@ -617,7 +617,7 @@ static int tegra_plane_atomic_check(struct drm_plane *plane, 
	 * the corresponding opaque formats. However, the opaque formats can

	 * be emulated by disabling alpha blending for the plane.

	 */

	if (!dc->soc->supports_blending) {

	if (dc->soc->has_legacy_blending) {

		err = tegra_plane_setup_legacy_state(tegra, plane_state);

		if (err < 0)

			return err;
@@ -2072,7 +2072,7 @@ static const struct tegra_dc_soc_info tegra20_dc_soc_info = { 
	.supports_interlacing = false,

	.supports_cursor = false,

	.supports_block_linear = false,

	.supports_blending = false,

	.has_legacy_blending = true,

	.pitch_align = 8,

	.has_powergate = false,

	.coupled_pm = true,
@@ -2091,7 +2091,7 @@ static const struct tegra_dc_soc_info tegra30_dc_soc_info = { 
	.supports_interlacing = false,

	.supports_cursor = false,

	.supports_block_linear = false,

	.supports_blending = false,

	.has_legacy_blending = true,

	.pitch_align = 8,

	.has_powergate = false,

	.coupled_pm = false,
@@ -2110,7 +2110,7 @@ static const struct tegra_dc_soc_info tegra114_dc_soc_info = { 
	.supports_interlacing = false,

	.supports_cursor = false,

	.supports_block_linear = false,

	.supports_blending = false,

	.has_legacy_blending = true,

	.pitch_align = 64,

	.has_powergate = true,

	.coupled_pm = false,
@@ -2129,7 +2129,7 @@ static const struct tegra_dc_soc_info tegra124_dc_soc_info = { 
	.supports_interlacing = true,

	.supports_cursor = true,

	.supports_block_linear = true,

	.supports_blending = true,

	.has_legacy_blending = false,

	.pitch_align = 64,

	.has_powergate = true,

	.coupled_pm = false,
@@ -2148,7 +2148,7 @@ static const struct tegra_dc_soc_info tegra210_dc_soc_info = { 
	.supports_interlacing = true,

	.supports_cursor = true,

	.supports_block_linear = true,

	.supports_blending = true,

	.has_legacy_blending = false,

	.pitch_align = 64,

	.has_powergate = true,

	.coupled_pm = false,
@@ -2201,7 +2201,7 @@ static const struct tegra_dc_soc_info tegra186_dc_soc_info = { 
	.supports_interlacing = true,

	.supports_cursor = true,

	.supports_block_linear = true,

	.supports_blending = true,

	.has_legacy_blending = false,

	.pitch_align = 64,

	.has_powergate = false,

	.coupled_pm = false,

drivers/gpu/drm/tegra/dc.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct tegra_dc_soc_info { 
	bool supports_interlacing;

	bool supports_cursor;

	bool supports_block_linear;

	bool supports_blending;

	bool has_legacy_blending;

	unsigned int pitch_align;

	bool has_powergate;

	bool coupled_pm;