korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 17:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
401,928 Commits 112 Branches 5,274 Tags 4.8 GiB
41971b37d1
Commit Graph

61 Commits

Author SHA1 Message Date
Alex Deucher
9a71677874 drm/radeon: add some additional berlin pci ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
 2013-09-11 11:44:30 -04:00
Dave Airlie
9c725e5bcd Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-next 
Alex writes:
This is the radeon drm-next request.  Big changes include:
- support for dpm on CIK parts
- support for ASPM on CIK parts
- support for berlin GPUs
- major ring handling cleanup
- remove the old 3D blit code for bo moves in favor of CP DMA or sDMA
- lots of bug fixes

[airlied: fix up a bunch of conflicts from drm_order removal]

* 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux: (898 commits)
  drm/radeon/dpm: make sure dc performance level limits are valid (CI)
  drm/radeon/dpm: make sure dc performance level limits are valid (BTC-SI) (v2)
  drm/radeon: gcc fixes for extended dpm tables
  drm/radeon: gcc fixes for kb/kv dpm
  drm/radeon: gcc fixes for ci dpm
  drm/radeon: gcc fixes for si dpm
  drm/radeon: gcc fixes for ni dpm
  drm/radeon: gcc fixes for trinity dpm
  drm/radeon: gcc fixes for sumo dpm
  drm/radeonn: gcc fixes for rv7xx/eg/btc dpm
  drm/radeon: gcc fixes for rv6xx dpm
  drm/radeon: gcc fixes for radeon_atombios.c
  drm/radeon: enable UVD interrupts on CIK
  drm/radeon: fix init ordering for r600+
  drm/radeon/dpm: only need to reprogram uvd if uvd pg is enabled
  drm/radeon: check the return value of uvd_v1_0_start in uvd_v1_0_init
  drm/radeon: split out radeon_uvd_resume from uvd_v4_2_resume
  radeon kms: fix uninitialised hotplug work usage in r100_irq_process()
  drm/radeon/audio: set up the sads on DCE3.2 asics
  drm/radeon: fix handling of variable sized arrays for router objects
  ...

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/i915_gem_dmabuf.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/radeon/cik.c
	drivers/gpu/drm/radeon/ni.c
	drivers/gpu/drm/radeon/r600.c
 2013-09-02 09:31:40 +10:00
Alex Deucher
0431b2742f drm/radeon: add berlin pci ids 
This adds the pci ids for the berlin GPU core.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
 2013-08-30 16:31:08 -04:00
Lespiau, Damien
15f3b9d95b drm: Remove unused PCI ids 
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2013-08-21 12:47:45 +10:00
Alex Deucher
26e2235d5f drm/radeon: add current KB pci ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
 2013-06-27 10:49:14 -04:00
Alex Deucher
516184bd01 drm/radeon: add current Bonaire PCI ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
 2013-06-27 10:49:13 -04:00
Alex Deucher
2a0f90551a drm/radeon: add Hainan pci ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
 2013-05-20 12:09:39 -04:00
Alex Deucher
62d1f92e06 drm/radeon: add new richland pci ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
 2013-05-02 10:01:49 -04:00
Alex Deucher
18932a2841 drm/radeon: add some new SI PCI ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
 2013-05-02 10:01:48 -04:00
Alex Deucher
b75bbaa038 drm/radeon: add Richland pci ids 
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
 2013-03-15 18:47:19 -04:00
Alex Deucher
7271c7f999 drm/radeon: add Oland pci ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
 2013-02-01 19:35:02 -05:00
Alex Deucher
0181bd5dea drm/radeon: add new SI pci id 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
 2012-11-21 18:37:38 -05:00
Alex Deucher
b6aa22db78 drm/radeon: add some new SI PCI ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
 2012-10-23 10:23:49 -04:00
Alex Deucher
2f292004dd drm/radeon: add some new SI pci ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
 2012-08-13 10:50:53 -04:00
Daniel Vetter
26587e6994 drm: kill i915/i830 ids from drm_pciids.h 
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-07-19 22:51:12 -04:00
Dave Airlie
59bbe27ba0 drm: drop comment about this header being autogenerated. 
This comment is well out of date.

Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-06-22 11:04:55 +01:00
Alex Deucher
7aaa61b347 drm/radeon/kms: add new SI PCI ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-06-05 15:11:12 +01:00
Alex Deucher
a2bef8ce82 drm/radeon/kms: add new BTC PCI ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-06-05 15:11:11 +01:00
Alex Deucher
4a6991cc1f drm/radeon/kms: add new Palm, Sumo PCI ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-06-05 15:11:11 +01:00
Alex Deucher
d430f7dbf7 drm/radeon/kms: add new Trinity PCI ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-06-05 15:11:09 +01:00
Alex Deucher
d09b38d431 drm/radeon/kms: add trinity pci ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-21 06:55:58 +00:00
Alex Deucher
fc7dbcc371 drm/radeon/kms: Add SI pci ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2012-03-21 06:55:55 +00:00
Alex Deucher
cd5cfce856 drm/radeon/kms: add some new pci ids 
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=43739

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2011-12-14 12:29:03 +00:00
Alex Deucher
2ed4d9d648 drm/radeon/kms: add some new pci ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2011-12-01 16:34:15 +00:00
Alex Deucher
b872a37437 drm/radeon: add some missing FireMV pci ids 
Noticed by Egbert.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@kernel.org
Cc: Egbert Eich <eich@suse.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2011-11-15 19:43:06 +00:00
Alex Deucher
e3c1620434 drm/radeon/kms: add new NI pci ids 
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2011-07-15 16:10:55 +01:00
Alex Deucher
3b68a26ec0 drm/radeon/kms: add llano pci ids 
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2011-06-02 10:47:39 +10:00
Alex Deucher
e2c85d8e39 drm/radeon/kms: add some new pci ids 
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2011-05-04 09:28:59 +10:00
Alex Deucher
758f231ea2 drm/radeon/kms: add some new ontario pci ids 
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc:stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2011-04-05 09:21:16 +10:00
Alex Deucher
64bc552490 drm/radeon/kms: add cayman pci ids 
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2011-03-03 11:57:06 +10:00
Alex Deucher
63a507800c drm/radeon: remove 0x4243 pci id 
0x4243 is a PCI bridge, not a GPU.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=33815

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2011-02-02 12:50:41 +10:00
Alex Deucher
2b2fd604bd drm/radeon/kms: add NI pci ids 
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2011-01-07 14:11:44 +10:00
Alex Deucher
11fa1618e3 drm/radeon/kms: add Ontario Fusion APU pci ids 
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2010-11-23 09:23:34 +10:00
Dave Airlie
f459ffbdfd drm/radeon: fix PCI ID 5657 to be an RV410 
fixes https://bugzilla.kernel.org/show_bug.cgi?id=19012

cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2010-09-27 09:21:28 +10:00
Alex Deucher
1297c05a8d drm/radeon: add new pci ids 
New evergreen and r7xx ids.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2010-08-05 08:47:00 +10:00
Dave Airlie
79b9517a33 drm/radeon/kms: add FireMV 2400 PCI ID. 
This is an M24/X600 chip.

From RH# 581927

cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2010-04-19 18:53:10 +10:00
Alex Deucher
338e2b1d57 drm/radeon: add new RS880 pci id 
This should go to 2.6.33 stable as well.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2010-03-15 09:22:12 +10:00
Eric Anholt
bad720ff3e drm/i915: Add initial bits for VGA modesetting bringup on Sandybridge. 
Signed-off-by: Eric Anholt <eric@anholt.net>
 2010-02-26 13:23:17 -08:00
Alex Deucher
bcc1c2a1d2 drm/radeon/kms: add initial Evergreen support (Radeon HD 5xxx) 
This adds initial Evergreen KMS support, it doesn't include
any acceleration features or interrupt handling yet.

Major changes are DCE4 handling for PLLs for the > 2 crtcs.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2010-02-09 09:44:02 +10:00
Dave Airlie
c1176d6f03 Merge branch 'drm-next' of ../drm-next into drm-linus 
conflict in radeon since new init path merged with vga arb code.

Conflicts:
	drivers/gpu/drm/radeon/radeon.h
	drivers/gpu/drm/radeon/radeon_asic.h
	drivers/gpu/drm/radeon/radeon_device.c
 2009-10-08 14:03:05 +10:00
Dave Airlie
dfee5614e4 drm/radeon/kms: respect single crtc cards, only create one crtc. (v2) 
Also add single crtc for RN50 chips.

changes in v2:
fix vblank init to respect single crtc flag
fix r100 mode bandwidth to respect single crtc flag

Signed-off-by: Dave Airlie <airlied@redhat.com>
 2009-10-05 10:00:58 +10:00
Fabian Henze
7839c5d551 drm/i915: add B43 chipset support 
Signed-off-by: Fabian Henze <hoacha@quantentunnel.de>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
 2009-09-08 23:33:26 -07:00
Alex Deucher
6502fbfaf8 drm/radeon: Add support for RS880 chips 
These are new AMD IGP chips

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2009-08-05 12:07:09 +10:00
Alex Deucher
7320700df1 drm/radeon: add some new r7xx pci ids 
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
 2009-08-04 13:32:39 +10:00
Alex Deucher
069a9dce38 drm/radeon: add some missing pci ids 
Also, fix ordering for a couple others

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
 2009-07-15 15:48:36 +10:00
Dave Airlie
602c11a8ee drm/radeon: fix mobility flags on new PCI IDs. 
These aren't used that much on r600, but may be needed in the future,
so get them correct now.

Signed-off-by: Dave Airlie <airlied@redhat.com>
 2009-06-15 09:28:32 +10:00
Alex Deucher
715cbb05c9 drm/radeon: add support for RV790. 
This adds the PCI IDs for the rv790 which are equiv to the rv770.

Signed-off-by: Dave Airlie <airlied@redhat.com>
 2009-06-12 15:56:30 +10:00
Alex Deucher
2a71ebcd85 drm/radeon: add rv740 drm support. 
This adds drm support for the RV740 family of chips to the r600 support code.

Signed-off-by: Dave Airlie <airlied@redhat.com>
 2009-06-12 15:56:28 +10:00
Zhenyu Wang
80a538e49d drm/i915: Enable probe on new chipset 
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
 2009-06-09 11:15:40 -07:00
Zhenyu Wang
7202178867 drm/i915: add support for G41 chipset 
This had been delayed for some time due to failure to work on the one piece
of G41 hardware we had, and lack of success reports from anybody else.
Current hardware appears to be OK.

Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
[anholt: hand-applied due to conflicts with IGD patches]
Signed-off-by: Eric Anholt <eric@anholt.net>
 2009-04-21 17:22:53 -07:00