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

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

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

two amd fixes.

* 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: Fix vram_size/visible values in DRM_RADEON_GEM_INFO ioctl
  drm/amdgpu/si: fix crash on headless asics
parents a20def95 51964e9e

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

+3 −1
Original line number Diff line number Diff line
@@ -254,6 +254,9 @@ static void gmc_v6_0_mc_program(struct amdgpu_device *adev) 
	}

	WREG32(mmHDP_REG_COHERENCY_FLUSH_CNTL, 0);



	if (adev->mode_info.num_crtc)

		amdgpu_display_set_vga_render_state(adev, false);



	gmc_v6_0_mc_stop(adev, &save);



	if (gmc_v6_0_wait_for_idle((void *)adev)) {
@@ -283,7 +286,6 @@ static void gmc_v6_0_mc_program(struct amdgpu_device *adev) 
		dev_warn(adev->dev, "Wait for MC idle timedout !\n");

	}

	gmc_v6_0_mc_resume(adev, &save);

	amdgpu_display_set_vga_render_state(adev, false);

}



static int gmc_v6_0_mc_init(struct amdgpu_device *adev)

drivers/gpu/drm/radeon/radeon_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -97,9 +97,10 @@ 
 *   2.46.0 - Add PFP_SYNC_ME support on evergreen

 *   2.47.0 - Add UVD_NO_OP register support

 *   2.48.0 - TA_CS_BC_BASE_ADDR allowed on SI

 *   2.49.0 - DRM_RADEON_GEM_INFO ioctl returns correct vram_size/visible values

 */

#define KMS_DRIVER_MAJOR	2

#define KMS_DRIVER_MINOR	48

#define KMS_DRIVER_MINOR	49

#define KMS_DRIVER_PATCHLEVEL	0

int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);

int radeon_driver_unload_kms(struct drm_device *dev);

drivers/gpu/drm/radeon/radeon_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -220,8 +220,8 @@ int radeon_gem_info_ioctl(struct drm_device *dev, void *data, 


	man = &rdev->mman.bdev.man[TTM_PL_VRAM];



	args->vram_size = rdev->mc.real_vram_size;

	args->vram_visible = (u64)man->size << PAGE_SHIFT;

	args->vram_size = (u64)man->size << PAGE_SHIFT;

	args->vram_visible = rdev->mc.visible_vram_size;

	args->vram_visible -= rdev->vram_pin_size;

	args->gart_size = rdev->mc.gtt_size;

	args->gart_size -= rdev->gart_pin_size;