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

Merge tag 'amd-drm-next-5.14-2021-06-22-1' of... 

Merge tag 'amd-drm-next-5.14-2021-06-22-1' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-5.14-2021-06-22-1:

amdgpu:
- Userptr BO fixes
- RAS fixes
- Beige Goby fixes
- Add some missing freesync documentation
- Aldebaran fixes
- SR-IOV fixes
- Potential memory corruption fix in framebuffer handling
- Revert GFX9, 10 doorbell fixes, we just
  end up trading one bug for another
- Multi-plane cursor fixes with rotation
- LTTPR fixes
- Backlight fixes
- eDP fix
- Fold DRM_AMD_DC_DCN3_1 into DRM_AMD_DC_DCN
- Misc code cleanups

amdkfd:
- Topology fix
- Locking fix

radeon:
- Misc code cleanup

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210622210345.27297-1-alexander.deucher@amd.com
parents 334200bf 8fe44c08

Documentation/gpu/amdgpu-dc.rst

+6 −0
Original line number Diff line number Diff line
@@ -66,3 +66,9 @@ Display Core 
============



**WIP**



FreeSync Video

--------------



.. kernel-doc:: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

   :doc: FreeSync Video

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

+8 −0
Original line number Diff line number Diff line
@@ -373,6 +373,14 @@ int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int n 
	return -EINVAL;

}





int amdgpu_discovery_get_vcn_version(struct amdgpu_device *adev, int vcn_instance,

				     int *major, int *minor, int *revision)

{

	return amdgpu_discovery_get_ip_version(adev, VCN_HWID,

					       vcn_instance, major, minor, revision);

}



void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev)

{

	struct binary_header *bhdr;

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

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev); 
void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev);

int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, int number_instance,

                                    int *major, int *minor, int *revision);



int amdgpu_discovery_get_vcn_version(struct amdgpu_device *adev, int vcn_instance,

				     int *major, int *minor, int *revision);

int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev);



#endif /* __AMDGPU_DISCOVERY__ */

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

+7 −5
Original line number Diff line number Diff line
@@ -1046,11 +1046,12 @@ int amdgpu_display_gem_fb_init(struct drm_device *dev, 


	rfb->base.obj[0] = obj;

	drm_helper_mode_fill_fb_struct(dev, &rfb->base, mode_cmd);

	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);



	ret = amdgpu_display_framebuffer_init(dev, rfb, mode_cmd, obj);

	if (ret)

		goto err;



	ret = amdgpu_display_framebuffer_init(dev, rfb, mode_cmd, obj);

	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);

	if (ret)

		goto err;
@@ -1070,9 +1071,6 @@ int amdgpu_display_gem_fb_verify_and_init( 


	rfb->base.obj[0] = obj;

	drm_helper_mode_fill_fb_struct(dev, &rfb->base, mode_cmd);

	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);

	if (ret)

		goto err;

	/* Verify that the modifier is supported. */

	if (!drm_any_plane_has_format(dev, mode_cmd->pixel_format,

				      mode_cmd->modifier[0])) {
@@ -1088,6 +1086,10 @@ int amdgpu_display_gem_fb_verify_and_init( 
	if (ret)

		goto err;



	ret = drm_framebuffer_init(dev, &rfb->base, &amdgpu_fb_funcs);

	if (ret)

		goto err;



	return 0;

err:

	drm_dbg_kms(dev, "Failed to verify and init gem fb: %d\n", ret);

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

+17 −2
Original line number Diff line number Diff line
@@ -837,8 +837,23 @@ module_param_named(tmz, amdgpu_tmz, int, 0444); 


/**

 * DOC: freesync_video (uint)

 * Enabled the optimization to adjust front porch timing to achieve seamless mode change experience

 * when setting a freesync supported mode for which full modeset is not needed.

 * Enable the optimization to adjust front porch timing to achieve seamless

 * mode change experience when setting a freesync supported mode for which full

 * modeset is not needed.

 *

 * The Display Core will add a set of modes derived from the base FreeSync

 * video mode into the corresponding connector's mode list based on commonly

 * used refresh rates and VRR range of the connected display, when users enable

 * this feature. From the userspace perspective, they can see a seamless mode

 * change experience when the change between different refresh rates under the

 * same resolution. Additionally, userspace applications such as Video playback

 * can read this modeset list and change the refresh rate based on the video

 * frame rate. Finally, the userspace can also derive an appropriate mode for a

 * particular refresh rate based on the FreeSync Mode and add it to the

 * connector's mode list.

 *

 * Note: This is an experimental feature.

 *

 * The default value: 0 (off).

 */

MODULE_PARM_DESC(