drm/amd/display: Use dmub fw to lock pipe, cursor, dig (dc6e2448) · Commits · 戴 / test

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

+32 −4

Original line number	Diff line number	Diff line
		@@ -68,6 +68,8 @@

		#include "dmub/dmub_srv.h"

		#include "dce/dmub_hw_lock_mgr.h"

		#define CTX \
		dc->ctx

		@@ -2321,9 +2323,22 @@ static void commit_planes_for_stream(struct dc *dc,
		}

		if ((update_type != UPDATE_TYPE_FAST) && stream->update_flags.bits.dsc_changed)
		if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable)
		if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {
		if (stream && should_use_dmub_lock(stream->link)) {
		union dmub_hw_lock_flags hw_locks = { 0 };
		struct dmub_hw_lock_inst_flags inst_flags = { 0 };

		hw_locks.bits.lock_dig = 1;
		inst_flags.dig_inst = top_pipe_to_program->stream_res.tg->inst;

		dmub_hw_lock_mgr_cmd(dc->ctx->dmub_srv,
		true,
		&hw_locks,
		&inst_flags);
		} else
		top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable(
		top_pipe_to_program->stream_res.tg);
		}

		if ((update_type != UPDATE_TYPE_FAST) && dc->hwss.interdependent_update_lock)
		dc->hwss.interdependent_update_lock(dc, context, true);
		@@ -2493,6 +2508,19 @@ static void commit_planes_for_stream(struct dc *dc,
		top_pipe_to_program->stream_res.tg->funcs->wait_for_state(
		top_pipe_to_program->stream_res.tg,
		CRTC_STATE_VACTIVE);

		if (stream && should_use_dmub_lock(stream->link)) {
		union dmub_hw_lock_flags hw_locks = { 0 };
		struct dmub_hw_lock_inst_flags inst_flags = { 0 };

		hw_locks.bits.lock_dig = 1;
		inst_flags.dig_inst = top_pipe_to_program->stream_res.tg->inst;

		dmub_hw_lock_mgr_cmd(dc->ctx->dmub_srv,
		false,
		&hw_locks,
		&inst_flags);
		} else
		top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_disable(
		top_pipe_to_program->stream_res.tg);
		}

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

