Commits · 6e72376dcc663e4b8a00cdd08f61a8623f572ef1 · nexedi / linux

22 Jan, 2015 40 commits

radeon/audio: consolidate audio_mode_set() functions · 6e72376d

Slava Grigorev authored Dec 10, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

6e72376d

radeon/audio: removed unnecessary debug settings · 7f604077

Slava Grigorev authored Dec 09, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

7f604077

radeon/audio: moved mute programming to a separate function · 3be2e7d0

Slava Grigorev authored Dec 09, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

3be2e7d0

radeon/audio: moved audio packet programming to a separate function · 1852c9a0

Slava Grigorev authored Dec 09, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1852c9a0

radeon/audio: set_avi_packet() function cleanup · baa7d8e4

Slava Grigorev authored Dec 08, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

baa7d8e4

radeon/audio: removed unnecessary CRC control programing · 8ffea857

Slava Grigorev authored Dec 08, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

8ffea857

radeon: moved HDMI color depth programming to a separate function · be273e58

Slava Grigorev authored Dec 08, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

be273e58

radeon/audio: moved VBI packet programming to separate functions · 930a9785

Alex Deucher authored Jan 20, 2015

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

930a9785

radeon/audio: consolidate update_acr() functions (v2) · 64424d6e

Slava Grigorev authored Dec 06, 2014

V2: fix missing dce6 callback
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

64424d6e

radeon/audio: consolidate update_avi_infoframe() functions · 96ea7afb

Slava Grigorev authored Dec 05, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

96ea7afb

radeon/audio: consolidate audio_set_dto() functions · a85d682a

Slava Grigorev authored Dec 05, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

a85d682a

radeon/audio: consolidate audio_fini() functions · 7991d665

Slava Grigorev authored Dec 03, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

7991d665

radeon/audio: consolidate audio_enable() functions · 8bf59820

Slava Grigorev authored Dec 03, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

8bf59820

radeon/audio: consolidate select_pin() functions · 88252d77

Slava Grigorev authored Dec 02, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

88252d77

radeon/audio: consolidate audio_get_pin() functions · 3cdde027

Slava Grigorev authored Dec 02, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

3cdde027

radeon/audio: consolidate write_latency_fields() functions · 87654f87

Slava Grigorev authored Dec 02, 2014

Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

87654f87

radeon/audio: consolidate write_speaker_allocation() functions · 00a9d4bc

Slava Grigorev authored Dec 01, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

00a9d4bc

radeon/audio: consolidate write_sad_regs() functions · 070a2e63

Alex Deucher authored Jan 22, 2015

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

070a2e63

radeon/audio: defined initial audio interface that gets initialized via detect() call · 1a626b68

Slava Grigorev authored Dec 01, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1a626b68

radeon/audio: consolidate audio_init() functions · bfc1f97d

Slava Grigorev authored Dec 22, 2014

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

bfc1f97d

drm/radeon: comment out some currently unused 7xx dpm code · 49ead33b
Alex Deucher authored Jan 14, 2015
```
Keep it around for reference.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
```
49ead33b
drm/radeon: comment out some currently unused eg dpm code · ed50890d
Alex Deucher authored Jan 14, 2015
```
Keep it around for reference.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
```
ed50890d
drm/radeon: comment out some currently unused sumo dpm code · 1afde6b2
Alex Deucher authored Jan 14, 2015
```
Keep it around for reference.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
```
1afde6b2
drm/radeon: comment out some currently unused tn dpm code · 6421d612
Alex Deucher authored Jan 14, 2015
```
Keep it around for reference.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
```
6421d612
drm/radeon: comment out some currently unused btc dpm code · 7ff96f9d
Alex Deucher authored Jan 14, 2015
```
Keep it around for reference.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
```
7ff96f9d
drm/radeon: comment out some currently unused ni dpm code · de6267d0
Alex Deucher authored Jan 14, 2015
```
Keep it around for reference.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
```
de6267d0
drm/radeon: comment out some currently unused kv dpm code · dafc519d
Alex Deucher authored Jan 14, 2015
```
Keep it around for reference.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
```
dafc519d
drm/radeon: comment out some currently unused si dpm code · 98769131
Alex Deucher authored Jan 14, 2015
```
Keep it around for reference.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
```
98769131
drm/radeon: comment out some currently unused ci dpm code · 64e58044
Alex Deucher authored Jan 14, 2015
```
Keep it around for reference.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
```
64e58044

