Commit 83dbb15e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (40 commits)
  vmwgfx: Snoop DMA transfers with non-covering sizes
  vmwgfx: Move the prefered mode first in the list
  vmwgfx: Unreference surface on cursor error path
  vmwgfx: Free prefered mode on error path
  vmwgfx: Use pointer return error codes
  vmwgfx: Fix hw cursor position
  vmwgfx: Infrastructure for explicit placement
  vmwgfx: Make the preferred autofit mode have a 60Hz vrefresh
  vmwgfx: Remove screen object active list
  vmwgfx: Screen object cleanups
  drm/radeon/kms: consolidate GART code, fix segfault after GPU lockup V2
  drm/radeon/kms: don't poll forever if MC GDDR link training fails
  drm/radeon/kms: fix DP setup on TRAVIS bridges
  drm/radeon/kms: set HPD polarity in hpd_init()
  drm/radeon/kms: add MSI module parameter
  drm/radeon/kms: Add MSI quirk for Dell RS690
  drm/radeon/kms: Add MSI quirk for HP RS690
  drm/radeon/kms: split MSI check into a separate function
  vmwgfx: Reinstate the update_layout ioctl
  drm/radeon/kms: always do extended edid probe
  ...
parents 6e6bc679 2ac86371

drivers/gpu/drm/drm_crtc.c

+6 −2
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static struct drm_conn_prop_enum_list drm_connector_enum_list[] = 
	{ DRM_MODE_CONNECTOR_HDMIB, "HDMI-B", 0 },

	{ DRM_MODE_CONNECTOR_TV, "TV", 0 },

	{ DRM_MODE_CONNECTOR_eDP, "eDP", 0 },

	{ DRM_MODE_CONNECTOR_VIRTUAL, "Virtual", 0},

};



static struct drm_prop_enum_list drm_encoder_enum_list[] =
@@ -171,6 +172,7 @@ static struct drm_prop_enum_list drm_encoder_enum_list[] = 
	{ DRM_MODE_ENCODER_TMDS, "TMDS" },

	{ DRM_MODE_ENCODER_LVDS, "LVDS" },

	{ DRM_MODE_ENCODER_TVDAC, "TV" },

	{ DRM_MODE_ENCODER_VIRTUAL, "Virtual" },

};



char *drm_get_encoder_name(struct drm_encoder *encoder)
@@ -464,8 +466,10 @@ void drm_connector_init(struct drm_device *dev, 
	list_add_tail(&connector->head, &dev->mode_config.connector_list);

	dev->mode_config.num_connector++;



	if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL)

		drm_connector_attach_property(connector,

				      dev->mode_config.edid_property, 0);

					      dev->mode_config.edid_property,

					      0);



	drm_connector_attach_property(connector,

				      dev->mode_config.dpms_property, 0);

drivers/gpu/drm/radeon/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ 
	r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \

	r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \

	evergreen.o evergreen_cs.o evergreen_blit_shaders.o evergreen_blit_kms.o \

	radeon_trace_points.o ni.o cayman_blit_shaders.o

	radeon_trace_points.o ni.o cayman_blit_shaders.o atombios_encoders.o



radeon-$(CONFIG_COMPAT) += radeon_ioc32.o

radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o

drivers/gpu/drm/radeon/atombios_crtc.c

