displayobject.h is not used by any source files.
Lets just remove them.
Signed-off-by: Corentin Labbe <[email protected]>
---
drivers/gpu/drm/amd/include/displayobject.h | 249 ----------------------------
1 file changed, 249 deletions(-)
delete mode 100644 drivers/gpu/drm/amd/include/displayobject.h
diff --git a/drivers/gpu/drm/amd/include/displayobject.h
b/drivers/gpu/drm/amd/include/displayobject.h
deleted file mode 100644
index 67e23ff9cbd4..000000000000
--- a/drivers/gpu/drm/amd/include/displayobject.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/****************************************************************************\
-*
-* Module Name displayobjectsoc15.h
-* Project
-* Device
-*
-* Description Contains the common definitions for display objects for
SoC15 products.
-*
-* Copyright 2014 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.
-*
-\****************************************************************************/
-#ifndef _DISPLAY_OBJECT_SOC15_H_
-#define _DISPLAY_OBJECT_SOC15_H_
-
-#if defined(_X86_)
-#pragma pack(1)
-#endif
-
-
-/****************************************************
-* Display Object Type Definition
-*****************************************************/
-enum display_object_type{
-DISPLAY_OBJECT_TYPE_NONE =0x00,
-DISPLAY_OBJECT_TYPE_GPU
=0x01,
-DISPLAY_OBJECT_TYPE_ENCODER =0x02,
-DISPLAY_OBJECT_TYPE_CONNECTOR =0x03
-};
-
-/****************************************************
-* Encorder Object Type Definition
-*****************************************************/
-enum encoder_object_type{
-ENCODER_OBJECT_ID_NONE =0x00,
-ENCODER_OBJECT_ID_INTERNAL_UNIPHY =0x01,
-ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 =0x02,
-ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 =0x03,
-};
-
-
-/****************************************************
-* Connector Object ID Definition
-*****************************************************/
-
-enum connector_object_type{
-CONNECTOR_OBJECT_ID_NONE
=0x00,
-CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D =0x01,
-CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D =0x02,
-CONNECTOR_OBJECT_ID_HDMI_TYPE_A =0x03,
-CONNECTOR_OBJECT_ID_LVDS =0x04,
-CONNECTOR_OBJECT_ID_DISPLAYPORT =0x05,
-CONNECTOR_OBJECT_ID_eDP
=0x06,
-CONNECTOR_OBJECT_ID_OPM
=0x07
-};
-
-
-/****************************************************
-* Protection Object ID Definition
-*****************************************************/
-//No need
-
-/****************************************************
-* Object ENUM ID Definition
-*****************************************************/
-
-enum object_enum_id{
-OBJECT_ENUM_ID1
=0x01,
-OBJECT_ENUM_ID2
=0x02,
-OBJECT_ENUM_ID3
=0x03,
-OBJECT_ENUM_ID4
=0x04,
-OBJECT_ENUM_ID5
=0x05,
-OBJECT_ENUM_ID6
=0x06
-};
-
-/****************************************************
-*Object ID Bit definition
-*****************************************************/
-enum object_id_bit{
-OBJECT_ID_MASK
=0x00FF,
-ENUM_ID_MASK
=0x0F00,
-OBJECT_TYPE_MASK
=0xF000,
-OBJECT_ID_SHIFT
=0x00,
-ENUM_ID_SHIFT
=0x08,
-OBJECT_TYPE_SHIFT
=0x0C
-};
-
-
-/****************************************************
-* GPU Object definition - Shared with BIOS
-*****************************************************/
-enum gpu_objet_def{
-GPU_ENUM_ID1 =( DISPLAY_OBJECT_TYPE_GPU <<
OBJECT_TYPE_SHIFT | OBJECT_ENUM_ID1 << ENUM_ID_SHIFT)
-};
-
-/****************************************************
-* Encoder Object definition - Shared with BIOS
-*****************************************************/
-
-enum encoder_objet_def{
-ENCODER_INTERNAL_UNIPHY_ENUM_ID1 =( DISPLAY_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
-
ENCODER_OBJECT_ID_INTERNAL_UNIPHY << OBJECT_ID_SHIFT),
-
-ENCODER_INTERNAL_UNIPHY_ENUM_ID2 =( DISPLAY_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
-
ENCODER_OBJECT_ID_INTERNAL_UNIPHY << OBJECT_ID_SHIFT),
-
-ENCODER_INTERNAL_UNIPHY1_ENUM_ID1 =( DISPLAY_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
-
ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 << OBJECT_ID_SHIFT),
-
-ENCODER_INTERNAL_UNIPHY1_ENUM_ID2 =( DISPLAY_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
-
ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 << OBJECT_ID_SHIFT),
-
-ENCODER_INTERNAL_UNIPHY2_ENUM_ID1 =( DISPLAY_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
-
ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 << OBJECT_ID_SHIFT),
-
-ENCODER_INTERNAL_UNIPHY2_ENUM_ID2 =( DISPLAY_OBJECT_TYPE_ENCODER <<
OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
-
ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 << OBJECT_ID_SHIFT)
-};
-
-
-/****************************************************
-* Connector Object definition - Shared with BIOS
-*****************************************************/
-
-
-enum connector_objet_def{
-CONNECTOR_LVDS_ENUM_ID1
=( DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
- CONNECTOR_OBJECT_ID_LVDS <<
OBJECT_ID_SHIFT),
-
-
-CONNECTOR_eDP_ENUM_ID1 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
- CONNECTOR_OBJECT_ID_eDP <<
OBJECT_ID_SHIFT),
-
-CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID1 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
-
CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT),
-
-CONNECTOR_SINGLE_LINK_DVI_D_ENUM_ID2 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
-
CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D << OBJECT_ID_SHIFT),
-
-
-CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID1 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
-
CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT),
-
-CONNECTOR_DUAL_LINK_DVI_D_ENUM_ID2 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
-
CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D << OBJECT_ID_SHIFT),
-
-CONNECTOR_HDMI_TYPE_A_ENUM_ID1 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
-
CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT),
-
-CONNECTOR_HDMI_TYPE_A_ENUM_ID2 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
-
CONNECTOR_OBJECT_ID_HDMI_TYPE_A << OBJECT_ID_SHIFT),
-
-CONNECTOR_DISPLAYPORT_ENUM_ID1 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
-
CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT),
-
-CONNECTOR_DISPLAYPORT_ENUM_ID2 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
-
CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT),
-
-CONNECTOR_DISPLAYPORT_ENUM_ID3 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID3 <<
ENUM_ID_SHIFT |\
-
CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT),
-
-CONNECTOR_DISPLAYPORT_ENUM_ID4 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID4 <<
ENUM_ID_SHIFT |\
-
CONNECTOR_OBJECT_ID_DISPLAYPORT << OBJECT_ID_SHIFT),
-
-CONNECTOR_OPM_ENUM_ID1 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID1 <<
ENUM_ID_SHIFT |\
- CONNECTOR_OBJECT_ID_OPM <<
OBJECT_ID_SHIFT), //Mapping to MXM_DP_A
-
-CONNECTOR_OPM_ENUM_ID2 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID2 <<
ENUM_ID_SHIFT |\
- CONNECTOR_OBJECT_ID_OPM <<
OBJECT_ID_SHIFT), //Mapping to MXM_DP_B
-
-CONNECTOR_OPM_ENUM_ID3 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID3 <<
ENUM_ID_SHIFT |\
- CONNECTOR_OBJECT_ID_OPM <<
OBJECT_ID_SHIFT), //Mapping to MXM_DP_C
-
-CONNECTOR_OPM_ENUM_ID4 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID4 <<
ENUM_ID_SHIFT |\
- CONNECTOR_OBJECT_ID_OPM <<
OBJECT_ID_SHIFT), //Mapping to MXM_DP_D
-
-CONNECTOR_OPM_ENUM_ID5 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID5 <<
ENUM_ID_SHIFT |\
- CONNECTOR_OBJECT_ID_OPM <<
OBJECT_ID_SHIFT), //Mapping to MXM_LVDS_TXxx
-
-
-CONNECTOR_OPM_ENUM_ID6 =(
DISPLAY_OBJECT_TYPE_CONNECTOR << OBJECT_TYPE_SHIFT |\
- OBJECT_ENUM_ID6 <<
ENUM_ID_SHIFT |\
- CONNECTOR_OBJECT_ID_OPM <<
OBJECT_ID_SHIFT) //Mapping to MXM_LVDS_TXxx
-};
-
-/****************************************************
-* Router Object ID definition - Shared with BIOS
-*****************************************************/
-//No Need, in future we ever need, we can define a record in
atomfirwareSoC15.h associated with an object that has this router
-
-
-/****************************************************
-* PROTECTION Object ID definition - Shared with BIOS
-*****************************************************/
-//No need,in future we ever need, all display path are capable of protection
now.
-
-/****************************************************
-* Generic Object ID definition - Shared with BIOS
-*****************************************************/
-//No need, in future we ever need like GLsync, we can define a record in
atomfirwareSoC15.h associated with an object.
-
-
-#if defined(_X86_)
-#pragma pack()
-#endif
-
-#endif
-
-
-
--
2.13.6
