Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux into drm-next 

- Add a PX quirk for radeon
- Fix flickering and stability issues with DC on some platforms
- Fix HDMI audio regression
- Few other misc DC and base driver fixes

* 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux:
  Revert "drm/amd/display: disable CRTCs with NULL FB on their primary plane (V2)"
  Revert "drm/amd/display: fix dereferencing possible ERR_PTR()"
  drm/amd/display: Fix regamma not affecting full-intensity color values
  drm/amd/display: Fix FBC text console corruption
  drm/amd/display: Only register backlight device if embedded panel connected
  drm/amd/display: fix brightness level after resume from suspend
  drm/amd/display: HDMI has no sound after Panel power off/on
  drm/amdgpu: add MP1 and THM hw ip base reg offset
  drm/amdgpu: fix null pointer panic with direct fw loading on gpu reset
  drm/radeon: add PX quirk for Asus K73TK
parents dece02f7 1cb19e82

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −0
Original line number Diff line number Diff line
@@ -1379,6 +1379,7 @@ enum amd_hw_ip_block_type { 
	ATHUB_HWIP,

	NBIO_HWIP,

	MP0_HWIP,

	MP1_HWIP,

	UVD_HWIP,

	VCN_HWIP = UVD_HWIP,

	VCE_HWIP,
@@ -1388,6 +1389,7 @@ enum amd_hw_ip_block_type { 
	SMUIO_HWIP,

	PWR_HWIP,

	NBIF_HWIP,

	THM_HWIP,

	MAX_HWIP

};

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

+3 −0
Original line number Diff line number Diff line
@@ -505,6 +505,9 @@ static int psp_resume(void *handle) 


int psp_gpu_reset(struct amdgpu_device *adev)

{

	if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)

		return 0;



	return psp_mode1_reset(&adev->psp);

}

drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ int vega10_reg_base_init(struct amdgpu_device *adev) 
		adev->reg_offset[ATHUB_HWIP][i] = (uint32_t *)(&(ATHUB_BASE.instance[i]));

		adev->reg_offset[NBIO_HWIP][i] = (uint32_t *)(&(NBIO_BASE.instance[i]));

		adev->reg_offset[MP0_HWIP][i] = (uint32_t *)(&(MP0_BASE.instance[i]));

		adev->reg_offset[MP1_HWIP][i] = (uint32_t *)(&(MP1_BASE.instance[i]));

		adev->reg_offset[UVD_HWIP][i] = (uint32_t *)(&(UVD_BASE.instance[i]));

		adev->reg_offset[VCE_HWIP][i] = (uint32_t *)(&(VCE_BASE.instance[i]));

		adev->reg_offset[VCN_HWIP][i] = (uint32_t *)(&(VCN_BASE.instance[i]));
@@ -49,7 +50,7 @@ int vega10_reg_base_init(struct amdgpu_device *adev) 
		adev->reg_offset[SMUIO_HWIP][i] = (uint32_t *)(&(SMUIO_BASE.instance[i]));

		adev->reg_offset[PWR_HWIP][i] = (uint32_t *)(&(PWR_BASE.instance[i]));

		adev->reg_offset[NBIF_HWIP][i] = (uint32_t *)(&(NBIF_BASE.instance[i]));



		adev->reg_offset[THM_HWIP][i] = (uint32_t *)(&(THM_BASE.instance[i]));

	}

	return 0;

}

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+33 −56
Original line number Diff line number Diff line
@@ -1403,6 +1403,28 @@ static int initialize_plane(struct amdgpu_display_manager *dm, 
	return ret;

}





static void register_backlight_device(struct amdgpu_display_manager *dm,

				      struct dc_link *link)

{

#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) ||\

	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)



	if ((link->connector_signal & (SIGNAL_TYPE_EDP | SIGNAL_TYPE_LVDS)) &&

	    link->type != dc_connection_none) {

		/* Event if registration failed, we should continue with

		 * DM initialization because not having a backlight control

		 * is better then a black screen.

		 */

		amdgpu_dm_register_backlight_device(dm);



		if (dm->backlight_dev)

			dm->backlight_link = link;

	}

#endif

}





