diff options
| author |   jsg <jsg@openbsd.org> | 2020-02-27 05:21:44 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-02-27 05:21:44 +0000 |
| commit | 328ac52044fb341b5b2f81cb57f9e0f91e20005e (patch) | |
| tree | 7e9b6e1f932bcef6320578d2aa97db9214184099 | |
| parent | drm/amd/display: Retrain dongles when SINK_COUNT becomes non-zero (diff) | |
| download | wireguard-openbsd-328ac52044fb341b5b2f81cb57f9e0f91e20005e.tar.xz wireguard-openbsd-328ac52044fb341b5b2f81cb57f9e0f91e20005e.zip | |
drm/amdgpu: remove 4 set but not used variable in amdgpu_atombios_get_connector_info_from_object_table
From yu kuai
b367528f6d23b696048adc3593bc267d431663bf in linux 4.19.y/4.19.106
bae028e3e521e8cb8caf2cc16a455ce4c55f2332 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/amd/amdgpu/amdgpu_atombios.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_atombios.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_atombios.c index 9a60b8441ea..39539465054 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_atombios.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_atombios.c @@ -337,17 +337,9 @@ bool amdgpu_atombios_get_connector_info_from_object_table(struct amdgpu_device * path_size += le16_to_cpu(path->usSize); if (device_support & le16_to_cpu(path->usDeviceTag)) { - uint8_t con_obj_id, con_obj_num, con_obj_type; - - con_obj_id = + uint8_t con_obj_id = (le16_to_cpu(path->usConnObjectId) & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT; - con_obj_num = - (le16_to_cpu(path->usConnObjectId) & ENUM_ID_MASK) - >> ENUM_ID_SHIFT; - con_obj_type = - (le16_to_cpu(path->usConnObjectId) & - OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT; /* Skip TV/CV support */ if ((le16_to_cpu(path->usDeviceTag) == @@ -372,14 +364,7 @@ bool amdgpu_atombios_get_connector_info_from_object_table(struct amdgpu_device * router.ddc_valid = false; router.cd_valid = false; for (j = 0; j < ((le16_to_cpu(path->usSize) - 8) / 2); j++) { - uint8_t grph_obj_id, grph_obj_num, grph_obj_type; - - grph_obj_id = - (le16_to_cpu(path->usGraphicObjIds[j]) & - OBJECT_ID_MASK) >> OBJECT_ID_SHIFT; - grph_obj_num = - (le16_to_cpu(path->usGraphicObjIds[j]) & - ENUM_ID_MASK) >> ENUM_ID_SHIFT; + uint8_t grph_obj_type= grph_obj_type = (le16_to_cpu(path->usGraphicObjIds[j]) & OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT; |