Commit41f3ed2

committed

Merge tag 'amd-drm-fixes-5.10-2020-11-12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

amd-drm-fixes-5.10-2020-11-12:amdgpu:- Pageflip fix for DCN3- Declare TA firmware for green sardine- Headless navi fixSigned-off-by: Dave Airlie <airlied@redhat.com>From: Alex Deucher <alexdeucher@gmail.com>Link:https://patchwork.freedesktop.org/patch/msgid/20201113055512.3963-1-alexander.deucher@amd.com

2 parents858fbdb +38a2509 commit41f3ed2Copy full SHA for 41f3ed2

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -492,8 +492,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)`
`492`	`492`	`if (adev->enable_virtual_display\|\|amdgpu_sriov_vf(adev))`
`493`	`493`	`amdgpu_device_ip_block_add(adev,&dce_virtual_ip_block);`
`494`	`494`	`#if defined(CONFIG_DRM_AMD_DC)`
`495`		`-elseif (amdgpu_device_has_dc_support(adev)&&`
`496`		`- !nv_is_headless_sku(adev->pdev))`
	`495`	`+elseif (amdgpu_device_has_dc_support(adev))`
`497`	`496`	`amdgpu_device_ip_block_add(adev,&dm_ip_block);`
`498`	`497`	`#endif`
`499`	`498`	`amdgpu_device_ip_block_add(adev,&gfx_v10_0_ip_block);`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`MODULE_FIRMWARE("amdgpu/renoir_asd.bin");`
`41`	`41`	`MODULE_FIRMWARE("amdgpu/renoir_ta.bin");`
`42`	`42`	`MODULE_FIRMWARE("amdgpu/green_sardine_asd.bin");`
	`43`	`+MODULE_FIRMWARE("amdgpu/green_sardine_ta.bin");`
`43`	`44`
`44`	`45`	`/* address block */`
`45`	`46`	`#definesmnMP1_FIRMWARE_FLAGS0x3010024`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -306,8 +306,8 @@ irq_source_info_dcn30[DAL_IRQ_SOURCES_NUMBER] = {`
`306`	`306`	`pflip_int_entry(1),`
`307`	`307`	`pflip_int_entry(2),`
`308`	`308`	`pflip_int_entry(3),`
`309`		`-[DC_IRQ_SOURCE_PFLIP5]=dummy_irq_entry(),`
`310`		`-[DC_IRQ_SOURCE_PFLIP6]=dummy_irq_entry(),`
	`309`	`+pflip_int_entry(4),`
	`310`	`+pflip_int_entry(5),`
`311`	`311`	`[DC_IRQ_SOURCE_PFLIP_UNDERLAY0]=dummy_irq_entry(),`
`312`	`312`	`gpio_pad_int_entry(0),`
`313`	`313`	`gpio_pad_int_entry(1),`

Comments

(0)