+21 −35
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, 
				bpc = connector->display_info.bpc;

			encoder_mode = atombios_get_encoder_mode(encoder);

			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) {

					struct radeon_connector *radeon_connector = to_radeon_connector(connector);

					struct radeon_connector_atom_dig *dig_connector =
@@ -638,20 +638,17 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, 
				if (ss_enabled && ss->percentage)

					args.v3.sInput.ucDispPllConfig |=

						DISPPLL_CONFIG_SS_ENABLE;

				if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT) ||

				    radeon_encoder_is_dp_bridge(encoder)) {

					struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;

					if (encoder_mode == ATOM_ENCODER_MODE_DP) {

				if (ENCODER_MODE_IS_DP(encoder_mode)) {

					args.v3.sInput.ucDispPllConfig |=

						DISPPLL_CONFIG_COHERENT_MODE;

					/* 16200 or 27000 */

					args.v3.sInput.usPixelClock = cpu_to_le16(dp_clock / 10);

					} else {

						if (encoder_mode == ATOM_ENCODER_MODE_HDMI) {

				} else if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) {

					struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;

					if (encoder_mode == ATOM_ENCODER_MODE_HDMI)

						/* deep color support */

						args.v3.sInput.usPixelClock =

							cpu_to_le16((mode->clock * bpc / 8) / 10);

						}

					if (dig->coherent_mode)

						args.v3.sInput.ucDispPllConfig |=

							DISPPLL_CONFIG_COHERENT_MODE;
@@ -659,23 +656,11 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, 
						args.v3.sInput.ucDispPllConfig |=

							DISPPLL_CONFIG_DUAL_LINK;

				}

				} else if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {

					if (encoder_mode == ATOM_ENCODER_MODE_DP) {

						args.v3.sInput.ucDispPllConfig |=

							DISPPLL_CONFIG_COHERENT_MODE;

						/* 16200 or 27000 */

						args.v3.sInput.usPixelClock = cpu_to_le16(dp_clock / 10);

					} else if (encoder_mode != ATOM_ENCODER_MODE_LVDS) {

						if (mode->clock > 165000)

							args.v3.sInput.ucDispPllConfig |=

								DISPPLL_CONFIG_DUAL_LINK;

					}

				}

				if (radeon_encoder_is_dp_bridge(encoder)) {

					struct drm_encoder *ext_encoder = radeon_atom_get_external_encoder(encoder);

					struct radeon_encoder *ext_radeon_encoder = to_radeon_encoder(ext_encoder);

					args.v3.sInput.ucExtTransmitterID = ext_radeon_encoder->encoder_id;

				} else

				if (radeon_encoder_get_dp_bridge_encoder_id(encoder) !=

				    ENCODER_OBJECT_ID_NONE)

					args.v3.sInput.ucExtTransmitterID =

						radeon_encoder_get_dp_bridge_encoder_id(encoder);

				else

					args.v3.sInput.ucExtTransmitterID = 0;



				atom_execute_table(rdev->mode_info.atom_context,
@@ -945,6 +930,7 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode 
		bpc = connector->display_info.bpc;



		switch (encoder_mode) {

		case ATOM_ENCODER_MODE_DP_MST:

		case ATOM_ENCODER_MODE_DP:

			/* DP/eDP */

			dp_clock = dig_connector->dp_clock / 10;
@@ -1450,7 +1436,7 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) 
				 * PPLL/DCPLL programming and only program the DP DTO for the

				 * crtc virtual pixel clock.

				 */

				if (atombios_get_encoder_mode(test_encoder) == ATOM_ENCODER_MODE_DP) {

				if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_encoder))) {

					if (ASIC_IS_DCE5(rdev) || rdev->clock.dp_extclk)

						return ATOM_PPLL_INVALID;

				}

drivers/gpu/drm/radeon/atombios_dp.c

+18 −2
Original line number Diff line number Diff line
@@ -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 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_NUTMEG)

		return 270000;



	lane_num = radeon_dp_get_dp_lane_number(connector, dpcd, pix_clock);
@@ -553,17 +554,32 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder, 
{

	struct drm_device *dev = encoder->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_connector *radeon_connector = to_radeon_connector(connector);

	int panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;



	if (!ASIC_IS_DCE4(rdev))

		return;



	if (radeon_connector_encoder_is_dp_bridge(connector))

	if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) ==

	    ENCODER_OBJECT_ID_NUTMEG)

		panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE;

	else if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) ==

		 ENCODER_OBJECT_ID_TRAVIS)

		panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;

	else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {

		u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP);

		if (tmp & 1)

			panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;

	}



	atombios_dig_encoder_setup(encoder,

				   ATOM_ENCODER_CMD_SETUP_PANEL_MODE,

				   panel_mode);



	if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&

	    (panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {

		radeon_write_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_SET, 1);

	}

}



void radeon_dp_set_link_config(struct drm_connector *connector,

drivers/gpu/drm/radeon/atombios_encoders.c

0 → 100644
+2369 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE