Reviewed-By: Emily Deng <Emily.Deng at amd.com> > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf > Of Alex Deucher > Sent: Saturday, October 01, 2016 1:09 AM > To: amd-gfx at lists.freedesktop.org > Cc: Deucher, Alexander <Alexander.Deucher at amd.com> > Subject: [PATCH 5/7] Revert "drm/amdgpu: Add virtual connector and > encoder macros." > > This reverts commit 16925c92dbd97524655525b6816625e1f0063d12. > > This is no longer necessary. > --- > drivers/gpu/drm/amd/amdgpu/ObjectID.h | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/ObjectID.h > b/drivers/gpu/drm/amd/amdgpu/ObjectID.h > index b8d6667..0619269 100644 > --- a/drivers/gpu/drm/amd/amdgpu/ObjectID.h > +++ b/drivers/gpu/drm/amd/amdgpu/ObjectID.h > @@ -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 */ > /****************************************************/ > -- > 2.5.5 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
