Commit e55a3798 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

misc fixes, output fixes for 4k monitor, dpm lockup fixes

* 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: page table BOs are kernel allocations
  drm/radeon/cik: fix typo in EOP packet
  drm/radeon: Track the status of a page flip more explicitly
  drm/radeon/dpm: fix vddci setup typo on cayman
  drm/radeon/dpm: fix typo in vddci setup for eg/btc
  drm/radeon: use RADEON_MAX_CRTCS, RADEON_MAX_AFMT_BLOCKS (v2)
  drm/radeon: Use only one line for whole DPCD debug output
  drm/radeon: add a module parameter to control deep color support
  drm/radeon: enable bapm by default on desktop TN/RL boards
  drm/radeon: enable bapm by default on KV/KB
  drm/radeon: only apply bapm changes for AC power on ARUBA
  drm/radeon: adjust default dispclk on DCE6 (v2)
parents 18602687 7dae77f8

drivers/gpu/drm/radeon/atombios_dp.c

+7 −5
Original line number Diff line number Diff line
@@ -403,16 +403,18 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector) 
{

	struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv;

	u8 msg[DP_DPCD_SIZE];

	int ret, i;

	int ret;



	char dpcd_hex_dump[DP_DPCD_SIZE * 3];



	ret = drm_dp_dpcd_read(&radeon_connector->ddc_bus->aux, DP_DPCD_REV, msg,

			       DP_DPCD_SIZE);

	if (ret > 0) {

		memcpy(dig_connector->dpcd, msg, DP_DPCD_SIZE);

		DRM_DEBUG_KMS("DPCD: ");

		for (i = 0; i < DP_DPCD_SIZE; i++)

			DRM_DEBUG_KMS("%02x ", msg[i]);

		DRM_DEBUG_KMS("\n");



		hex_dump_to_buffer(dig_connector->dpcd, sizeof(dig_connector->dpcd),

				   32, 1, dpcd_hex_dump, sizeof(dpcd_hex_dump), false);

		DRM_DEBUG_KMS("DPCD: %s\n", dpcd_hex_dump);



		radeon_dp_probe_oui(radeon_connector);

drivers/gpu/drm/radeon/cikd.h

+1 −1
Original line number Diff line number Diff line
@@ -1752,12 +1752,12 @@ 
#define		EOP_TC_WB_ACTION_EN                     (1 << 15) /* L2 */

#define		EOP_TCL1_ACTION_EN                      (1 << 16)

#define		EOP_TC_ACTION_EN                        (1 << 17) /* L2 */

#define		EOP_TCL2_VOLATILE                       (1 << 24)

#define		EOP_CACHE_POLICY(x)                     ((x) << 25)

                /* 0 - LRU

		 * 1 - Stream

		 * 2 - Bypass

		 */

#define		EOP_TCL2_VOLATILE                       (1 << 27)

#define		DATA_SEL(x)                             ((x) << 29)

                /* 0 - discard

		 * 1 - send low 32bit data

drivers/gpu/drm/radeon/cypress_dpm.c

+1 −1
Original line number Diff line number Diff line
@@ -1551,7 +1551,7 @@ int cypress_populate_smc_voltage_tables(struct radeon_device *rdev, 


		table->voltageMaskTable.highMask[RV770_SMC_VOLTAGEMASK_VDDCI] = 0;

		table->voltageMaskTable.lowMask[RV770_SMC_VOLTAGEMASK_VDDCI] =

			cpu_to_be32(eg_pi->vddc_voltage_table.mask_low);

			cpu_to_be32(eg_pi->vddci_voltage_table.mask_low);

	}



	return 0;

drivers/gpu/drm/radeon/kv_dpm.c

+1 −1
Original line number Diff line number Diff line
@@ -2726,7 +2726,7 @@ int kv_dpm_init(struct radeon_device *rdev) 
	pi->caps_sclk_ds = true;

	pi->enable_auto_thermal_throttling = true;

	pi->disable_nb_ps3_in_battery = false;

	pi->bapm_enable = false;

	pi->bapm_enable = true;

	pi->voltage_drop_t = 0;

	pi->caps_sclk_throttle_low_notification = false;

	pi->caps_fps = false; /* true? */

drivers/gpu/drm/radeon/ni_dpm.c

+1 −1
Original line number Diff line number Diff line
@@ -1315,7 +1315,7 @@ static void ni_populate_smc_voltage_tables(struct radeon_device *rdev, 


		table->voltageMaskTable.highMask[NISLANDS_SMC_VOLTAGEMASK_VDDCI] = 0;

		table->voltageMaskTable.lowMask[NISLANDS_SMC_VOLTAGEMASK_VDDCI] =

			cpu_to_be32(eg_pi->vddc_voltage_table.mask_low);

			cpu_to_be32(eg_pi->vddci_voltage_table.mask_low);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE