aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Jiang <Andrew.Jiang@amd.com>2017-10-20 16:40:45 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-11-02 12:56:54 -0400
commitcc57306f426e3953118f1fcf8a7254dbad46c5f6 (patch)
tree8ad59f04e2b3a1ea3ad53e31eb0f80dfe6256370
parent7bef1af3b9c2a5690a41298b5986dbde82fbedbc (diff)
drm/amd/display: Use constants from atom.h for HDMI caps read
Get rid of the constant we copied over before and just directly use the constants from the file. Signed-off-by: Andrew Jiang <Andrew.Jiang@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Acked-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index c47da645d3b8..e70612eaf257 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -24,6 +24,7 @@
24 */ 24 */
25 25
26#include "dm_services.h" 26#include "dm_services.h"
27#include "atom.h"
27#include "dm_helpers.h" 28#include "dm_helpers.h"
28#include "dc.h" 29#include "dc.h"
29#include "grph_object_id.h" 30#include "grph_object_id.h"
@@ -45,7 +46,6 @@
45#include "dce/dce_11_0_enum.h" 46#include "dce/dce_11_0_enum.h"
46#include "dce/dce_11_0_sh_mask.h" 47#include "dce/dce_11_0_sh_mask.h"
47 48
48#define EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK 0x007C /* Copied from atombios.h */
49#define LINK_INFO(...) \ 49#define LINK_INFO(...) \
50 dm_logger_write(dc_ctx->logger, LOG_HW_HOTPLUG, \ 50 dm_logger_write(dc_ctx->logger, LOG_HW_HOTPLUG, \
51 __VA_ARGS__) 51 __VA_ARGS__)
@@ -1696,7 +1696,7 @@ static void enable_link_hdmi(struct pipe_ctx *pipe_ctx)
1696 if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) { 1696 if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) {
1697 unsigned short masked_chip_caps = pipe_ctx->stream->sink->link->chip_caps & 1697 unsigned short masked_chip_caps = pipe_ctx->stream->sink->link->chip_caps &
1698 EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK; 1698 EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK;
1699 if (masked_chip_caps == (0x2 << 2)) { 1699 if (masked_chip_caps == EXT_DISPLAY_PATH_CAPS__HDMI20_TISN65DP159RSBT) {
1700 /* DP159, Retimer settings */ 1700 /* DP159, Retimer settings */
1701 eng_id = pipe_ctx->stream_res.stream_enc->id; 1701 eng_id = pipe_ctx->stream_res.stream_enc->id;
1702 1702
@@ -1707,7 +1707,7 @@ static void enable_link_hdmi(struct pipe_ctx *pipe_ctx)
1707 write_i2c_default_retimer_setting(pipe_ctx, 1707 write_i2c_default_retimer_setting(pipe_ctx,
1708 is_vga_mode, is_over_340mhz); 1708 is_vga_mode, is_over_340mhz);
1709 } 1709 }
1710 } else if (masked_chip_caps == (0x1 << 2)) { 1710 } else if (masked_chip_caps == EXT_DISPLAY_PATH_CAPS__HDMI20_PI3EQX1204) {
1711 /* PI3EQX1204, Redriver settings */ 1711 /* PI3EQX1204, Redriver settings */
1712 write_i2c_redriver_setting(pipe_ctx, is_over_340mhz); 1712 write_i2c_redriver_setting(pipe_ctx, is_over_340mhz);
1713 } 1713 }