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

drm/tegra: plane: Rename bottom_up to reflect_y 



This makes the naming consistent with the DRM core.

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

drivers/gpu/drm/tegra/dc.c

+5 −5
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static void tegra_dc_setup_window(struct tegra_plane *plane, 
		tegra_plane_writel(plane, window->stride[0], DC_WIN_LINE_STRIDE);

	}



	if (window->bottom_up)

	if (window->reflect_y)

		v_offset += window->src.h - 1;



	tegra_plane_writel(plane, h_offset, DC_WINBUF_ADDR_H_OFFSET);
@@ -470,7 +470,7 @@ static void tegra_dc_setup_window(struct tegra_plane *plane, 
		value |= COLOR_EXPAND;

	}



	if (window->bottom_up)

	if (window->reflect_y)

		value |= V_DIRECTION;



	if (tegra_plane_use_horizontal_filtering(plane, window)) {
@@ -642,9 +642,9 @@ static int tegra_plane_atomic_check(struct drm_plane *plane, 
	rotation = drm_rotation_simplify(state->rotation, rotation);



	if (rotation & DRM_MODE_REFLECT_Y)

		plane_state->bottom_up = true;

		plane_state->reflect_y = true;

	else

		plane_state->bottom_up = false;

		plane_state->reflect_y = false;



	/*

	 * Tegra doesn't support different strides for U and V planes so we
@@ -706,7 +706,7 @@ static void tegra_plane_atomic_update(struct drm_plane *plane, 
	window.dst.w = drm_rect_width(&plane->state->dst);

	window.dst.h = drm_rect_height(&plane->state->dst);

	window.bits_per_pixel = fb->format->cpp[0] * 8;

	window.bottom_up = tegra_fb_is_bottom_up(fb) || state->bottom_up;

	window.reflect_y = tegra_fb_is_bottom_up(fb) || state->reflect_y;



	/* copy from state */

	window.zpos = plane->state->normalized_zpos;

drivers/gpu/drm/tegra/dc.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ struct tegra_dc_window { 
	unsigned int stride[2];

	unsigned long base[3];

	unsigned int zpos;

	bool bottom_up;

	bool reflect_y;



	struct tegra_bo_tiling tiling;

	u32 format;

drivers/gpu/drm/tegra/plane.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ tegra_plane_atomic_duplicate_state(struct drm_plane *plane) 
	copy->tiling = state->tiling;

	copy->format = state->format;

	copy->swap = state->swap;

	copy->bottom_up = state->bottom_up;

	copy->reflect_y = state->reflect_y;

	copy->opaque = state->opaque;



	for (i = 0; i < 2; i++)

drivers/gpu/drm/tegra/plane.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct tegra_plane_state { 
	u32 format;

	u32 swap;



	bool bottom_up;

	bool reflect_y;



	/* used for legacy blending support only */

	struct tegra_plane_legacy_blending_state blending[2];