Commit 7b3a1432 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Relocate unlink_nv12_plane() 



Move unlink_nv12_plane() ahead of its first caller to
avoid the forward declaration.

Cc: Khaled Almahallawy <khaled.almahallawy@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20260316163953.12905-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
parent 017ecd04

drivers/gpu/drm/i915/display/intel_plane.c

+23 −26
Original line number Diff line number Diff line
@@ -437,7 +437,29 @@ void intel_plane_copy_hw_state(struct intel_plane_state *plane_state, 
}



static void unlink_nv12_plane(struct intel_crtc_state *crtc_state,

			      struct intel_plane_state *plane_state);

			      struct intel_plane_state *plane_state)

{

	struct intel_display *display = to_intel_display(plane_state);

	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);



	if (!plane_state->planar_linked_plane)

		return;



	plane_state->planar_linked_plane = NULL;



	if (!plane_state->is_y_plane)

		return;



	drm_WARN_ON(display->drm, plane_state->uapi.visible);



	plane_state->is_y_plane = false;



	crtc_state->enabled_planes &= ~BIT(plane->id);

	crtc_state->active_planes &= ~BIT(plane->id);

	crtc_state->update_planes |= BIT(plane->id);

	crtc_state->data_rate[plane->id] = 0;

	crtc_state->rel_data_rate[plane->id] = 0;

}



void intel_plane_set_invisible(struct intel_crtc_state *crtc_state,

			       struct intel_plane_state *plane_state)
@@ -1512,31 +1534,6 @@ static void link_nv12_planes(struct intel_crtc_state *crtc_state, 
	icl_link_nv12_planes(uv_plane_state, y_plane_state);

}



static void unlink_nv12_plane(struct intel_crtc_state *crtc_state,

			      struct intel_plane_state *plane_state)

{

	struct intel_display *display = to_intel_display(plane_state);

	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);



	if (!plane_state->planar_linked_plane)

		return;



	plane_state->planar_linked_plane = NULL;



	if (!plane_state->is_y_plane)

		return;



	drm_WARN_ON(display->drm, plane_state->uapi.visible);



	plane_state->is_y_plane = false;



	crtc_state->enabled_planes &= ~BIT(plane->id);

	crtc_state->active_planes &= ~BIT(plane->id);

	crtc_state->update_planes |= BIT(plane->id);

	crtc_state->data_rate[plane->id] = 0;

	crtc_state->rel_data_rate[plane->id] = 0;

}



static int icl_check_nv12_planes(struct intel_atomic_state *state,

				 struct intel_crtc *crtc)

{