summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ↵Dave Airlie2015-01-2914-54/+112
|\ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next This backmerges drm-fixes into drm-next mainly for the amdkfd stuff, I'm not 100% confident, but it builds and the amdkfd folks can fix anything up. Signed-off-by: Dave Airlie <airlied@redhat.com> Conflicts: drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
| * Merge branch 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux ↵Dave Airlie2015-01-2713-53/+111
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into drm-fixes Suspend/resume regression fix for 3.19. * 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: Remove rdev->gart.pages_addr array drm/radeon: Restore GART table contents after pinning it in VRAM v3 drm/radeon: Split off gart_get_page_entry ASIC hook from set_page_entry
| | * drm/radeon: Remove rdev->gart.pages_addr arrayMichel Dänzer2015-01-226-20/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | radeon_vm_map_gart can use rdev->gart.pages_entry instead. Also move the masking of the page address to radeon_vm_map_gart from its callers. Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| | * drm/radeon: Restore GART table contents after pinning it in VRAM v3Michel Dänzer2015-01-221-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GART table BO has to be moved out of VRAM for suspend/resume. Any updates to the GART table during that time were silently dropped without this change. This caused GPU lockups on resume in some cases, see the bug reports referenced below. This might also make GPU reset more robust in some cases, as we no longer rely on the GART table in VRAM being preserved across the GPU lockup/reset. v2: Add logic to radeon_gart_table_vram_pin directly instead of reinstating radeon_gart_restore v3: Move code after assignment of rdev->gart.table_addr so that the GART TLB flush can work as intended, add code comment explaining why we're doing this Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85204 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86267 Reviewed-by: Christian König <christian.koenig@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| | * drm/radeon: Split off gart_get_page_entry ASIC hook from set_page_entryMichel Dänzer2015-01-229-37/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_page_entry calculates the GART page table entry, which is just written to the GART page table by set_page_entry. This is a prerequisite for the following fix. Reviewed-by: Christian König <christian.koenig@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: Don't increment pipe_id in kgd_init_pipelineOded Gabbay2015-01-221-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the behavior of kgd_init_pipeline in that this function shouldn't automatically increase the pipe_id argument by 1 right at the start of the function. This is because the first_pipe value might not be always 1, and because a proper interface function should not hide this info inside its implementation. In other words, the calling function should provide the real pipe_id and not count on kgd_init_pipeline to "fix" it. Signed-off-by: Oded Gabbay <oded.gabbay@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
* | Merge branch 'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux ↵Dave Airlie2015-01-2745-970/+1837
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into drm-next Radeon drm-next changes for 3.20. Highlights: - Indirect draw support for evergreen/NI hw - SMC fan control support for SI/CI - Manual fan control for SI/CI - DP audio support - Lots of code cleanup * 'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux: (45 commits) drm/radeon: make MMU_NOTIFIER optional drm/radeon: use NULL rather then 0 in audio detect drm/radeon: whitespace clean up in radeon_audio.c radeon/audio: enable DP audio radeon/audio: moved audio caps programming to audio_hotplug() function radeon/audio: applied audio_dpms() and audio_mode_set() calls radeon/audio: consolidate audio_mode_set() functions radeon/audio: removed unnecessary debug settings radeon/audio: moved mute programming to a separate function radeon/audio: moved audio packet programming to a separate function radeon/audio: set_avi_packet() function cleanup radeon/audio: removed unnecessary CRC control programing radeon: moved HDMI color depth programming to a separate function radeon/audio: moved VBI packet programming to separate functions radeon/audio: consolidate update_acr() functions (v2) radeon/audio: consolidate update_avi_infoframe() functions radeon/audio: consolidate audio_set_dto() functions radeon/audio: consolidate audio_fini() functions radeon/audio: consolidate audio_enable() functions radeon/audio: consolidate select_pin() functions ...
| * | drm/radeon: make MMU_NOTIFIER optionalRob Clark2015-01-222-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where MMU_NOTIFIER is not available, userptr will not be available. Similar to i915, although not making an exception for CAP_SYS_ADMIN. The proposed userspace patches for userptr seem to handle the fall- back properly, so a userptr-less kernel should not be a problem. Signed-off-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: use NULL rather then 0 in audio detectAlex Deucher2015-01-221-1/+1
| | | | | | | | | | | | Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: whitespace clean up in radeon_audio.cAlex Deucher2015-01-221-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | Clean up some formatting in radeon_audio.c to be more consistent with the rest of the driver. Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | radeon/audio: enable DP audioSlava Grigorev2015-01-225-0/+147
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: moved audio caps programming to audio_hotplug() functionSlava Grigorev2015-01-221-35/+43
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: applied audio_dpms() and audio_mode_set() callsSlava Grigorev2015-01-225-26/+27
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: consolidate audio_mode_set() functionsSlava Grigorev2015-01-228-162/+66
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: removed unnecessary debug settingsSlava Grigorev2015-01-223-18/+0
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: moved mute programming to a separate functionSlava Grigorev2015-01-225-11/+58
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: moved audio packet programming to a separate functionSlava Grigorev2015-01-225-112/+134
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: set_avi_packet() function cleanupSlava Grigorev2015-01-225-79/+59
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: removed unnecessary CRC control programingSlava Grigorev2015-01-222-6/+0
| | | | | | | | | | | | | | | | | | 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>
| * | radeon: moved HDMI color depth programming to a separate functionSlava Grigorev2015-01-225-34/+62
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: moved VBI packet programming to separate functionsAlex Deucher2015-01-225-21/+45
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: consolidate update_acr() functions (v2)Slava Grigorev2015-01-225-133/+183
| | | | | | | | | | | | | | | | | | | | | V2: fix missing dce6 callback Signed-off-by: Slava Grigorev <slava.grigorev@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | radeon/audio: consolidate update_avi_infoframe() functionsSlava Grigorev2015-01-225-22/+34
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: consolidate audio_set_dto() functionsSlava Grigorev2015-01-228-100/+226
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: consolidate audio_fini() functionsSlava Grigorev2015-01-2212-41/+26
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: consolidate audio_enable() functionsSlava Grigorev2015-01-226-26/+28
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: consolidate select_pin() functionsSlava Grigorev2015-01-223-5/+14
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: consolidate audio_get_pin() functionsSlava Grigorev2015-01-225-4/+25
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: consolidate write_latency_fields() functionsSlava Grigorev2015-01-224-39/+44
| | | | | | | | | | | | | | | Signed-off-by: Slava Grigorev <slava.grigorev@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | radeon/audio: consolidate write_speaker_allocation() functionsSlava Grigorev2015-01-225-83/+126
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: consolidate write_sad_regs() functionsAlex Deucher2015-01-225-90/+93
| | | | | | | | | | | | | | | | | | 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>
| * | radeon/audio: defined initial audio interface that gets initialized via ↵Slava Grigorev2015-01-226-7/+136
| | | | | | | | | | | | | | | | | | | | | | | | detect() call 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>
| * | radeon/audio: consolidate audio_init() functionsSlava Grigorev2015-01-2214-105/+138
| | | | | | | | | | | | | | | | | | 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>
| * | drm/radeon: comment out some currently unused 7xx dpm codeAlex Deucher2015-01-222-2/+4
| | | | | | | | | | | | | | | | | | Keep it around for reference. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: comment out some currently unused eg dpm codeAlex Deucher2015-01-221-0/+2
| | | | | | | | | | | | | | | | | | Keep it around for reference. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: comment out some currently unused sumo dpm codeAlex Deucher2015-01-222-3/+4
| | | | | | | | | | | | | | | | | | Keep it around for reference. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: comment out some currently unused tn dpm codeAlex Deucher2015-01-221-0/+2
| | | | | | | | | | | | | | | | | | Keep it around for reference. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: comment out some currently unused btc dpm codeAlex Deucher2015-01-221-0/+2
| | | | | | | | | | | | | | | | | | Keep it around for reference. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: comment out some currently unused ni dpm codeAlex Deucher2015-01-221-0/+2
| | | | | | | | | | | | | | | | | | Keep it around for reference. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: comment out some currently unused kv dpm codeAlex Deucher2015-01-221-0/+2
| | | | | | | | | | | | | | | | | | Keep it around for reference. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: comment out some currently unused si dpm codeAlex Deucher2015-01-221-1/+4
| | | | | | | | | | | | | | | | | | Keep it around for reference. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | drm/radeon: comment out some currently unused ci dpm codeAlex Deucher2015-01-222-0/+6
| | | | | | | | | | | | | | | | | | Keep it around for reference. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | gpu: drm: radeon: radeon_object: Remove unused functionRickard Strandqvist2015-01-222-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | drm/radeon/radeon_fb: Remove unused functionRickard Strandqvist2015-01-222-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the function radeon_fbdev_total_size() 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>
| * | drm/radeon/radeon_i2c: Remove unused functionRickard Strandqvist2015-01-222-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the function radeon_best_encoder() 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>
| * | drm/radeon: enable smc fan control on SIAlex Deucher2015-01-221-1/+0
| | | | | | | | | | | | | | | | | | Working now with Oleg's last round of fixes. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * | fixes for SI fan handlingOleg Chernovskiy2015-01-221-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | drm/radeon: bind fan control on SI cards to hwmon interfaceAlex Deucher2015-01-224-14/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | drm/radeon: bind fan control on CI cards to hwmon interface (v2)Oleg Chernovskiy2015-01-224-10/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | drm/radeon: add hwmon interface for managing fan pwm (v2)Oleg Chernovskiy2015-01-221-1/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
OpenPOWER on IntegriCloud