[PATCH 6/6] drm/amdgpu/cik: add IP modules for DC for APUs

[Harry Wentland]

On 2017-08-11 09:23 AM, Deucher, Alexander wrote:
>> -----Original Message-----
>> From: Wentland, Harry
>> Sent: Thursday, August 10, 2017 9:49 PM
>> To: Alex Deucher; amd-gfx at lists.freedesktop.org
>> Cc: Deucher, Alexander
>> Subject: Re: [PATCH 6/6] drm/amdgpu/cik: add IP modules for DC for APUs
>>
>> All patches are
>> Reviewed-by: Harry Wentland <harry.wentland at amd.com>
> 
> Do you want to take these through your tree?
> 

Yes.

> Thanks!

no problem

Harry

> 
> Alex
> 
>>
>> Harry
>>
>> On 2017-08-10 02:39 PM, Alex Deucher wrote:
>>> Enable DC for DCE8 APUs.
>>>
>>> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
>>> ---
>>>  drivers/gpu/drm/amd/amdgpu/cik.c | 8 ++++++++
>>>  1 file changed, 8 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c
>> b/drivers/gpu/drm/amd/amdgpu/cik.c
>>> index af3b66f..793b1470 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/cik.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/cik.c
>>> @@ -1937,6 +1937,10 @@ int cik_set_ip_blocks(struct amdgpu_device
>> *adev)
>>>  		amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
>>>  		if (adev->enable_virtual_display)
>>>  			amdgpu_ip_block_add(adev,
>> &dce_virtual_ip_block);
>>> +#if defined(CONFIG_DRM_AMD_DC)
>>> +		else if (amdgpu_device_has_dc_support(adev))
>>> +			amdgpu_ip_block_add(adev, &dm_ip_block);
>>> +#endif
>>>  		else
>>>  			amdgpu_ip_block_add(adev, &dce_v8_1_ip_block);
>>>  		amdgpu_ip_block_add(adev, &gfx_v7_1_ip_block);
>>> @@ -1952,6 +1956,10 @@ int cik_set_ip_blocks(struct amdgpu_device
>> *adev)
>>>  		amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
>>>  		if (adev->enable_virtual_display)
>>>  			amdgpu_ip_block_add(adev,
>> &dce_virtual_ip_block);
>>> +#if defined(CONFIG_DRM_AMD_DC)
>>> +		else if (amdgpu_device_has_dc_support(adev))
>>> +			amdgpu_ip_block_add(adev, &dm_ip_block);
>>> +#endif
>>>  		else
>>>  			amdgpu_ip_block_add(adev, &dce_v8_3_ip_block);
>>>  		amdgpu_ip_block_add(adev, &gfx_v7_2_ip_block);
>>>