/* In this architecture, the association

 * connector -> encoder -> crtc

 * id not really requried. The crtc and connector will hold the
@@ -1456,6 +1478,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 


	/* loops over all connectors on the board */

	for (i = 0; i < link_cnt; i++) {

		struct dc_link *link = NULL;



		if (i > AMDGPU_DM_MAX_DISPLAY_INDEX) {

			DRM_ERROR(
@@ -1482,9 +1505,14 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
			goto fail;

		}



		if (dc_link_detect(dc_get_link_at_index(dm->dc, i),

				DETECT_REASON_BOOT))

		link = dc_get_link_at_index(dm->dc, i);



		if (dc_link_detect(link, DETECT_REASON_BOOT)) {

			amdgpu_dm_update_connector_after_detect(aconnector);

			register_backlight_device(dm, link);

		}





	}



	/* Software is initialized. Now we can register interrupt handlers. */
@@ -2685,7 +2713,8 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector) 
#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) ||\

	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)



	if (link->connector_signal & (SIGNAL_TYPE_EDP | SIGNAL_TYPE_LVDS)) {

	if ((link->connector_signal & (SIGNAL_TYPE_EDP | SIGNAL_TYPE_LVDS)) &&

	    link->type != dc_connection_none) {

		amdgpu_dm_register_backlight_device(dm);



		if (dm->backlight_dev) {
@@ -3561,6 +3590,7 @@ create_i2c(struct ddc_service *ddc_service, 
	return i2c;

}





/* Note: this function assumes that dc_link_detect() was called for the

 * dc_link which will be represented by this aconnector.

 */
@@ -3630,28 +3660,6 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm, 
		|| connector_type == DRM_MODE_CONNECTOR_eDP)

		amdgpu_dm_initialize_dp_connector(dm, aconnector);



#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) ||\

	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)



	/* NOTE: this currently will create backlight device even if a panel

	 * is not connected to the eDP/LVDS connector.

	 *

	 * This is less than ideal but we don't have sink information at this

	 * stage since detection happens after. We can't do detection earlier

	 * since MST detection needs connectors to be created first.

	 */

	if (link->connector_signal & (SIGNAL_TYPE_EDP | SIGNAL_TYPE_LVDS)) {

		/* Event if registration failed, we should continue with

		 * DM initialization because not having a backlight control

		 * is better then a black screen.

		 */

		amdgpu_dm_register_backlight_device(dm);



		if (dm->backlight_dev)

			dm->backlight_link = link;

	}

#endif



out_free:

	if (res) {

		kfree(i2c);
@@ -4840,33 +4848,6 @@ static int dm_update_planes_state(struct dc *dc, 
	return ret;

}



static int dm_atomic_check_plane_state_fb(struct drm_atomic_state *state,

					  struct drm_crtc *crtc)

{

	struct drm_plane *plane;

	struct drm_crtc_state *crtc_state;



	WARN_ON(!drm_atomic_get_new_crtc_state(state, crtc));



	drm_for_each_plane_mask(plane, state->dev, crtc->state->plane_mask) {

		struct drm_plane_state *plane_state =

			drm_atomic_get_plane_state(state, plane);



		if (IS_ERR(plane_state))

			return -EDEADLK;



		crtc_state = drm_atomic_get_crtc_state(plane_state->state, crtc);

		if (IS_ERR(crtc_state))

			return PTR_ERR(crtc_state);



		if (crtc->primary == plane && crtc_state->active) {

			if (!plane_state->fb)

				return -EINVAL;

		}

	}

	return 0;

}



static int amdgpu_dm_atomic_check(struct drm_device *dev,

				  struct drm_atomic_state *state)

{
@@ -4890,10 +4871,6 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, 
		goto fail;



	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {

		ret = dm_atomic_check_plane_state_fb(state, crtc);

		if (ret)

			goto fail;



		if (!drm_atomic_crtc_needs_modeset(new_crtc_state) &&

		    !new_crtc_state->color_mgmt_changed)

			continue;

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+13 −0
Original line number Diff line number Diff line
@@ -1997,6 +1997,19 @@ bool dc_link_set_backlight_level(const struct dc_link *link, uint32_t level, 
	return true;

}



bool dc_link_set_abm_disable(const struct dc_link *link)

{

	struct dc  *core_dc = link->ctx->dc;

	struct abm *abm = core_dc->res_pool->abm;



	if ((abm == NULL) || (abm->funcs->set_backlight_level == NULL))

		return false;



	abm->funcs->set_abm_immediate_disable(abm);



	return true;

}



bool dc_link_set_psr_enable(const struct dc_link *link, bool enable, bool wait)

{

	struct dc  *core_dc = link->ctx->dc;