system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

drm/radeon/kms: rework DP bridge checks

Browse source 
Return the encoder id rather than a boolean.  This is needed
for differentiate between multiple DP bridge chips.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Alex Deucher 2011-10-31 08:58:47 -04:00 committed by Dave Airlie
parent 54bd5206bf
commit 1d33e1fc8d
6 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/gpu/drm/radeon/atombios_crtc.c
View file

@ -558,7 +558,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
bpc = connector->display_info.bpc; bpc = connector->display_info.bpc;
encoder_mode = atombios_get_encoder_mode(encoder); encoder_mode = atombios_get_encoder_mode(encoder);
if ((radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) || if ((radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT | ATOM_DEVICE_DFP_SUPPORT)) ||
radeon_encoder_is_dp_bridge(encoder)) { (radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE)) {
if (connector) { if (connector) {
struct radeon_connector *radeon_connector = to_radeon_connector(connector); struct radeon_connector *radeon_connector = to_radeon_connector(connector);
struct radeon_connector_atom_dig *dig_connector = struct radeon_connector_atom_dig *dig_connector =
@ -656,11 +656,11 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,
args.v3.sInput.ucDispPllConfig |= args.v3.sInput.ucDispPllConfig |=
DISPPLL_CONFIG_DUAL_LINK; DISPPLL_CONFIG_DUAL_LINK;
} }
if (radeon_encoder_is_dp_bridge(encoder)) { if (radeon_encoder_get_dp_bridge_encoder_id(encoder) !=
struct drm_encoder *ext_encoder = radeon_atom_get_external_encoder(encoder); ENCODER_OBJECT_ID_NONE)
struct radeon_encoder *ext_radeon_encoder = to_radeon_encoder(ext_encoder); args.v3.sInput.ucExtTransmitterID =
args.v3.sInput.ucExtTransmitterID = ext_radeon_encoder->encoder_id; radeon_encoder_get_dp_bridge_encoder_id(encoder);
} else else
args.v3.sInput.ucExtTransmitterID = 0; args.v3.sInput.ucExtTransmitterID = 0;
atom_execute_table(rdev->mode_info.atom_context, atom_execute_table(rdev->mode_info.atom_context,

6
drivers/gpu/drm/radeon/atombios_dp.c
View file

@ -482,7 +482,8 @@ static int radeon_dp_get_dp_link_clock(struct drm_connector *connector,
int bpp = convert_bpc_to_bpp(connector->display_info.bpc); int bpp = convert_bpc_to_bpp(connector->display_info.bpc);
int lane_num, max_pix_clock; int lane_num, max_pix_clock;
if (radeon_connector_encoder_is_dp_bridge(connector)) if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) !=
ENCODER_OBJECT_ID_NONE)
return 270000; return 270000;
lane_num = radeon_dp_get_dp_lane_number(connector, dpcd, pix_clock); lane_num = radeon_dp_get_dp_lane_number(connector, dpcd, pix_clock);
@ -559,7 +560,8 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,
if (!ASIC_IS_DCE4(rdev)) if (!ASIC_IS_DCE4(rdev))
return; return;
if (radeon_connector_encoder_is_dp_bridge(connector)) if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) !=
ENCODER_OBJECT_ID_NONE)
panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE; panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE;
else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP); u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP);

16
drivers/gpu/drm/radeon/radeon_connectors.c
View file

