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

Merge tag 'amd-drm-fixes-5.10-2020-11-18' of... 

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

 into drm-fixes

amd-drm-fixes-5.10-2020-11-18:

amdgpu:
- Pageflip fix for navi1x with 5 or 6 displays
- Remove experimental flag for Arcturus
- Fix regression in atomic commit tail rework

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201118213646.4015-1-alexander.deucher@amd.com
parents 01822dd1 2b3af270

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

+4 −4
Original line number Diff line number Diff line
@@ -1055,10 +1055,10 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x15dd, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_APU},

	{0x1002, 0x15d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_APU},

	/* Arcturus */

	{0x1002, 0x738C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x7388, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x738E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x7390, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x738C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS},

	{0x1002, 0x7388, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS},

	{0x1002, 0x738E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS},

	{0x1002, 0x7390, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS},

	/* Navi10 */

	{0x1002, 0x7310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10},

	{0x1002, 0x7312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10},

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −1
Original line number Diff line number Diff line
@@ -7506,7 +7506,6 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
	bool mode_set_reset_required = false;



	drm_atomic_helper_update_legacy_modeset_state(dev, state);

	drm_atomic_helper_calc_timestamping_constants(state);



	dm_state = dm_atomic_get_new_state(state);

	if (dm_state && dm_state->context) {
@@ -7533,6 +7532,8 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
		}

	}



	drm_atomic_helper_calc_timestamping_constants(state);



	/* update changed items */

	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {

		struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc);

drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c

+2 −2
Original line number Diff line number Diff line
@@ -299,8 +299,8 @@ irq_source_info_dcn20[DAL_IRQ_SOURCES_NUMBER] = { 
	pflip_int_entry(1),

	pflip_int_entry(2),

	pflip_int_entry(3),

	[DC_IRQ_SOURCE_PFLIP5] = dummy_irq_entry(),

	[DC_IRQ_SOURCE_PFLIP6] = dummy_irq_entry(),

	pflip_int_entry(4),

	pflip_int_entry(5),

	[DC_IRQ_SOURCE_PFLIP_UNDERLAY0] = dummy_irq_entry(),

	gpio_pad_int_entry(0),

	gpio_pad_int_entry(1),

CRA Git | Maintained and supported by SUSTech CRA and CCSE