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

Commit 87320caf authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amdgpu: Add virtual connector and encoder macros." 



This reverts commit 16925c92.

This is no longer necessary.

Reviewed-By: default avatarEmily Deng <Emily.Deng@amd.com>
parent 66264ba8

drivers/gpu/drm/amd/amdgpu/ObjectID.h

+0 −7
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 
#define ENCODER_OBJECT_ID_INTERNAL_VCE            0x24

#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY3        0x25

#define ENCODER_OBJECT_ID_INTERNAL_AMCLK          0x27

#define ENCODER_OBJECT_ID_VIRTUAL                 0x28



#define ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO    0xFF
@@ -120,7 +119,6 @@ 
#define CONNECTOR_OBJECT_ID_eDP                   0x14

#define CONNECTOR_OBJECT_ID_MXM                   0x15

#define CONNECTOR_OBJECT_ID_LVDS_eDP              0x16

#define CONNECTOR_OBJECT_ID_VIRTUAL               0x17



/* deleted */
@@ -149,7 +147,6 @@ 
#define GRAPH_OBJECT_ENUM_ID5                     0x05

#define GRAPH_OBJECT_ENUM_ID6                     0x06

#define GRAPH_OBJECT_ENUM_ID7                     0x07

#define GRAPH_OBJECT_ENUM_VIRTUAL                 0x08



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

/* Graphics Object ID Bit definition                */
@@ -411,10 +408,6 @@ 
                                                  GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                  ENCODER_OBJECT_ID_HDMI_ANX9805 << OBJECT_ID_SHIFT)



#define ENCODER_VIRTUAL_ENUM_VIRTUAL            ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\

                                                  GRAPH_OBJECT_ENUM_VIRTUAL << ENUM_ID_SHIFT |\

                                                  ENCODER_OBJECT_ID_VIRTUAL << OBJECT_ID_SHIFT)



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

/* Connector Object ID definition - Shared with BIOS */

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