Commit 077d0b6b authored by David Francis's avatar David Francis Committed by Alex Deucher
Browse files

drm/amd/display: Remove i2caux folder 



[Why]
It is huge, unmaintainable, needlessly layered, and obsolete

[How]
Remove it.  All of it.  Also remove the i2caux struct in
dc_context and the code that created and destructed it

Signed-off-by: default avatarDavid Francis <David.Francis@amd.com>
Reviewed-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1877ccf6

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
# Makefile for Display Core (dc) component.

#



DC_LIBS = basics bios calcs dce gpio i2caux irq virtual

DC_LIBS = basics bios calcs dce gpio irq virtual



ifdef CONFIG_DRM_AMD_DC_DCN1_0

DC_LIBS += dcn10 dml

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

+0 −11
Original line number Diff line number Diff line
@@ -585,9 +585,6 @@ static void destruct(struct dc *dc) 
	if (dc->ctx->gpio_service)

		dal_gpio_service_destroy(&dc->ctx->gpio_service);



	if (dc->ctx->i2caux)

		dal_i2caux_destroy(&dc->ctx->i2caux);



	if (dc->ctx->created_bios)

		dal_bios_parser_destroy(&dc->ctx->dc_bios);
@@ -709,14 +706,6 @@ static bool construct(struct dc *dc, 
		dc_ctx->created_bios = true;

		}



	/* Create I2C AUX */

	dc_ctx->i2caux = dal_i2caux_create(dc_ctx);



	if (!dc_ctx->i2caux) {

		ASSERT_CRITICAL(false);

		goto fail;

	}



	dc_ctx->perf_trace = dc_perf_trace_create();

	if (!dc_ctx->perf_trace) {

		ASSERT_CRITICAL(false);

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

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "include/vector.h"

#include "core_types.h"

#include "dc_link_ddc.h"

#include "aux_engine.h"

#include "dce/dce_aux.h"



#define AUX_POWER_UP_WA_DELAY 500

drivers/gpu/drm/amd/display/dc/dc_types.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ struct dc_context { 
	struct dc_bios *dc_bios;

	bool created_bios;

	struct gpio_service *gpio_service;

	struct i2caux *i2caux;

	uint32_t dc_sink_id_count;

	uint32_t dc_stream_id_count;

	uint64_t fbc_gpu_addr;

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

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ 


#ifndef __DAL_AUX_ENGINE_DCE110_H__

#define __DAL_AUX_ENGINE_DCE110_H__

#include "aux_engine.h"



#include "i2caux_interface.h"

#include "inc/hw/aux_engine.h"



#define AUX_COMMON_REG_LIST(id)\

	SRI(AUX_CONTROL, DP_AUX, id), \

CRA Git | Maintained and supported by SUSTech CRA and CCSE