• Dave Airlie's avatar
    Merge remote branch 'korg/drm-radeon-testing' into drm-next-stage · eb6b6d7c
    Dave Airlie authored
    * 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
    eb6b6d7c
radeon_ring.c 11.6 KB