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

Commit 97eaf753 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Fixes for 4.13:
- Various fixes for Raven
- Various fixes for Vega10
- Stability fixes for KIQ
- Fix reloading the driver
- Fix S3 on vega10
- Misc other fixes

* 'drm-next-4.13' of git://people.freedesktop.org/~agd5f/linux: (26 commits)
  drm/amd/powerplay: fix bug fail to remove sysfs when rmmod amdgpu.
  amdgpu: Set cik/si_support to 1 by default if radeon isn't built
  drm/amdgpu/gfx9: fix driver reload with KIQ
  drm/amdgpu/gfx8: fix driver reload with KIQ
  drm/amdgpu: Don't call amd_powerplay_destroy() if we don't have powerplay
  drm/ttm: Fix use-after-free in ttm_bo_clean_mm
  drm/amd/amdgpu: move get memory type function from early init to sw init
  drm/amdgpu/cgs: always set reference clock in mode_info
  drm/amdgpu: fix vblank_time when displays are off
  drm/amd/powerplay: power value format change for Vega10
  drm/amdgpu/gfx9: support the amdgpu.disable_cu option
  drm/amd/powerplay: change PPSMC_MSG_GetCurrPkgPwr for Vega10
  drm/amdgpu: Make amdgpu_cs_parser_init static (v2)
  drm/amdgpu/cs: fix a typo in a comment
  drm/amdgpu: Fix the exported always on CU bitmap
  drm/amdgpu/gfx9: gfx_v9_0_enable_gfx_static_mg_power_gating() can be static
  drm/amdgpu/psp: upper_32_bits/lower_32_bits for address setup
  drm/amd/powerplay/cz: print message if smc message fails
  drm/amdgpu: fix typo in amdgpu_debugfs_test_ib_init
  drm/amdgpu: enable mmhub pg on raven
  ...
parents 4d79ce40 593f546e

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

+5 −3
Original line number Diff line number Diff line
@@ -1028,12 +1028,15 @@ struct amdgpu_gfx_config { 
};



struct amdgpu_cu_info {

	uint32_t number; /* total active CU number */

	uint32_t ao_cu_mask;

	uint32_t max_waves_per_simd;

	uint32_t wave_front_size;

	uint32_t max_scratch_slots_per_cu;

	uint32_t lds_size;



	/* total active CU number */

	uint32_t number;

	uint32_t ao_cu_mask;

	uint32_t ao_cu_bitmap[4][4];

	uint32_t bitmap[4][4];

};
@@ -1924,7 +1927,6 @@ void amdgpu_pci_config_reset(struct amdgpu_device *adev); 
bool amdgpu_need_post(struct amdgpu_device *adev);

void amdgpu_update_display_priority(struct amdgpu_device *adev);



int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data);

void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes);

void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *abo, u32 domain);

bool amdgpu_ttm_bo_is_amdgpu_bo(struct ttm_buffer_object *bo);

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

+6 −0
Original line number Diff line number Diff line
@@ -838,6 +838,12 @@ static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device, 
		return -EINVAL;



	mode_info = info->mode_info;

	if (mode_info) {

		/* if the displays are off, vblank time is max */

		mode_info->vblank_time_us = 0xffffffff;

		/* always set the reference clock */

		mode_info->ref_clock = adev->clock.spll.reference_freq;

	}



	if (adev->mode_info.num_crtc && adev->mode_info.mode_config_initialized) {

		list_for_each_entry(crtc,

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

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, 
	return 0;

}



int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)

static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data)

{

	struct amdgpu_fpriv *fpriv = p->filp->driver_priv;

	struct amdgpu_vm *vm = &fpriv->vm;
@@ -497,7 +497,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
				 &e->user_invalidated) && e->user_pages) {



				/* We acquired a page array, but somebody

				 * invalidated it. Free it an try again

				 * invalidated it. Free it and try again

				 */

				release_pages(e->user_pages,

					      e->robj->tbo.ttm->num_pages,

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

+1 −1
Original line number Diff line number Diff line
@@ -3804,7 +3804,7 @@ int amdgpu_debugfs_init(struct drm_minor *minor) 
	return 0;

}

#else

static int amdgpu_debugfs_test_ib_init(struct amdgpu_device *adev)

static int amdgpu_debugfs_test_ib_ring_init(struct amdgpu_device *adev)

{

	return 0;

}

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

+16 −1
Original line number Diff line number Diff line
@@ -67,9 +67,10 @@ 
 * - 3.15.0 - Export more gpu info for gfx9

 * - 3.16.0 - Add reserved vmid support

 * - 3.17.0 - Add AMDGPU_NUM_VRAM_CPU_PAGE_FAULTS.

 * - 3.18.0 - Export gpu always on cu bitmap

 */

#define KMS_DRIVER_MAJOR	3

#define KMS_DRIVER_MINOR	17

#define KMS_DRIVER_MINOR	18

#define KMS_DRIVER_PATCHLEVEL	0



int amdgpu_vram_limit = 0;
@@ -247,14 +248,28 @@ MODULE_PARM_DESC(lbpw, "Load Balancing Per Watt (LBPW) support (1 = enable, 0 = 
module_param_named(lbpw, amdgpu_lbpw, int, 0444);



#ifdef CONFIG_DRM_AMDGPU_SI



#if defined(CONFIG_DRM_RADEON) || defined(CONFIG_DRM_RADEON_MODULE)

int amdgpu_si_support = 0;

MODULE_PARM_DESC(si_support, "SI support (1 = enabled, 0 = disabled (default))");

#else

int amdgpu_si_support = 1;

MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)");

#endif



module_param_named(si_support, amdgpu_si_support, int, 0444);

#endif



#ifdef CONFIG_DRM_AMDGPU_CIK



#if defined(CONFIG_DRM_RADEON) || defined(CONFIG_DRM_RADEON_MODULE)

int amdgpu_cik_support = 0;

MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))");

#else

int amdgpu_cik_support = 1;

MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)");

#endif



module_param_named(cik_support, amdgpu_cik_support, int, 0444);

#endif