+37 −6

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@
		#include "dc_link_ddc.h"
		#include "core_status.h"
		#include "dpcd_defs.h"
		#include "dc_dmub_srv.h"
		#include "dce/dmub_hw_lock_mgr.h"

		#define DC_LOGGER \
		link->ctx->logger
		@@ -4030,9 +4032,23 @@ bool dc_link_dp_set_test_pattern(
		break;
		}

		if (pipe_ctx->stream_res.tg->funcs->lock_doublebuffer_enable)
		if (pipe_ctx->stream_res.tg->funcs->lock_doublebuffer_enable) {
		if (pipe_ctx->stream && should_use_dmub_lock(pipe_ctx->stream->link)) {
		union dmub_hw_lock_flags hw_locks = { 0 };
		struct dmub_hw_lock_inst_flags inst_flags = { 0 };

		hw_locks.bits.lock_dig = 1;
		inst_flags.dig_inst = pipe_ctx->stream_res.tg->inst;

		dmub_hw_lock_mgr_cmd(link->ctx->dmub_srv,
		true,
		&hw_locks,
		&inst_flags);
		} else
		pipe_ctx->stream_res.tg->funcs->lock_doublebuffer_enable(
		pipe_ctx->stream_res.tg);
		}

		pipe_ctx->stream_res.tg->funcs->lock(pipe_ctx->stream_res.tg);
		/* update MSA to requested color space */
		pipe_ctx->stream_res.stream_enc->funcs->dp_set_stream_attribute(pipe_ctx->stream_res.stream_enc,
		@@ -4059,9 +4075,24 @@ bool dc_link_dp_set_test_pattern(
		CRTC_STATE_VBLANK);
		pipe_ctx->stream_res.tg->funcs->wait_for_state(pipe_ctx->stream_res.tg,
		CRTC_STATE_VACTIVE);
		if (pipe_ctx->stream_res.tg->funcs->lock_doublebuffer_disable)

		if (pipe_ctx->stream_res.tg->funcs->lock_doublebuffer_disable) {
		if (pipe_ctx->stream && should_use_dmub_lock(pipe_ctx->stream->link)) {
		union dmub_hw_lock_flags hw_locks = { 0 };
		struct dmub_hw_lock_inst_flags inst_flags = { 0 };

		hw_locks.bits.lock_dig = 1;
		inst_flags.dig_inst = pipe_ctx->stream_res.tg->inst;

		dmub_hw_lock_mgr_cmd(link->ctx->dmub_srv,
		false,
		&hw_locks,
		&inst_flags);
		} else
		pipe_ctx->stream_res.tg->funcs->lock_doublebuffer_disable(
		pipe_ctx->stream_res.tg);
		}

		/* Set Test Pattern state */
		link->test_pattern_enabled = true;
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,8 @@
		DCE = dce_audio.o dce_stream_encoder.o dce_link_encoder.o dce_hwseq.o \
		dce_mem_input.o dce_clock_source.o dce_scl_filters.o dce_transform.o \
		dce_opp.o dce_dmcu.o dce_abm.o dce_ipp.o dce_aux.o \
		dce_i2c.o dce_i2c_hw.o dce_i2c_sw.o dmub_psr.o dmub_abm.o dce_panel_cntl.o
		dce_i2c.o dce_i2c_hw.o dce_i2c_sw.o dmub_psr.o dmub_abm.o dce_panel_cntl.o \
		dmub_hw_lock_mgr.o

		AMD_DAL_DCE = $(addprefix $(AMDDALPATH)/dc/dce/,$(DCE))

drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2019 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 "dmub_hw_lock_mgr.h"
		#include "dc_dmub_srv.h"
		#include "dc_types.h"
		#include "core_types.h"

		void dmub_hw_lock_mgr_cmd(struct dc_dmub_srv *dmub_srv,
		bool lock,
		union dmub_hw_lock_flags *hw_locks,
		struct dmub_hw_lock_inst_flags *inst_flags)
		{
		union dmub_rb_cmd cmd = { 0 };

		cmd.lock_hw.header.type = DMUB_CMD__HW_LOCK;
		cmd.lock_hw.header.sub_type = 0;
		cmd.lock_hw.header.payload_bytes = sizeof(struct dmub_cmd_lock_hw_data);
		cmd.lock_hw.lock_hw_data.client = HW_LOCK_CLIENT_DRIVER;
		cmd.lock_hw.lock_hw_data.lock = lock;
		cmd.lock_hw.lock_hw_data.hw_locks.u8All = hw_locks->u8All;
		memcpy(&cmd.lock_hw.lock_hw_data.inst_flags, inst_flags, sizeof(struct dmub_hw_lock_inst_flags));

		if (!lock)
		cmd.lock_hw.lock_hw_data.should_release = 1;

		dc_dmub_srv_cmd_queue(dmub_srv, &cmd);
		dc_dmub_srv_cmd_execute(dmub_srv);
		dc_dmub_srv_wait_idle(dmub_srv);
		}

		bool should_use_dmub_lock(struct dc_link *link)
		{
		return false;
		}

drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.h

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2012-16 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 _DMUB_HW_LOCK_MGR_H_
		#define _DMUB_HW_LOCK_MGR_H_

		#include "dc_dmub_srv.h"
		#include "core_types.h"

		void dmub_hw_lock_mgr_cmd(struct dc_dmub_srv *dmub_srv,
		bool lock,
		union dmub_hw_lock_flags *hw_locks,
		struct dmub_hw_lock_inst_flags *inst_flags);

		bool should_use_dmub_lock(struct dc_link *link);

		#endif /_DMUB_HW_LOCK_MGR_H_ /

Admin message