drm/amd/display: cleanup of function pointer tables (78c77382) · Commits · 戴 / test

drivers/gpu/drm/amd/display/dc/basics/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@
		# subcomponents.

		BASICS = conversion.o fixpt31_32.o \
		log_helpers.o vector.o
		log_helpers.o vector.o dc_common.o

		AMD_DAL_BASICS = $(addprefix $(AMDDALPATH)/dc/basics/,$(BASICS))

drivers/gpu/drm/amd/display/dc/basics/dc_common.c

0 → 100644

+101 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2012-15 Advanced Micro Devices, Inc.
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
		* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
		* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
		* OTHER DEALINGS IN THE SOFTWARE.
		*
		* Authors: AMD
		*
		*/

		#include "core_types.h"
		#include "dc_common.h"
		#include "basics/conversion.h"

		bool is_rgb_cspace(enum dc_color_space output_color_space)
		{
		switch (output_color_space) {
		case COLOR_SPACE_SRGB:
		case COLOR_SPACE_SRGB_LIMITED:
		case COLOR_SPACE_2020_RGB_FULLRANGE:
		case COLOR_SPACE_2020_RGB_LIMITEDRANGE:
		case COLOR_SPACE_ADOBERGB:
		return true;
		case COLOR_SPACE_YCBCR601:
		case COLOR_SPACE_YCBCR709:
		case COLOR_SPACE_YCBCR601_LIMITED:
		case COLOR_SPACE_YCBCR709_LIMITED:
		case COLOR_SPACE_2020_YCBCR:
		return false;
		default:
		/* Add a case to switch */
		BREAK_TO_DEBUGGER();
		return false;
		}
		}

		bool is_lower_pipe_tree_visible(struct pipe_ctx *pipe_ctx)
		{
		if (pipe_ctx->plane_state && pipe_ctx->plane_state->visible)
		return true;
		if (pipe_ctx->bottom_pipe && is_lower_pipe_tree_visible(pipe_ctx->bottom_pipe))
		return true;
		return false;
		}

		bool is_upper_pipe_tree_visible(struct pipe_ctx *pipe_ctx)
		{
		if (pipe_ctx->plane_state && pipe_ctx->plane_state->visible)
		return true;
		if (pipe_ctx->top_pipe && is_upper_pipe_tree_visible(pipe_ctx->top_pipe))
		return true;
		return false;
		}

		bool is_pipe_tree_visible(struct pipe_ctx *pipe_ctx)
		{
		if (pipe_ctx->plane_state && pipe_ctx->plane_state->visible)
		return true;
		if (pipe_ctx->top_pipe && is_upper_pipe_tree_visible(pipe_ctx->top_pipe))
		return true;
		if (pipe_ctx->bottom_pipe && is_lower_pipe_tree_visible(pipe_ctx->bottom_pipe))
		return true;
		return false;
		}

		void build_prescale_params(struct dc_bias_and_scale *bias_and_scale,
		const struct dc_plane_state *plane_state)
		{
		if (plane_state->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN
		&& plane_state->format != SURFACE_PIXEL_FORMAT_INVALID
		&& plane_state->input_csc_color_matrix.enable_adjustment
		&& plane_state->coeff_reduction_factor.value != 0) {
		bias_and_scale->scale_blue = fixed_point_to_int_frac(
		dc_fixpt_mul(plane_state->coeff_reduction_factor,
		dc_fixpt_from_fraction(256, 255)),
		2,
		13);
		bias_and_scale->scale_red = bias_and_scale->scale_blue;
		bias_and_scale->scale_green = bias_and_scale->scale_blue;
		} else {
		bias_and_scale->scale_blue = 0x2000;
		bias_and_scale->scale_red = 0x2000;
		bias_and_scale->scale_green = 0x2000;
		}
		}

drivers/gpu/drm/amd/display/dc/basics/dc_common.h

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2012-15 Advanced Micro Devices, Inc.
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
		* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
		* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
		* OTHER DEALINGS IN THE SOFTWARE.
		*
		* Authors: AMD
		*
		*/

		#ifndef __DAL_DC_COMMON_H__
		#define __DAL_DC_COMMON_H__

		#include "core_types.h"

		bool is_rgb_cspace(enum dc_color_space output_color_space);

		bool is_lower_pipe_tree_visible(struct pipe_ctx *pipe_ctx);

		bool is_upper_pipe_tree_visible(struct pipe_ctx *pipe_ctx);

		bool is_pipe_tree_visible(struct pipe_ctx *pipe_ctx);

		void build_prescale_params(struct dc_bias_and_scale *bias_and_scale,
		const struct dc_plane_state *plane_state);

		#endif

drivers/gpu/drm/amd/display/dc/core/dc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1973,11 +1973,11 @@ static void commit_planes_do_stream_update(struct dc *dc,

		if (stream_update->periodic_interrupt0 &&
		dc->hwss.setup_periodic_interrupt)
		dc->hwss.setup_periodic_interrupt(pipe_ctx, VLINE0);
		dc->hwss.setup_periodic_interrupt(dc, pipe_ctx, VLINE0);

		if (stream_update->periodic_interrupt1 &&
		dc->hwss.setup_periodic_interrupt)
		dc->hwss.setup_periodic_interrupt(pipe_ctx, VLINE1);
		dc->hwss.setup_periodic_interrupt(dc, pipe_ctx, VLINE1);

		if ((stream_update->hdr_static_metadata && !stream->use_dynamic_meta) \|\|
		stream_update->vrr_infopacket \|\|

drivers/gpu/drm/amd/display/dc/core/dc_stream.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include <linux/slab.h>

		#include "dm_services.h"
		#include "basics/dc_common.h"
		#include "dc.h"
		#include "core_types.h"
		#include "resource.h"
		@@ -244,7 +245,7 @@ static void delay_cursor_until_vupdate(struct pipe_ctx pipe_ctx, struct dc dc)
		if (stream->ctx->asic_id.chip_family == FAMILY_RV &&
		ASICREV_IS_RAVEN(stream->ctx->asic_id.hw_internal_rev)) {

		vupdate_line = get_vupdate_offset_from_vsync(pipe_ctx);
		vupdate_line = dc->hwss.get_vupdate_offset_from_vsync(pipe_ctx);
		if (!dc_stream_get_crtc_position(dc, &stream, 1, &vpos, &nvpos))
		return;

Admin message