From 5e141de45218d36a6b98c783834684fd0d617f7a Mon Sep 17 00:00:00 2001 From: Harry Wentland Date: Tue, 21 Mar 2017 18:17:12 -0400 Subject: [PATCH] drm/amd/display: Rename bandwidth_calcs.h to dce_calcs.h Signed-off-by: Harry Wentland Acked-by: Harry Wentland Reviewed-by: Tony Cheng Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c | 2 +- drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c | 2 +- drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- .../gpu/drm/amd/display/dc/inc/{bandwidth_calcs.h => dce_calcs.h} | 8 +++++--- drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) rename drivers/gpu/drm/amd/display/dc/inc/{bandwidth_calcs.h => dce_calcs.h} (99%) diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c index 4820660..5ac614f 100644 --- a/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +++ b/drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c @@ -24,7 +24,7 @@ */ #include "dm_services.h" -#include "bandwidth_calcs.h" +#include "dce_calcs.h" #include "dc.h" #include "core_types.h" #include "dal_asic_id.h" diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index c0889ad..b389122 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -35,7 +35,7 @@ #include "clock_source.h" #include "dc_bios_types.h" -#include "bandwidth_calcs.h" +#include "dce_calcs.h" #include "bios_parser_interface.h" #include "include/irq_service_interface.h" #include "transform.h" diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c index aac4795..9c32b5b 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_mem_input_v.c @@ -31,7 +31,7 @@ #include "gmc/gmc_8_2_sh_mask.h" #include "include/logger_interface.h" -#include "inc/bandwidth_calcs.h" +#include "inc/dce_calcs.h" #include "dce110_mem_input.h" diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c index ebb8df3..933e3d8 100644 --- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c +++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_mem_input.c @@ -31,7 +31,7 @@ #include "gmc/gmc_7_1_sh_mask.h" #include "include/logger_interface.h" -#include "inc/bandwidth_calcs.h" +#include "inc/dce_calcs.h" #include "../dce110/dce110_mem_input.h" #include "dce80_mem_input.h" diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h index 7f3c6da..4056083 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h +++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h @@ -27,7 +27,7 @@ #define _CORE_TYPES_H_ #include "dc.h" -#include "bandwidth_calcs.h" +#include "dce_calcs.h" #include "ddc_service_types.h" #include "dc_bios_types.h" diff --git a/drivers/gpu/drm/amd/display/dc/inc/bandwidth_calcs.h b/drivers/gpu/drm/amd/display/dc/inc/dce_calcs.h similarity index 99% rename from drivers/gpu/drm/amd/display/dc/inc/bandwidth_calcs.h rename to drivers/gpu/drm/amd/display/dc/inc/dce_calcs.h index 81fab9e..580dee95 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/bandwidth_calcs.h +++ b/drivers/gpu/drm/amd/display/dc/inc/dce_calcs.h @@ -1,5 +1,5 @@ /* - * Copyright 2015 Advanced Micro Devices, Inc. + * Copyright 2015-2017 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"), @@ -27,12 +27,14 @@ * Bandwidth and Watermark calculations interface. * (Refer to "DCEx_mode_support.xlsm" from Perforce.) */ -#ifndef __BANDWIDTH_CALCS_H__ -#define __BANDWIDTH_CALCS_H__ +#ifndef __DCE_CALCS_H__ +#define __DCE_CALCS_H__ #include "bw_fixed.h" struct pipe_ctx; +struct core_dc; +struct validate_context; enum bw_calcs_version { BW_CALCS_VERSION_INVALID, diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h b/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h index 7ec4027..179f5ad 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h @@ -27,7 +27,7 @@ #include "dc.h" #include "include/grph_object_id.h" -#include "inc/bandwidth_calcs.h" +#include "inc/dce_calcs.h" #include "dce/dce_mem_input.h" /* temporary */ -- 2.7.4