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

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

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

radeon fixes for 3.17, kind of all over the place (dpm, GPUVM, etc.)
* 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: Remove duplicate include from Makefile
  drm/radeon/dpm: select the appropriate vce power state for KV/KB/ML
  drm/radeon: Add ability to get and change dpm state when radeon PX card is turned off
  drm/radeon: Add missing lines to ci_set_thermal_temperature_range
  drm/radeon: Always flush VM again on < CIK
  drm/radeon: add a check for allocation failure (v2)
  drm/radeon: use pfp for all vm_flush related updates
  drm/radeon: add bapm module parameter
parents 7d1311b9 c8ad8b56

drivers/gpu/drm/radeon/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ 
	evergreen.o evergreen_cs.o evergreen_blit_shaders.o \

	evergreen_hdmi.o radeon_trace_points.o ni.o cayman_blit_shaders.o \

	atombios_encoders.o radeon_semaphore.o radeon_sa.o atombios_i2c.o si.o \

	si_blit_shaders.o radeon_prime.o radeon_uvd.o cik.o cik_blit_shaders.o \

	si_blit_shaders.o radeon_prime.o cik.o cik_blit_shaders.o \

	r600_dpm.o rs780_dpm.o rv6xx_dpm.o rv770_dpm.o rv730_dpm.o rv740_dpm.o \

	rv770_smc.o cypress_dpm.o btc_dpm.o sumo_dpm.o sumo_smc.o trinity_dpm.o \

	trinity_smc.o ni_dpm.o si_smc.o si_dpm.o kv_smc.o kv_dpm.o ci_smc.o \

drivers/gpu/drm/radeon/ci_dpm.c

+3 −0
Original line number Diff line number Diff line
@@ -869,6 +869,9 @@ static int ci_set_thermal_temperature_range(struct radeon_device *rdev, 
	WREG32_SMC(CG_THERMAL_CTRL, tmp);

#endif



	rdev->pm.dpm.thermal.min_temp = low_temp;

	rdev->pm.dpm.thermal.max_temp = high_temp;



	return 0;

}

drivers/gpu/drm/radeon/cik.c

+4 −4
Original line number Diff line number Diff line
@@ -5958,14 +5958,14 @@ void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) 


	/* update SH_MEM_* regs */

	radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));

	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |

	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |

				 WRITE_DATA_DST_SEL(0)));

	radeon_ring_write(ring, SRBM_GFX_CNTL >> 2);

	radeon_ring_write(ring, 0);

	radeon_ring_write(ring, VMID(vm->id));



	radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 6));

	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |

	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |

				 WRITE_DATA_DST_SEL(0)));

	radeon_ring_write(ring, SH_MEM_BASES >> 2);

	radeon_ring_write(ring, 0);
@@ -5976,7 +5976,7 @@ void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) 
	radeon_ring_write(ring, 0); /* SH_MEM_APE1_LIMIT */



	radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));

	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |

	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |

				 WRITE_DATA_DST_SEL(0)));

	radeon_ring_write(ring, SRBM_GFX_CNTL >> 2);

	radeon_ring_write(ring, 0);
@@ -5987,7 +5987,7 @@ void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm) 


	/* bits 0-15 are the VM contexts0-15 */

	radeon_ring_write(ring, PACKET3(PACKET3_WRITE_DATA, 3));

	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(0) |

	radeon_ring_write(ring, (WRITE_DATA_ENGINE_SEL(usepfp) |

				 WRITE_DATA_DST_SEL(0)));

	radeon_ring_write(ring, VM_INVALIDATE_REQUEST >> 2);

	radeon_ring_write(ring, 0);

drivers/gpu/drm/radeon/kv_dpm.c

+7 −4
Original line number Diff line number Diff line
@@ -1438,14 +1438,14 @@ static int kv_update_uvd_dpm(struct radeon_device *rdev, bool gate) 
	return kv_enable_uvd_dpm(rdev, !gate);

}



static u8 kv_get_vce_boot_level(struct radeon_device *rdev)

static u8 kv_get_vce_boot_level(struct radeon_device *rdev, u32 evclk)

{

	u8 i;

	struct radeon_vce_clock_voltage_dependency_table *table =

		&rdev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table;



	for (i = 0; i < table->count; i++) {

		if (table->entries[i].evclk >= 0) /* XXX */

		if (table->entries[i].evclk >= evclk)

			break;

	}
@@ -1468,7 +1468,7 @@ static int kv_update_vce_dpm(struct radeon_device *rdev, 
		if (pi->caps_stable_p_state)

			pi->vce_boot_level = table->count - 1;

		else

			pi->vce_boot_level = kv_get_vce_boot_level(rdev);

			pi->vce_boot_level = kv_get_vce_boot_level(rdev, radeon_new_state->evclk);



		ret = kv_copy_bytes_to_smc(rdev,

					   pi->dpm_table_start +
@@ -2726,6 +2726,9 @@ int kv_dpm_init(struct radeon_device *rdev) 
	pi->caps_sclk_ds = true;

	pi->enable_auto_thermal_throttling = true;

	pi->disable_nb_ps3_in_battery = false;

	if (radeon_bapm == 0)

		pi->bapm_enable = false;

	else

		pi->bapm_enable = true;

	pi->voltage_drop_t = 0;

	pi->caps_sclk_throttle_low_notification = false;

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ extern int radeon_vm_size; 
extern int radeon_vm_block_size;

extern int radeon_deep_color;

extern int radeon_use_pflipirq;

extern int radeon_bapm;



/*

 * Copy from radeon_drv.h so we don't have to include both and have conflicting