Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27b713c2 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

A few amd fixes.

* 'drm-fixes-4.11' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/amdgpu:  Fix debugfs reg read/write address width
  drm/amdgpu/si: add dpm quirk for Oland
  drm/radeon/si: add dpm quirk for Oland
  drm: amd: remove broken include path
  drm/amd/powerplay: fix copy error in smu7_clockpoweragting.c
  drm/amdgpu: fix parser init error path to avoid crash in parser fini
  drm/amd/amdgpu: Disable GFX_PG on Carrizo until compute issues solved
parents 4daad1b2 801a6aa9

drivers/gpu/drm/amd/acp/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,6 +3,4 @@ 
# of AMDSOC/AMDGPU drm driver.

# It provides the HW control for ACP related functionalities.



subdir-ccflags-y += -I$(AMDACPPATH)/ -I$(AMDACPPATH)/include



AMD_ACP_FILES := $(AMDACPPATH)/acp_hw.o

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

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) 
	for (; i >= 0; i--)

		drm_free_large(p->chunks[i].kdata);

	kfree(p->chunks);

	p->chunks = NULL;

	p->nchunks = 0;

put_ctx:

	amdgpu_ctx_put(p->ctx);

free_chunk:

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

+2 −2
Original line number Diff line number Diff line
@@ -2590,7 +2590,7 @@ static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf, 
		use_bank = 0;

	}



	*pos &= 0x3FFFF;

	*pos &= (1UL << 22) - 1;



	if (use_bank) {

		if ((sh_bank != 0xFFFFFFFF && sh_bank >= adev->gfx.config.max_sh_per_se) ||
@@ -2666,7 +2666,7 @@ static ssize_t amdgpu_debugfs_regs_write(struct file *f, const char __user *buf, 
		use_bank = 0;

	}



	*pos &= 0x3FFFF;

	*pos &= (1UL << 22) - 1;



	if (use_bank) {

		if ((sh_bank != 0xFFFFFFFF && sh_bank >= adev->gfx.config.max_sh_per_se) ||

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

+6 −0
Original line number Diff line number Diff line
@@ -3464,6 +3464,12 @@ static void si_apply_state_adjust_rules(struct amdgpu_device *adev, 
		    (adev->pdev->device == 0x6667)) {

			max_sclk = 75000;

		}

	} else if (adev->asic_type == CHIP_OLAND) {

		if ((adev->pdev->device == 0x6604) &&

		    (adev->pdev->subsystem_vendor == 0x1028) &&

		    (adev->pdev->subsystem_device == 0x066F)) {

			max_sclk = 75000;

		}

	}



	if (rps->vce_active) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ static int vi_common_early_init(void *handle) 
		/* rev0 hardware requires workarounds to support PG */

		adev->pg_flags = 0;

		if (adev->rev_id != 0x00) {

			adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |

			adev->pg_flags |=

				AMD_PG_SUPPORT_GFX_SMG |

				AMD_PG_SUPPORT_GFX_PIPELINE |

				AMD_PG_SUPPORT_CP |