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

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

First new feature pull for 4.10.  Highlights:
- Support for multple virtual displays in the virtual dce component
- New VM mgr to support non-contiguous vram buffers
- Support for UVD powergating on additional asics
- Power management improvements
- lots of code cleanup and bug fixes

* 'drm-next-4.10' of git://people.freedesktop.org/~agd5f/linux: (107 commits)
  drm/amdgpu: turn on/off uvd clock when dpm enable/disable on CI
  drm/amdgpu: disable dpm before turn off clock when vce idle.
  drm/amdgpu: enable uvd bypass mode for CI/VI.
  drm/amdgpu: just not load smc firmware if smu is already running
  drm/amdgpu: when suspend, set boot state instand of disable dpm.
  drm/amdgpu: use failed label to handle context init failure
  drm/amdgpu: add amdgpu_ttm_bo_eviction_valuable callback
  drm/ttm: make eviction decision a driver callback v2
  drm/ttm: fix coding style in ttm_bo_driver.h
  drm/radeon/pm: autoswitch power state when in balanced mode
  drm/amd/powerplay: fix spelling mistake and add KERN_WARNING to printks
  drm/amdgpu:new ids flag for preempt
  drm/amdgpu: mark symbols static where possible
  drm/amdgpu: change function declarations and add missing header dependencies
  drm/amdgpu: s/amdgpuCrtc/amdgpu_crtc/ in pageflip code
  drm/amdgpu/atom: remove a bunch of unused functions
  drm/amdgpu: consolidate atom scratch reg handling for hangs
  drm/amdgpu: use amdgpu_bo_[create|free]_kernel for wb
  drm/amdgpu: add VCE VM session tracking
  drm/amdgpu: improve parse_cs handling a bit
  ...
parents 5481e27f 3495a103

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	atombios_encoders.o amdgpu_sa.o atombios_i2c.o \

	amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \

	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \

	amdgpu_gtt_mgr.o

	amdgpu_gtt_mgr.o amdgpu_vram_mgr.o



# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \

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

+0 −7
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 
#define ENCODER_OBJECT_ID_INTERNAL_VCE            0x24

#define ENCODER_OBJECT_ID_INTERNAL_UNIPHY3        0x25

#define ENCODER_OBJECT_ID_INTERNAL_AMCLK          0x27

#define ENCODER_OBJECT_ID_VIRTUAL                 0x28



#define ENCODER_OBJECT_ID_GENERAL_EXTERNAL_DVO    0xFF
@@ -120,7 +119,6 @@ 
#define CONNECTOR_OBJECT_ID_eDP                   0x14

#define CONNECTOR_OBJECT_ID_MXM                   0x15

#define CONNECTOR_OBJECT_ID_LVDS_eDP              0x16

#define CONNECTOR_OBJECT_ID_VIRTUAL               0x17



/* deleted */
@@ -149,7 +147,6 @@ 
#define GRAPH_OBJECT_ENUM_ID5                     0x05

#define GRAPH_OBJECT_ENUM_ID6                     0x06

#define GRAPH_OBJECT_ENUM_ID7                     0x07

#define GRAPH_OBJECT_ENUM_VIRTUAL                 0x08



/****************************************************/

/* Graphics Object ID Bit definition                */
@@ -411,10 +408,6 @@ 
                                                  GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\

                                                  ENCODER_OBJECT_ID_HDMI_ANX9805 << OBJECT_ID_SHIFT)



#define ENCODER_VIRTUAL_ENUM_VIRTUAL            ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\

                                                  GRAPH_OBJECT_ENUM_VIRTUAL << ENUM_ID_SHIFT |\

                                                  ENCODER_OBJECT_ID_VIRTUAL << OBJECT_ID_SHIFT)



/****************************************************/

/* Connector Object ID definition - Shared with BIOS */

/****************************************************/

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

+48 −804

File changed.

Preview size limit exceeded, changes collapsed.

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

+13 −4
Original line number Diff line number Diff line
@@ -265,14 +265,14 @@ static int acp_hw_init(void *handle) 


	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	const struct amdgpu_ip_block_version *ip_version =

	const struct amdgpu_ip_block *ip_block =

		amdgpu_get_ip_block(adev, AMD_IP_BLOCK_TYPE_ACP);



	if (!ip_version)

	if (!ip_block)

		return -EINVAL;



	r = amd_acp_hw_init(adev->acp.cgs_device,

			    ip_version->major, ip_version->minor);

			    ip_block->version->major, ip_block->version->minor);

	/* -ENODEV means board uses AZ rather than ACP */

	if (r == -ENODEV)

		return 0;
@@ -456,7 +456,7 @@ static int acp_set_powergating_state(void *handle, 
	return 0;

}



const struct amd_ip_funcs acp_ip_funcs = {

static const struct amd_ip_funcs acp_ip_funcs = {

	.name = "acp_ip",

	.early_init = acp_early_init,

	.late_init = NULL,
@@ -472,3 +472,12 @@ const struct amd_ip_funcs acp_ip_funcs = { 
	.set_clockgating_state = acp_set_clockgating_state,

	.set_powergating_state = acp_set_powergating_state,

};



const struct amdgpu_ip_block_version acp_ip_block =

{

	.type = AMD_IP_BLOCK_TYPE_ACP,

	.major = 2,

	.minor = 2,

	.rev = 0,

	.funcs = &acp_ip_funcs,

};

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

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,6 @@ struct amdgpu_acp { 
	struct acp_pm_domain *acp_genpd;

};



extern const struct amd_ip_funcs acp_ip_funcs;

extern const struct amdgpu_ip_block_version acp_ip_block;



#endif /* __AMDGPU_ACP_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE