Merge tag 'v3.14.31' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.14.y

This is the 3.14.31 stable release

* tag 'v3.14.31' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (77 commits)
  Linux 3.14.31
  md/raid5: fetch_block must fetch all the blocks handle_stripe_dirtying wants.
  mm: get rid of radix tree gfp mask for pagecache_get_page
  mm: page_alloc: reduce cost of the fair zone allocation policy
  mm: page_alloc: abort fair zone allocation policy when remotes nodes are encountered
  mm: vmscan: only update per-cpu thresholds for online CPU
  mm: move zone->pages_scanned into a vmstat counter
  mm: rearrange zone fields into read-only, page alloc, statistics and page reclaim lines
  mm: pagemap: avoid unnecessary overhead when tracepoints are deactivated
  memcg, vmscan: Fix forced scan of anonymous pages
  vmalloc: use rcu list iterator to reduce vmap_area_lock contention
  mm: make copy_pte_range static again
  mm, thp: only collapse hugepages to nodes with affinity for zone_reclaim_mode
  mm/memory.c: use entry = ACCESS_ONCE(*pte) in handle_pte_fault()
  shmem: fix init_page_accessed use to stop !PageLRU bug
  mm: avoid unnecessary atomic operations during end_page_writeback()
  mm: non-atomically mark page accessed during page cache allocation where possible
  fs: buffer: do not use unnecessary atomic operations when discarding buffers
  mm: do not use unnecessary atomic operations when adding pages to the LRU
  mm: do not use atomic operations when releasing pages
  ...

Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>

1 files changed, 16 insertions, 2 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 5600d4c5f98..64d6cfba995 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -335,6 +335,20 @@ static struct radeon_asic_ring r300_gfx_ring = {
 	.set_wptr = &r100_gfx_set_wptr,
 };
 
+static struct radeon_asic_ring rv515_gfx_ring = {
+	.ib_execute = &r100_ring_ib_execute,
+	.emit_fence = &r300_fence_ring_emit,
+	.emit_semaphore = &r100_semaphore_ring_emit,
+	.cs_parse = &r300_cs_parse,
+	.ring_start = &rv515_ring_start,
+	.ring_test = &r100_ring_test,
+	.ib_test = &r100_ib_test,
+	.is_lockup = &r100_gpu_is_lockup,
+	.get_rptr = &r100_gfx_get_rptr,
+	.get_wptr = &r100_gfx_get_wptr,
+	.set_wptr = &r100_gfx_set_wptr,
+};
+
 static struct radeon_asic r300_asic = {
 	.init = &r300_init,
 	.fini = &r300_fini,
@@ -756,7 +770,7 @@ static struct radeon_asic rv515_asic = {
 		.set_page = &rv370_pcie_gart_set_page,
 	},
 	.ring = {
-		[RADEON_RING_TYPE_GFX_INDEX] = &r300_gfx_ring
+		[RADEON_RING_TYPE_GFX_INDEX] = &rv515_gfx_ring
 	},
 	.irq = {
 		.set = &rs600_irq_set,
@@ -823,7 +837,7 @@ static struct radeon_asic r520_asic = {
 		.set_page = &rv370_pcie_gart_set_page,
 	},
 	.ring = {
-		[RADEON_RING_TYPE_GFX_INDEX] = &r300_gfx_ring
+		[RADEON_RING_TYPE_GFX_INDEX] = &rv515_gfx_ring
 	},
 	.irq = {
 		.set = &rs600_irq_set,