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

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



- Fixes for powerplay custom profiles
- DC bandwidth clean ups and fixes
- RAS fixes for vega20
- DC atomic resume fix
- Better plane handling in DC
- Freesync improvements
- Misc bug fixes and cleanups

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190411031242.3337-1-alexander.deucher@amd.com
parents 5c8c397c fe6382cd

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

+1 −0
Original line number Diff line number Diff line
@@ -827,6 +827,7 @@ struct amdgpu_device { 
	/* For pre-DCE11. DCE11 and later are in "struct amdgpu_device->dm" */

	struct work_struct		hotplug_work;

	struct amdgpu_irq_src		crtc_irq;

	struct amdgpu_irq_src		vupdate_irq;

	struct amdgpu_irq_src		pageflip_irq;

	struct amdgpu_irq_src		hpd_irq;

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

+1 −0
Original line number Diff line number Diff line
@@ -2471,6 +2471,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	mutex_init(&adev->virt.vf_errors.lock);

	hash_init(adev->mn_hash);

	mutex_init(&adev->lock_reset);

	mutex_init(&adev->virt.dpm_mutex);



	amdgpu_device_check_arguments(adev);

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

+11 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <drm/amdgpu_drm.h>

#include "amdgpu.h"

#include "amdgpu_display.h"

#include "amdgpu_xgmi.h"



void amdgpu_gem_object_free(struct drm_gem_object *gobj)

{
@@ -668,6 +669,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, 
	struct amdgpu_device *adev = dev->dev_private;

	struct drm_amdgpu_gem_op *args = data;

	struct drm_gem_object *gobj;

	struct amdgpu_vm_bo_base *base;

	struct amdgpu_bo *robj;

	int r;
@@ -706,6 +708,15 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, 
			amdgpu_bo_unreserve(robj);

			break;

		}

		for (base = robj->vm_bo; base; base = base->next)

			if (amdgpu_xgmi_same_hive(amdgpu_ttm_adev(robj->tbo.bdev),

				amdgpu_ttm_adev(base->vm->root.base.bo->tbo.bdev))) {

				r = -EINVAL;

				amdgpu_bo_unreserve(robj);

				goto out;

			}





		robj->preferred_domains = args->value & (AMDGPU_GEM_DOMAIN_VRAM |

							AMDGPU_GEM_DOMAIN_GTT |

							AMDGPU_GEM_DOMAIN_CPU);

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

+4 −0
Original line number Diff line number Diff line
@@ -696,6 +696,10 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
		if (adev->pm.dpm_enabled) {

			dev_info.max_engine_clock = amdgpu_dpm_get_sclk(adev, false) * 10;

			dev_info.max_memory_clock = amdgpu_dpm_get_mclk(adev, false) * 10;

		} else if (amdgpu_sriov_vf(adev) && amdgim_is_hwperf(adev) &&

			   adev->virt.ops->get_pp_clk) {

			dev_info.max_engine_clock = amdgpu_virt_get_sclk(adev, false) * 10;

			dev_info.max_memory_clock = amdgpu_virt_get_mclk(adev, false) * 10;

		} else {

			dev_info.max_engine_clock = adev->clock.default_sclk * 10;

			dev_info.max_memory_clock = adev->clock.default_mclk * 10;

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

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct amdgpu_hpd; 
#define to_amdgpu_encoder(x) container_of(x, struct amdgpu_encoder, base)

#define to_amdgpu_framebuffer(x) container_of(x, struct amdgpu_framebuffer, base)



#define to_dm_plane_state(x)	container_of(x, struct dm_plane_state, base);

#define to_dm_plane_state(x)	container_of(x, struct dm_plane_state, base)



#define AMDGPU_MAX_HPD_PINS 6

#define AMDGPU_MAX_CRTCS 6
@@ -406,7 +406,7 @@ struct amdgpu_crtc { 
	struct amdgpu_flip_work *pflip_works;

	enum amdgpu_flip_status pflip_status;

	int deferred_flip_completion;

	u64 last_flip_vblank;

	u32 last_flip_vblank;

	/* pll sharing */

	struct amdgpu_atom_ss ss;

	bool ss_enabled;

CRA Git | Maintained and supported by SUSTech CRA and CCSE