@ -44,8 +44,6 @@ extern void
radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder,
struct drm_connector *drm_connector); struct drm_connector *drm_connector);
bool radeon_connector_encoder_is_dp_bridge(struct drm_connector *connector);
void radeon_connector_hotplug(struct drm_connector *connector) void radeon_connector_hotplug(struct drm_connector *connector)
{ {
struct drm_device *dev = connector->dev; struct drm_device *dev = connector->dev;
@ -1204,7 +1202,8 @@ static int radeon_dp_get_modes(struct drm_connector *connector)
} }
} else { } else {
/* need to setup ddc on the bridge */ /* need to setup ddc on the bridge */
if (radeon_connector_encoder_is_dp_bridge(connector)) { if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) !=
ENCODER_OBJECT_ID_NONE) {
if (encoder) if (encoder)
radeon_atom_ext_encoder_setup_ddc(encoder); radeon_atom_ext_encoder_setup_ddc(encoder);
} }
@ -1214,13 +1213,12 @@ static int radeon_dp_get_modes(struct drm_connector *connector)
return ret; return ret;
} }
bool radeon_connector_encoder_is_dp_bridge(struct drm_connector *connector) u16 radeon_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *connector)
{ {
struct drm_mode_object *obj; struct drm_mode_object *obj;
struct drm_encoder *encoder; struct drm_encoder *encoder;
struct radeon_encoder *radeon_encoder; struct radeon_encoder *radeon_encoder;
int i; int i;
bool found = false;
for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
if (connector->encoder_ids[i] == 0) if (connector->encoder_ids[i] == 0)
@ -1236,14 +1234,13 @@ bool radeon_connector_encoder_is_dp_bridge(struct drm_connector *connector)
switch (radeon_encoder->encoder_id) { switch (radeon_encoder->encoder_id) {
case ENCODER_OBJECT_ID_TRAVIS: case ENCODER_OBJECT_ID_TRAVIS:
case ENCODER_OBJECT_ID_NUTMEG: case ENCODER_OBJECT_ID_NUTMEG:
found = true; return radeon_encoder->encoder_id;
break;
default: default:
break; break;
} }
} }
return found; return ENCODER_OBJECT_ID_NONE;
} }
bool radeon_connector_encoder_is_hbr2(struct drm_connector *connector) bool radeon_connector_encoder_is_hbr2(struct drm_connector *connector)
@ -1320,7 +1317,8 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
if (!radeon_dig_connector->edp_on) if (!radeon_dig_connector->edp_on)
atombios_set_edp_panel_power(connector, atombios_set_edp_panel_power(connector,
ATOM_TRANSMITTER_ACTION_POWER_OFF); ATOM_TRANSMITTER_ACTION_POWER_OFF);
} else if (radeon_connector_encoder_is_dp_bridge(connector)) { } else if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) !=
ENCODER_OBJECT_ID_NONE) {
/* DP bridges are always DP */ /* DP bridges are always DP */
radeon_dig_connector->dp_sink_type = CONNECTOR_OBJECT_ID_DISPLAYPORT; radeon_dig_connector->dp_sink_type = CONNECTOR_OBJECT_ID_DISPLAYPORT;
/* get the DPCD from the bridge */ /* get the DPCD from the bridge */

3
drivers/gpu/drm/radeon/radeon_display.c
View file

@ -708,7 +708,8 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) || if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
(radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP) || (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP) ||
radeon_connector_encoder_is_dp_bridge(&radeon_connector->base)) { (radeon_connector_encoder_get_dp_bridge_encoder_id(&radeon_connector->base) !=
ENCODER_OBJECT_ID_NONE)) {
struct radeon_connector_atom_dig *dig = radeon_connector->con_priv; struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
if ((dig->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT || if ((dig->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT ||

11
drivers/gpu/drm/radeon/radeon_encoders.c
View file

@ -266,7 +266,7 @@ struct drm_encoder *radeon_atom_get_external_encoder(struct drm_encoder *encoder
return NULL; return NULL;
} }
bool radeon_encoder_is_dp_bridge(struct drm_encoder *encoder) u16 radeon_encoder_get_dp_bridge_encoder_id(struct drm_encoder *encoder)
{ {
struct drm_encoder *other_encoder = radeon_atom_get_external_encoder(encoder); struct drm_encoder *other_encoder = radeon_atom_get_external_encoder(encoder);
@ -368,7 +368,7 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder,
if (ASIC_IS_DCE3(rdev) && if (ASIC_IS_DCE3(rdev) &&
((radeon_encoder->active_device & (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) || ((radeon_encoder->active_device & (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) ||
radeon_encoder_is_dp_bridge(encoder))) { (radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE))) {
struct drm_connector *connector = radeon_get_connector_for_encoder(encoder); struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
radeon_dp_set_link_config(connector, mode); radeon_dp_set_link_config(connector, mode);
} }
@ -658,7 +658,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
struct radeon_connector_atom_dig *dig_connector; struct radeon_connector_atom_dig *dig_connector;
/* dp bridges are always DP */ /* dp bridges are always DP */
if (radeon_encoder_is_dp_bridge(encoder)) if (radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE)
return ATOM_ENCODER_MODE_DP; return ATOM_ENCODER_MODE_DP;
/* DVO is always DVO */ /* DVO is always DVO */
@ -1638,7 +1638,7 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder)
break; break;
case 2: case 2:
args.v2.ucCRTC = radeon_crtc->crtc_id; args.v2.ucCRTC = radeon_crtc->crtc_id;
if (radeon_encoder_is_dp_bridge(encoder)) { if (radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE) {
struct drm_connector *connector = radeon_get_connector_for_encoder(encoder); struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS) if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
@ -2099,7 +2099,8 @@ static void radeon_atom_encoder_prepare(struct drm_encoder *encoder)
if ((radeon_encoder->active_device & if ((radeon_encoder->active_device &
(ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) || (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) ||
radeon_encoder_is_dp_bridge(encoder)) { (radeon_encoder_get_dp_bridge_encoder_id(encoder) !=
ENCODER_OBJECT_ID_NONE)) {
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
if (dig) if (dig)
dig->dig_encoder = radeon_atom_pick_dig_encoder(encoder); dig->dig_encoder = radeon_atom_pick_dig_encoder(encoder);

4
drivers/gpu/drm/radeon/radeon_mode.h
View file

@ -468,8 +468,8 @@ radeon_atombios_get_tv_info(struct radeon_device *rdev);
extern struct drm_connector * extern struct drm_connector *
radeon_get_connector_for_encoder(struct drm_encoder *encoder); radeon_get_connector_for_encoder(struct drm_encoder *encoder);
extern bool radeon_encoder_is_dp_bridge(struct drm_encoder *encoder); extern u16 radeon_encoder_get_dp_bridge_encoder_id(struct drm_encoder *encoder);
extern bool radeon_connector_encoder_is_dp_bridge(struct drm_connector *connector); extern u16 radeon_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *connector);
extern bool radeon_connector_encoder_is_hbr2(struct drm_connector *connector); extern bool radeon_connector_encoder_is_hbr2(struct drm_connector *connector);
extern bool radeon_connector_is_dp12_capable(struct drm_connector *connector); extern bool radeon_connector_is_dp12_capable(struct drm_connector *connector);