diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-09-30 12:38:20 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-10-25 14:38:06 -0400 |
| commit | 87320cafbcbe177a08c9928395e760b48c8f917e (patch) | |
| tree | 677b2b62b5a5f0389b2188ef02911044373376ec /drivers/gpu/drm/amd/amdgpu/ObjectID.h | |
| parent | 66264ba80492571d9177158f2989e267a591507b (diff) | |
Revert "drm/amdgpu: Add virtual connector and encoder macros."
This reverts commit 16925c92dbd97524655525b6816625e1f0063d12.
This is no longer necessary.
Reviewed-By: Emily Deng <Emily.Deng@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/ObjectID.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/ObjectID.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/ObjectID.h b/drivers/gpu/drm/amd/amdgpu/ObjectID.h index b8d66670bb17..06192698bd96 100644 --- a/drivers/gpu/drm/amd/amdgpu/ObjectID.h +++ b/drivers/gpu/drm/amd/amdgpu/ObjectID.h | |||
| @@ -90,7 +90,6 @@ | |||
| 90 | #define ENCODER_OBJECT_ID_INTERNAL_VCE 0x24 | 90 | #define ENCODER_OBJECT_ID_INTERNAL_VCE 0x24 |
| 91 | #define ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 0x25 | 91 | #define ENCODER_OBJECT_ID_INTERNAL_UNIPHY3 0x25 |
| 92 | #define ENCODER_OBJECT_ID_INTERNAL_AMCLK 0x27 | 92 | #define ENCODER_OBJECT_ID_INTERNAL_AMCLK 0x27 |
| 93 | #define ENCODER_OBJECT_ID_VIRTUAL 0x28 | ||
| 94 | 93 | ||
| 95 | #define ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO 0xFF | 94 | #define ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO 0xFF |
| 96 | 95 | ||
| @@ -120,7 +119,6 @@ | |||
| 120 | #define CONNECTOR_OBJECT_ID_eDP 0x14 | 119 | #define CONNECTOR_OBJECT_ID_eDP 0x14 |
| 121 | #define CONNECTOR_OBJECT_ID_MXM 0x15 | 120 | #define CONNECTOR_OBJECT_ID_MXM 0x15 |
| 122 | #define CONNECTOR_OBJECT_ID_LVDS_eDP 0x16 | 121 | #define CONNECTOR_OBJECT_ID_LVDS_eDP 0x16 |
| 123 | #define CONNECTOR_OBJECT_ID_VIRTUAL 0x17 | ||
| 124 | 122 | ||
| 125 | /* deleted */ | 123 | /* deleted */ |
| 126 | 124 | ||
| @@ -149,7 +147,6 @@ | |||
| 149 | #define GRAPH_OBJECT_ENUM_ID5 0x05 | 147 | #define GRAPH_OBJECT_ENUM_ID5 0x05 |
| 150 | #define GRAPH_OBJECT_ENUM_ID6 0x06 | 148 | #define GRAPH_OBJECT_ENUM_ID6 0x06 |
| 151 | #define GRAPH_OBJECT_ENUM_ID7 0x07 | 149 | #define GRAPH_OBJECT_ENUM_ID7 0x07 |
| 152 | #define GRAPH_OBJECT_ENUM_VIRTUAL 0x08 | ||
| 153 | 150 | ||
| 154 | /****************************************************/ | 151 | /****************************************************/ |
| 155 | /* Graphics Object ID Bit definition */ | 152 | /* Graphics Object ID Bit definition */ |
| @@ -411,10 +408,6 @@ | |||
| 411 | GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ | 408 | GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ |
| 412 | ENCODER_OBJECT_ID_HDMI_ANX9805 << OBJECT_ID_SHIFT) | 409 | ENCODER_OBJECT_ID_HDMI_ANX9805 << OBJECT_ID_SHIFT) |
| 413 | 410 | ||
| 414 | #define ENCODER_VIRTUAL_ENUM_VIRTUAL ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ | ||
| 415 | GRAPH_OBJECT_ENUM_VIRTUAL << ENUM_ID_SHIFT |\ | ||
| 416 | ENCODER_OBJECT_ID_VIRTUAL << OBJECT_ID_SHIFT) | ||
| 417 | |||
| 418 | /****************************************************/ | 411 | /****************************************************/ |
| 419 | /* Connector Object ID definition - Shared with BIOS */ | 412 | /* Connector Object ID definition - Shared with BIOS */ |
| 420 | /****************************************************/ | 413 | /****************************************************/ |