gpu: drm: radeon: radeon_object: Remove unused function · bcd705a0

Rickard Strandqvist authored Jan 11, 2015

Remove the function radeon_bo_fbdev_mmap() that is not used anywhere.

This was partially found by using a static code analysis program called cppcheck.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

bcd705a0

drm/radeon/radeon_fb: Remove unused function · 089e746b

Rickard Strandqvist authored Jan 13, 2015

Remove the function radeon_fbdev_total_size() that is not used anywhere.

089e746b

drm/radeon/radeon_i2c: Remove unused function · 0554309e

Rickard Strandqvist authored Jan 13, 2015

Remove the function radeon_best_encoder() that is not used anywhere.

0554309e

drm/radeon: enable smc fan control on SI · de5670c2

Alex Deucher authored Jan 18, 2015

Working now with Oleg's last round of fixes.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

de5670c2

fixes for SI fan handling · 47fd97ca

Oleg Chernovskiy authored Jan 17, 2015

Added temperature values to SMC payload.
Fan mode check moved check to proper place.
Signed-off-by: Oleg Chernovskiy <algonkvel@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

47fd97ca

drm/radeon: bind fan control on SI cards to hwmon interface · 5e8150a6

Alex Deucher authored Jan 07, 2015

This adds a possibility to control fan on SI parts
via exported hwmon variables. Note that automatic
ucode fan management pauses if you choose to enable
manual fan control.  Use with caution!
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

5e8150a6

drm/radeon: bind fan control on CI cards to hwmon interface (v2) · 36689e57

Oleg Chernovskiy authored Dec 08, 2014

This adds a possibility to control fan on CI parts
via exported hwmon variables. Note that automatic
ucode fan management pauses if you choose to enable
manual fan control.  Use with caution!

v2: agd5f: fix formatting, squash in:

    minor fix for pwm1_enable exposed value

    Track smc control in addition to fan mode
    This fixes pwm1_enable being constantly set
    to 1 because of enabled smc control

also handle the case where smc fan control is disabled.
Signed-off-by: Oleg Chernovskiy <algonkvel@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

36689e57

drm/radeon: add hwmon interface for managing fan pwm (v2) · 99736703

Oleg Chernovskiy authored Dec 08, 2014

This adds percent-based fan control. Attributes (I hope) follow the
sysfs-interface specification:
* pwm1 - fan speed query/manage
* pwm1_max, pwm1_min - min/max values for fan pwm (constant)
* pwm1_enable - fan control query/manage (enable/disable)

(There is no rpm-based control for now)

v2: agd5f: fix formatting
Signed-off-by: Oleg Chernovskiy <algonkvel@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

99736703

add common fan control asic callbacks · a35a4b2b

Oleg Chernovskiy authored Dec 08, 2014

Adds 4 callbacks for managing fan state/speed
* fan_ctrl_set_mode - manages fan control mode (nonzero == manual)
* fan_ctrl_get_mode - queries fan control mode
* set_fan_speed_percent - manages fan speed as percentage value
* get_fan_speed_percent - queries fan speed as percentage value
Signed-off-by: Oleg Chernovskiy <algonkvel@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

a35a4b2b

drm/radeon: evergreen/cayman indirect draw support (v2) · 16613743

Glenn Kennard authored Dec 13, 2014

Add the necessary set of commands to support OpenGL
indirect draw calls on evergreen/cayman devices that
do not have VM.

v2: agd5f: fix warning on 32-bit
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Glenn Kennard <glenn.kennard@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

16613743

Merge remote-tracking branch 'origin/master' into drm-next · 281d1bbd

Dave Airlie authored Jan 22, 2015

Backmerge Linus tree after rc5 + drm-fixes went in.

There were a few amdkfd conflicts I wanted to avoid,
and Ben requested this for nouveau also.

Conflicts:
	drivers/gpu/drm/amd/amdkfd/Makefile
	drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
	drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
	drivers/gpu/drm/amd/amdkfd/kfd_priv.h
	drivers/gpu/drm/amd/include/kgd_kfd_interface.h
	drivers/gpu/drm/i915/intel_runtime_pm.c
	drivers/gpu/drm/radeon/radeon_kfd.c

281d1bbd