summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-12-23Merge branch 'drm-next-4.5' of git://people.freedesktop.org/~agd5f/linux ↵Dave Airlie165-15886/+50706
into drm-next [airlied: fixup build problems on arm - added errno.h include] * 'drm-next-4.5' of git://people.freedesktop.org/~agd5f/linux: (152 commits) amd/powerplay: fix copy paste typo in hardwaremanager.c amd/powerplay: disable powerplay by default initially amd/powerplay: don't enable ucode fan control if vbios has no fan table drm/amd/powerplay: show gpu load when print gpu performance for Cz. (v2) drm/amd/powerplay: check whether need to enable thermal control. (v2) drm/amd/powerplay: add point check to avoid NULL point hang. drm/amdgpu/powerplay: Program a calculated value as Deep Sleep clock. drm/amd/powerplay: Don't return an error if fan table is missing drm/powerplay/hwmgr: log errors in tonga_hwmgr_backend_init drm/powerplay: add debugging output to processpptables.c drm/powerplay: add debugging output to tonga_processpptables.c amd/powerplay: Add structures required to report configuration change amd/powerplay: Fix get dal power level amd\powerplay Implement get dal power level drm/amd/powerplay: display gpu load when print performance for tonga. drm/amdgpu/powerplay: enable sysfs and debugfs interfaces late drm/amd/powerplay: move shared function of vi to hwmgr. (v2) drm/amd/powerplay: check whether enable dpm in powerplay. drm/amd/powerplay: fix bug that dpm funcs in debugfs/sysfs missing. drm/amd/powerplay: fix boolreturn.cocci warnings ...
2015-12-23Merge branch 'drm-tda998x-devel' of ↵Dave Airlie1-2/+10
git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next These changes from Liviu add support for atomic mode setting, add the TMDS clock limitation according to the device, and ensure that we correctly clean up in the unbind function. * 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: drm/i2c: tda998x: Add support for atomic modesetting drm/i2c: tda998x: increase the supported dotclock frequency to 165MHz for TDA19988 drm/i2c: tda998x: unregister the connector in the unbind function
2015-12-23Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm ↵Dave Airlie5-24/+22
into drm-next These are the patches from Daniel Vetter, getting rid of struct_mutex from the Armada DRM driver. * 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: drm/armada: use a private mutex to protect priv->linear drm/armada: drop struct_mutex from cursor paths drm/armada: don't grab dev->struct_mutex for in mmap offset ioctl drm/armada: plug leak in dumb_map_offset drm/armada: use unlocked gem unreferencing
2015-12-22Merge tag 'drm-vc4-next-2015-12-21' of http://github.com/anholt/linux into ↵Dave Airlie1-21/+20
drm-next I've decided to just send this fixes-for-next pull request now, even if we don't have a patch for the CONFIG_PM_SLEEP build failure reviewed. If you like my patch for that, I'd be happy to see it applied directly. This pull request brings in little fixes from Dan Carpenter for the 3D support added in this -next cycle. * tag 'drm-vc4-next-2015-12-21' of http://github.com/anholt/linux: drm/vc4: fix an error code drm/vc4: allocate enough memory in vc4_save_hang_state() drm/vc4: copy_to_user() returns the number of bytes remaining
2015-12-22amd/powerplay: fix copy paste typo in hardwaremanager.cAlex Deucher1-1/+1
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22amd/powerplay: disable powerplay by default initiallyAlex Deucher1-1/+1
Hopefully we can enable this by default once we get more upstream feedback on stability, etc. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22amd/powerplay: don't enable ucode fan control if vbios has no fan tableAlex Deucher1-0/+3
Some systems have a single fan controlled by ACPI or some other method. Reviewed-by: Tom St Denis <tom.stdenis@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/amd/powerplay: show gpu load when print gpu performance for Cz. (v2)Rex Zhu1-1/+12
Show GPU load in in the debugfs output. v2: integrate Tom's optimization Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
2015-12-22drm/amd/powerplay: check whether need to enable thermal control. (v2)Rex Zhu1-1/+8
In I+A platform(skylake), it is controlled by intel. v2: integrate Tom's fix Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
2015-12-22drm/amd/powerplay: add point check to avoid NULL point hang.Rex Zhu1-13/+47
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/amdgpu/powerplay: Program a calculated value as Deep Sleep clock.David Rokhvarg1-2/+4
This replaces programming of a hardcoded value. Signed-off-by: David Rokhvarg <David.Rokhvarg@amd.com>
2015-12-22drm/amd/powerplay: Don't return an error if fan table is missingAlex Deucher1-1/+1
It's a valid configuration on some laptops. Reviewed-by: Tom St Denis <tom.stdenis@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/powerplay/hwmgr: log errors in tonga_hwmgr_backend_initAlex Deucher1-0/+2
Helpful in debugging init issues. Reviewed-by: Tom St Denis <tom.stdenis@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/powerplay: add debugging output to processpptables.cAlex Deucher1-13/+29
To help track down init errors. Reviewed-by: Tom St Denis <tom.stdenis@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/powerplay: add debugging output to tonga_processpptables.cAlex Deucher1-13/+26
To help track down init errors. Reviewed-by: Tom St Denis <tom.stdenis@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22amd/powerplay: Add structures required to report configuration changeEric Yang5-39/+139
Add required structures for amd_powerplay_display_configuration_change Signed-off-by: Eric Yang <eric.yang2@amd.com>
2015-12-22amd/powerplay: Fix get dal power levelVitaly Prosyak6-15/+12
Simplify data struct for get dal power level Signed-off-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
2015-12-22amd\powerplay Implement get dal power levelVitaly Prosyak6-19/+85
Implement get dal power level and simple clock info Signed-off-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
2015-12-22drm/amd/powerplay: display gpu load when print performance for tonga.Rex Zhu1-1/+12
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
2015-12-22drm/amdgpu/powerplay: enable sysfs and debugfs interfaces lateAlex Deucher1-1/+4
To avoid users accessing them before the module has finished initializing them and make sure they are only created if dpm has properly initialized. Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/amd/powerplay: move shared function of vi to hwmgr. (v2)Rex Zhu4-19/+379
v2: agd: rebase on upstream Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
2015-12-22drm/amd/powerplay: check whether enable dpm in powerplay.Rex Zhu1-1/+4
Change-Id: I0a2dbf8ef7d4a3e9788fe211fc5964dd2487c519 Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
2015-12-22drm/amd/powerplay: fix bug that dpm funcs in debugfs/sysfs missing.Rex Zhu1-1/+14
in dpm module, sysfs init func move to late_init from sw_init. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Change-Id: Ice4a73212d8e3106d05f04a27043820ffd32929e Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
2015-12-22drm/amd/powerplay: fix boolreturn.cocci warningskbuild test robot1-2/+2
drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppatomctrl.c:475:10-11: WARNING: return of 0/1 in function 'atomctrl_lookup_gpio_pin' with return type bool Return statements in functions returning bool should use true/false instead of 1/0. Generated by: scripts/coccinelle/misc/boolreturn.cocci CC: yanyang1 <young.yang@amd.com> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/amd/powerplay: add functions set/get_fan_control_mode in hwmgr for Fiji.Eric Huang2-0/+27
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
2015-12-22drm/amd/powerplay: add functions set/get_fan_control_mode in hwmgr for Tonga.Eric Huang2-0/+27
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
2015-12-22drm/amd/powerplay: Fix a bug in fan control setting default mode for Tonga ↵Eric Huang2-2/+2
and Fiji. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
2015-12-22drm/amd/powerplay: Add thermal protection support for Fiji.Eric Huang4-1/+892
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
2015-12-22drm/amd/powerplay: add display configeration changed function in hwmgr for Fiji.Eric Huang2-0/+68
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
2015-12-22drm/amdgpu: Prepare DKMS build for powerplay module.Qiang Yu1-1/+1
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
2015-12-22drm/amd/amdgpu: enable uvd&vce clock gating for Fiji.Eric Huang1-1/+2
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Acked-by: Jammy Zhou <Jammy.Zhou@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
2015-12-22drm/amd/amdgpu: add vce3.0 clock gating support. (v2)Eric Huang1-1/+148
v2: fix grbm locking Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Acked-by: Jammy Zhou <Jammy.Zhou@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
2015-12-22drm/amd/amdgpu: add uvd6.0 clock gating support. (v2)Eric Huang1-2/+259
v2: fix bug in register mask setting. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Acked-by: Jammy Zhou <Jammy.Zhou@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
2015-12-22drm/amd/powerplay: add multimedia power gating support for Fiji.Eric Huang5-3/+281
Acked-by: Jammy Zhou <Jammy.Zhou@amd.com> Acked-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
2015-12-22drm/amdgpu: rename fiji_smumgr.h to fiji_smum.hJammy Zhou3-2/+2
This conflicts with fiji_smumgr.h from powerplay in DKMS environment Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Jordan Lazare <Jordan.Lazare@amd.com>
2015-12-22drm/amdgpu: rename tonga_smumgr.h to tonga_smum.hJammy Zhou3-2/+2
This conflicts with the tonga_smumgr.h from powerplay in DKMS environement Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Jordan Lazare <Jordan.Lazare@amd.com>
2015-12-22drm/amd/powerplay: Add PPLib debug print macro.David Rokhvarg2-4/+40
- The macro is silent by default. - Use the macro to print Display Configuration - related changes. Signed-off-by: David Rokhvarg <David.Rokhvarg@amd.com>
2015-12-22drm/amd/powerplay: enable/disable NB pstate feature for Carrizo.Rex Zhu2-15/+87
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Signed-off-by: David Rokhvarg <David.Rokhvarg@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
2015-12-22drm/amd/powerplay: enable set_cpu_power_state task. (v2)Rex Zhu6-5/+21
v2: integrate Jammy's crash fix Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
2015-12-22drm/amd/powerplay: export interface to DAL to init/change display configuration.Rex Zhu5-0/+45
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Signed-off-by: David Rokhvarg <David.Rokhvarg@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
2015-12-22drm/amd/powerplay: add smc msg for NB P-State switchRex Zhu2-0/+9
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Signed-off-by: David Rokhvarg <David.Rokhvarg@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
2015-12-22drm/amd/powerplay: add new function point in hwmgr.Rex Zhu1-1/+5
1. for set_cpu_power_state 2. restore display configuration Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
2015-12-22amdgpu/powerplay: Add Stoney to list of early init casesTom St Denis1-0/+1
Signed-off-by: Tom St Denis <tom.stdenis@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/amd/powerplay: fix warning of cast to pointer from integer of different ↵Rex Zhu1-2/+2
size. Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/amd/powerplay: fix warning of cast to pointer from integer of different ↵rezhu3-6/+6
size. Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/amd/powerplay: implement smc state upload for CZAlex Deucher4-22/+141
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/amd/powerplay: add atomctrl function to calculate CZ sclk dividersAlex Deucher2-0/+25
Use atombios to calculate the values. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2015-12-22drm/amd/powerplay: enable clock gating for Fiji.Eric Huang1-1/+8
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
2015-12-22drm/amd/powerplay: add parts of system clock gating support for Fiji. (v2)Eric Huang1-0/+86
Removed fiji_mgcg_cgcg_init that is affected and redundant for new implementation. v2: re-add mgcg_cgcg init Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
2015-12-22drm/amdgpu: add sdma clock gating support for Fiji.Eric Huang1-0/+105
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
generated by cgit v1.2.3 (git 2.39.0) at 2025-04-30 04:24:27 +0300