Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8feabd03 authored by Yue Hin Lau's avatar Yue Hin Lau Committed by Alex Deucher
Browse files

drm/amd/display: rename struct mem_input to hubp for dcn 



Signed-off-by: default avatarYue Hin Lau <Yuehin.Lau@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0c63c115

drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -485,6 +485,7 @@ static void split_stream_across_pipes( 




	secondary_pipe->pipe_idx = pipe_idx;

	secondary_pipe->pipe_idx = pipe_idx;

	secondary_pipe->plane_res.mi = pool->mis[secondary_pipe->pipe_idx];

	secondary_pipe->plane_res.mi = pool->mis[secondary_pipe->pipe_idx];

	secondary_pipe->plane_res.hubp = pool->hubps[secondary_pipe->pipe_idx];

	secondary_pipe->plane_res.ipp = pool->ipps[secondary_pipe->pipe_idx];

	secondary_pipe->plane_res.ipp = pool->ipps[secondary_pipe->pipe_idx];

	secondary_pipe->plane_res.xfm = pool->transforms[secondary_pipe->pipe_idx];

	secondary_pipe->plane_res.xfm = pool->transforms[secondary_pipe->pipe_idx];

	if (primary_pipe->bottom_pipe) {

	if (primary_pipe->bottom_pipe) {

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "dc_link_ddc.h"

#include "dc_link_ddc.h"

#include "dm_helpers.h"

#include "dm_helpers.h"

#include "mem_input.h"

#include "mem_input.h"

#include "hubp.h"









/*******************************************************************************

/*******************************************************************************

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1024,7 +1024,7 @@ static int acquire_first_split_pipe( 




			memset(pipe_ctx, 0, sizeof(*pipe_ctx));

			memset(pipe_ctx, 0, sizeof(*pipe_ctx));

			pipe_ctx->stream_res.tg = pool->timing_generators[i];

			pipe_ctx->stream_res.tg = pool->timing_generators[i];

			pipe_ctx->plane_res.mi = pool->mis[i];

			pipe_ctx->plane_res.hubp = pool->hubps[i];

			pipe_ctx->plane_res.ipp = pool->ipps[i];

			pipe_ctx->plane_res.ipp = pool->ipps[i];

			pipe_ctx->plane_res.xfm = pool->transforms[i];

			pipe_ctx->plane_res.xfm = pool->transforms[i];

			pipe_ctx->stream_res.opp = pool->opps[i];

			pipe_ctx->stream_res.opp = pool->opps[i];
@@ -1359,6 +1359,7 @@ static int acquire_first_free_pipe( 




			pipe_ctx->stream_res.tg = pool->timing_generators[i];

			pipe_ctx->stream_res.tg = pool->timing_generators[i];

			pipe_ctx->plane_res.mi = pool->mis[i];

			pipe_ctx->plane_res.mi = pool->mis[i];

			pipe_ctx->plane_res.hubp = pool->hubps[i];

			pipe_ctx->plane_res.ipp = pool->ipps[i];

			pipe_ctx->plane_res.ipp = pool->ipps[i];

			pipe_ctx->plane_res.xfm = pool->transforms[i];

			pipe_ctx->plane_res.xfm = pool->transforms[i];

			pipe_ctx->stream_res.opp = pool->opps[i];

			pipe_ctx->stream_res.opp = pool->opps[i];

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

+14 −8
Original line number Original line Diff line number Diff line
@@ -200,7 +200,7 @@ bool dc_stream_set_cursor_attributes( 
	for (i = 0; i < MAX_PIPES; i++) {

	for (i = 0; i < MAX_PIPES; i++) {

		struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i];

		struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i];





		if (pipe_ctx->stream != stream || !pipe_ctx->plane_res.mi || !pipe_ctx->plane_res.xfm)

		if (pipe_ctx->stream != stream || !pipe_ctx->plane_res.xfm)

			continue;

			continue;

		if (pipe_ctx->top_pipe && pipe_ctx->plane_state != pipe_ctx->top_pipe->plane_state)

		if (pipe_ctx->top_pipe && pipe_ctx->plane_state != pipe_ctx->top_pipe->plane_state)

			continue;

			continue;
@@ -210,10 +210,15 @@ bool dc_stream_set_cursor_attributes( 
			pipe_ctx->plane_res.ipp->funcs->ipp_cursor_set_attributes(

			pipe_ctx->plane_res.ipp->funcs->ipp_cursor_set_attributes(

						pipe_ctx->plane_res.ipp, attributes);

						pipe_ctx->plane_res.ipp, attributes);





		if (pipe_ctx->plane_res.mi->funcs->set_cursor_attributes != NULL)

		if (pipe_ctx->plane_res.hubp != NULL)

			pipe_ctx->plane_res.hubp->funcs->set_cursor_attributes(

					pipe_ctx->plane_res.hubp, attributes);



		if (pipe_ctx->plane_res.mi != NULL)

			pipe_ctx->plane_res.mi->funcs->set_cursor_attributes(

			pipe_ctx->plane_res.mi->funcs->set_cursor_attributes(

					pipe_ctx->plane_res.mi, attributes);

					pipe_ctx->plane_res.mi, attributes);







		if (pipe_ctx->plane_res.xfm->funcs->set_cursor_attributes != NULL)

		if (pipe_ctx->plane_res.xfm->funcs->set_cursor_attributes != NULL)

			pipe_ctx->plane_res.xfm->funcs->set_cursor_attributes(

			pipe_ctx->plane_res.xfm->funcs->set_cursor_attributes(

				pipe_ctx->plane_res.xfm, attributes);

				pipe_ctx->plane_res.xfm, attributes);
@@ -248,7 +253,7 @@ bool dc_stream_set_cursor_position( 
	for (i = 0; i < MAX_PIPES; i++) {

	for (i = 0; i < MAX_PIPES; i++) {

		struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i];

		struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i];

		struct input_pixel_processor *ipp = pipe_ctx->plane_res.ipp;

		struct input_pixel_processor *ipp = pipe_ctx->plane_res.ipp;

		struct mem_input *mi = pipe_ctx->plane_res.mi;

		struct hubp *hubp = pipe_ctx->plane_res.hubp;

		struct transform *xfm = pipe_ctx->plane_res.xfm;

		struct transform *xfm = pipe_ctx->plane_res.xfm;

		struct dc_cursor_position pos_cpy = *position;

		struct dc_cursor_position pos_cpy = *position;

		struct dc_cursor_mi_param param = {

		struct dc_cursor_mi_param param = {
@@ -260,7 +265,7 @@ bool dc_stream_set_cursor_position( 
		};

		};





		if (pipe_ctx->stream != stream ||

		if (pipe_ctx->stream != stream ||

				!pipe_ctx->plane_res.mi ||

				(!pipe_ctx->plane_res.mi  && !pipe_ctx->plane_res.hubp) ||

				!pipe_ctx->plane_state ||

				!pipe_ctx->plane_state ||

				!pipe_ctx->plane_res.xfm)

				!pipe_ctx->plane_res.xfm)

			continue;

			continue;
@@ -276,11 +281,12 @@ bool dc_stream_set_cursor_position( 
		if (ipp->funcs->ipp_cursor_set_position != NULL)

		if (ipp->funcs->ipp_cursor_set_position != NULL)

			ipp->funcs->ipp_cursor_set_position(ipp, &pos_cpy, &param);

			ipp->funcs->ipp_cursor_set_position(ipp, &pos_cpy, &param);





		if (mi->funcs->set_cursor_attributes != NULL)

		if (hubp != NULL)

			mi->funcs->set_cursor_position(mi, &pos_cpy, &param);

			hubp->funcs->set_cursor_position(hubp, &pos_cpy, &param);



		if (xfm != NULL)

			xfm->funcs->set_cursor_position(xfm, &pos_cpy, &param, hubp->curs_attr.width);





		if (xfm->funcs->set_cursor_attributes != NULL)

			xfm->funcs->set_cursor_position(xfm, &pos_cpy, &param, mi->curs_attr.width);

	}

	}





	return true;

	return true;

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -685,9 +685,6 @@ void dce_mem_input_construct( 
	dce_mi->regs = regs;

	dce_mi->regs = regs;

	dce_mi->shifts = mi_shift;

	dce_mi->shifts = mi_shift;

	dce_mi->masks = mi_mask;

	dce_mi->masks = mi_mask;



	dce_mi->base.mpcc_id = 0xf;

	dce_mi->base.opp_id = 0xf;

}

}





void dce112_mem_input_construct(

void dce112_mem_input_construct(