David Howells
760285e7e7
UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/
...
Convert #include "..." to #include <path/...> in drivers/gpu/.
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Dave Airlie <airlied@redhat.com >
Acked-by: Arnd Bergmann <arnd@arndb.de >
Acked-by: Thomas Gleixner <tglx@linutronix.de >
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com >
Acked-by: Dave Jones <davej@redhat.com >
2012-10-02 18:01:07 +01:00
Rafał Miłecki
6b53a0507b
drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)
...
After recent changes HDMI code is ready to be enabled on DCE5. This
patch just changes conditions to execute already present code on DCE5.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Tested-by: Christian König <christian.koenig@amd.com >
Tested-by: Andre Heider <a.heider@gmail.com >
Tested-by: Zoltán Böszörményi <zboszor@pr.hu >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2012-06-16 11:21:19 +01:00
Rafał Miłecki
0aecb5a4ba
drm/radeon/audio: don't hardcode CRTC id
...
This is based on info released by AMD, should allow using audio in much
more cases.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Cc: <stable@vger.kernel.org >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2012-06-05 09:25:01 +01:00
Rafał Miłecki
3299de9558
drm/radeon/hdmi: compile audio status in 1 function
...
This optmizes calls, registers reads and assignments.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2012-05-22 10:14:16 +01:00
Rafał Miłecki
cfcbd6d3de
drm/radeon/hdmi: use new AFMT structs
...
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2012-05-17 12:16:03 +01:00
Rafał Miłecki
a92553abe5
drm/radeon/kms: move audio params to separated struct
...
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Tested-by: Christian König <deathsimple@vodafone.de >
Reviewed-by: Christian König <deathsimple@vodafone.de >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2012-05-01 10:57:36 +01:00
Alex Deucher
f122c6109b
drm/radeon/kms: fix up audio interrupt handling
...
- add support for rs6xx
- add support for DCE4/5
- fixup 6xx/7xx
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2012-04-24 09:50:14 +01:00
Rafał Miłecki
69d2ae574b
drm/radeon/kms: support for audio on Evergreen
...
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2011-12-19 18:40:26 +00:00
Rafał Miłecki
ebcb796fa6
drm/radeon/kms: minor HDMI audio cleanups
...
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2011-12-19 18:40:17 +00:00
Daniel Vetter
3574dda485
radeon: consolidate asic-specific function decls for r600 & later
...
Now all the asic specific stuff ist mostly hid in radeon_asic.*
Reviewed-by: Alex Deucher <alexdeucher@gmail.com >
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2011-02-23 10:35:20 +10:00
Rafał Miłecki
219de62a16
drm/radeon/kms: trivial code style fixes for audio
...
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-08-02 10:17:10 +10:00
Rafał Miłecki
7eea7e9eea
drm/radeon/kms: track audio engine state, do not use not setup timer
...
This is needed to enable audio support on devices using polling. In case user
decides to disable audio (module parameter) we still will try to use timer in
r600_audio_enable_polling. This would lead to BUG in kernel/timer.c.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-08-02 10:00:06 +10:00
Christian Koenig
f2594933df
drm/radeon/kms: HDMI irq support
...
Implements irq support for HDMI audio output. Now the polling timer
is only enabled if irq support isn't available.
Signed-off-by: Christian König <deathsimple@vodafone.de >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-04-23 14:12:17 +10:00
Christian König
58bd086313
drm/radeon/kms: rework audio polling timer
...
Rework HDMI audio polling timer, only enable it when
at least one HDMI encoder needs it. Preparation for
replacing it with irq support.
Signed-off-by: Christian König <deathsimple@vodafone.de >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-04-23 14:11:17 +10:00
Alex Deucher
16823d16f5
drm/radeon/kms/evergreen: don't enable hdmi audio stuff
...
Signed-off-by: Alex Deucher <alexdeucher@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-04-19 11:59:41 +10:00
Rafał Miłecki
3fe373d98c
drm/radeon/kms: improve coding style a little
...
We still have many magic numbers in HDMI/audio to define
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-03-15 10:05:55 +10:00
Rafał Miłecki
0a7d934e60
drm/radeon/kms: remove dead audio/HDMI code
...
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-03-15 10:05:36 +10:00
Rafał Miłecki
2cd6218cb8
drm/radeon/kms: clean assigning HDMI blocks to encoders
...
We almost always used first HDMI block for first encoder and second for sencod.
Exception was KLDSCP_LVTMA. Analyzing code picking DIG encoder shows the same
behaviour. It shows HDMI block are related to DIGs, which relation we now use.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-03-15 10:03:57 +10:00
Rafał Miłecki
6d9c135136
drm/radeon/kms: do not disable audio engine twice
...
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-03-01 16:09:43 +10:00
Rafał Miłecki
3464f11496
Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730"
...
This commit "disabled" audio on RV710 and RV740 only, leaving RV770 and RV730.
The order is: CHIP_RV770 < CHIP_RV730 < CHIP_RV710 < CHIP_RV740.
It is not needed anway, as we do not even try to enable audio on RV770 and
newer. We call initializing function in r600.c only, not in rv770.c.
If there is something causing green tinges, it's HDMI mode setting for encoder
and I will try to debug that.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-03-01 16:09:41 +10:00
Rafał Miłecki
c8792d5e6c
drm/radeon/kms: do not preset audio stuff and start timer when not using audio
...
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-03-01 16:09:40 +10:00
Dave Airlie
eb6b6d7cdd
Merge remote branch 'korg/drm-radeon-testing' into drm-next-stage
...
* korg/drm-radeon-testing: (62 commits)
drm/radeon/kms: update new pll algo
drm/radeon/kms: add support for square microtiles on r3xx-r5xx
drm/radeon/kms: force pinning buffer into visible VRAM
drm/radeon/kms/evergreen: fix typo in cursor code
drm/radeon/kms: implement reading active PCIE lanes on R600+
drm/radeon/kms: for downclocking non-mobility check PERFORMANCE state
drm/radeon/kms: simplify storing current and requested PM mode
drm/radeon: fixes for r6xx/r7xx gfx init
drm/radeon/rv740: fix backend setup
drm/radeon/kms: fix R3XX/R4XX memory controller initialization
[rfc] drm/radeon/kms: pm debugging check for vbl.
drm/radeon: Fix memory allocation failures in the preKMS command stream checking.
drm: Add generic multipart buffer.
drm/radeon/kms: simplify memory controller setup V2
drm/radeon: Add asic hook for dma copy to r200 cards.
drm/radeon/kms: Create asic structure for r300 pcie cards.
drm/radeon/kms: remove unused r600_gart_clear_page
drm/radeon/kms: remove HDP flushes from fence emit (v2)
drm/radeon/kms: add LVDS pll quirk for Dell Studio 15
drm/radeon/kms: simplify picking power state
...
Conflicts:
drivers/gpu/drm/radeon/atom.c
drivers/gpu/drm/radeon/atombios.h
drivers/gpu/drm/radeon/atombios_dp.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/r600_audio.c
drivers/gpu/drm/radeon/r600_cp.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_connectors.c
drivers/gpu/drm/radeon/radeon_ring.c
drivers/gpu/drm/radeon/rv770.c
2010-02-26 16:23:23 +10:00
Rafał Miłecki
5230aea62c
drm/radeon/kms: isolate audio engine management, change fini order
...
We should stop audio-state-reading timer before we turn off engine
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-02-18 14:23:40 +10:00
Rafał Miłecki
38fd2c6ff5
drm/radeon/kms: suspend and resume audio stuff
...
Fixes FDO bug #26214
Signed-off-by: Rafał Miłecki <zajec5@gmail.com >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-02-05 15:26:19 +10:00
Dave Airlie
23fff28a9b
drm/radeon/kms: disable HDMI audio for now on rv710/rv730
...
Support isn't correct yet and we are getting green tinges on the
displays.
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-02-05 11:57:42 +10:00
Christian Koenig
dafc3bd515
drm/radeon/kms: HDMI support for R600 KMS
...
Adding basic HDMI support for R600 KMS, ported from radeonhd ddx.
[airlied:- checkpatch cleanups]
Signed-off-by: Christian Koenig <deathsimple@vodafone.de >
Signed-off-by: Dave Airlie <airlied@redhat.com >
2009-12-16 15:46:48 +10:00