Skip to content

Commit 0b7f135

Browse files
Lijo Lazaralexdeucher
authored andcommitted
drm/amdgpu: Fix error with dev_info_once usage
Fixes error with dev_info_once usage in amdgpu_device_asic_has_dc_support. Signed-off-by: Lijo Lazar <[email protected]> Reviewed-by: Hawking Zhang <[email protected]> Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Fixes: a3e510f ("drm/amdgpu: Convert from DRM_* to dev_*") Signed-off-by: Alex Deucher <[email protected]>
1 parent 4a33ca3 commit 0b7f135

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1390,7 +1390,8 @@ void amdgpu_device_indirect_wreg64(struct amdgpu_device *adev,
13901390
void amdgpu_device_indirect_wreg64_ext(struct amdgpu_device *adev,
13911391
u64 reg_addr, u64 reg_data);
13921392
u32 amdgpu_device_get_rev_id(struct amdgpu_device *adev);
1393-
bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type);
1393+
bool amdgpu_device_asic_has_dc_support(struct pci_dev *pdev,
1394+
enum amd_asic_type asic_type);
13941395
bool amdgpu_device_has_dc_support(struct amdgpu_device *adev);
13951396

13961397
void amdgpu_device_set_sriov_virtual_display(struct amdgpu_device *adev);

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4099,12 +4099,14 @@ static void amdgpu_device_detect_sriov_bios(struct amdgpu_device *adev)
40994099
/**
41004100
* amdgpu_device_asic_has_dc_support - determine if DC supports the asic
41014101
*
4102+
* @pdev : pci device context
41024103
* @asic_type: AMD asic type
41034104
*
41044105
* Check if there is DC (new modesetting infrastructre) support for an asic.
41054106
* returns true if DC has support, false if not.
41064107
*/
4107-
bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)
4108+
bool amdgpu_device_asic_has_dc_support(struct pci_dev *pdev,
4109+
enum amd_asic_type asic_type)
41084110
{
41094111
switch (asic_type) {
41104112
#ifdef CONFIG_DRM_AMDGPU_SI
@@ -4148,7 +4150,7 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)
41484150
default:
41494151
if (amdgpu_dc > 0)
41504152
dev_info_once(
4151-
adev->dev,
4153+
&pdev->dev,
41524154
"Display Core has been requested via kernel parameter but isn't supported by ASIC, ignoring\n");
41534155
return false;
41544156
#endif
@@ -4168,7 +4170,7 @@ bool amdgpu_device_has_dc_support(struct amdgpu_device *adev)
41684170
(adev->harvest_ip_mask & AMD_HARVEST_IP_DMU_MASK))
41694171
return false;
41704172

4171-
return amdgpu_device_asic_has_dc_support(adev->asic_type);
4173+
return amdgpu_device_asic_has_dc_support(adev->pdev, adev->asic_type);
41724174
}
41734175

41744176
static void amdgpu_device_xgmi_reset_func(struct work_struct *__work)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2327,7 +2327,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
23272327
amdgpu_aspm = 0;
23282328

23292329
if (amdgpu_virtual_display ||
2330-
amdgpu_device_asic_has_dc_support(flags & AMD_ASIC_MASK))
2330+
amdgpu_device_asic_has_dc_support(pdev, flags & AMD_ASIC_MASK))
23312331
supports_atomic = true;
23322332

23332333
if ((flags & AMD_EXP_HW_SUPPORT) && !amdgpu_exp_hw_support) {

0 commit comments

Comments
 (0)