diff options
| author | Andrey Grodzovsky <Andrey.Grodzovsky@amd.com> | 2017-03-28 16:57:52 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 17:22:17 -0400 |
| commit | 7c7f5b15be6528b33d825ead6acb739d7d061a2e (patch) | |
| tree | 93336895662530093c76410b81c728eec0377f8c /drivers/gpu/drm/amd/display/include | |
| parent | bb01672c79649de08fe335b55aea5315d781c443 (diff) | |
| download | linux-7c7f5b15be6528b33d825ead6acb739d7d061a2e.tar.bz2 | |
drm/amd/display: Refactor edid read.
Allow Linux to use DRM provided EDID read functioality
by moving DAL edid implementation to module hence
removing this code from DC by this cleaning up DC
code for upstream.
v2: Removing ddc_service. No more need for it.
Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/include')
| -rw-r--r-- | drivers/gpu/drm/amd/display/include/ddc_service_types.h | 28 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/include/i2caux_interface.h | 3 |
2 files changed, 3 insertions, 28 deletions
diff --git a/drivers/gpu/drm/amd/display/include/ddc_service_types.h b/drivers/gpu/drm/amd/display/include/ddc_service_types.h index effe03b8f418..0ff2a899b8f7 100644 --- a/drivers/gpu/drm/amd/display/include/ddc_service_types.h +++ b/drivers/gpu/drm/amd/display/include/ddc_service_types.h @@ -115,34 +115,6 @@ struct av_sync_data { uint8_t aud_del_ins3;/* DPCD 0002Dh */ }; -/** EDID retrieval related constants, also used by MstMgr **/ - -#define DDC_EDID_SEGMENT_SIZE 256 -#define DDC_EDID_BLOCK_SIZE 128 -#define DDC_EDID_BLOCKS_PER_SEGMENT \ - (DDC_EDID_SEGMENT_SIZE / DDC_EDID_BLOCK_SIZE) - -#define DDC_EDID_EXT_COUNT_OFFSET 0x7E - -#define DDC_EDID_ADDRESS_START 0x50 -#define DDC_EDID_ADDRESS_END 0x52 -#define DDC_EDID_SEGMENT_ADDRESS 0x30 - -/* signatures for Edid 1x */ -#define DDC_EDID1X_VENDORID_SIGNATURE_OFFSET 8 -#define DDC_EDID1X_VENDORID_SIGNATURE_LEN 4 -#define DDC_EDID1X_EXT_CNT_AND_CHECKSUM_OFFSET 126 -#define DDC_EDID1X_EXT_CNT_AND_CHECKSUM_LEN 2 -#define DDC_EDID1X_CHECKSUM_OFFSET 127 -/* signatures for Edid 20*/ -#define DDC_EDID_20_SIGNATURE_OFFSET 0 -#define DDC_EDID_20_SIGNATURE 0x20 - -#define DDC_EDID20_VENDORID_SIGNATURE_OFFSET 1 -#define DDC_EDID20_VENDORID_SIGNATURE_LEN 4 -#define DDC_EDID20_CHECKSUM_OFFSET 255 -#define DDC_EDID20_CHECKSUM_LEN 1 - /*DP to VGA converter*/ static const uint8_t DP_VGA_CONVERTER_ID_1[] = "mVGAa"; /*DP to Dual link DVI converter*/ diff --git a/drivers/gpu/drm/amd/display/include/i2caux_interface.h b/drivers/gpu/drm/amd/display/include/i2caux_interface.h index d2ec04d1c592..13a3c82d118f 100644 --- a/drivers/gpu/drm/amd/display/include/i2caux_interface.h +++ b/drivers/gpu/drm/amd/display/include/i2caux_interface.h @@ -26,6 +26,7 @@ #ifndef __DAL_I2CAUX_INTERFACE_H__ #define __DAL_I2CAUX_INTERFACE_H__ +#include "dc_types.h" #include "gpio_service_interface.h" @@ -54,6 +55,8 @@ struct aux_command { /* zero means "use default value" */ uint32_t max_defer_write_retry; + + enum i2c_mot_mode mot; }; union aux_config { |