drm/radeon/cik: fix CP jump table size
authorAlex Deucher <alexander.deucher@amd.com>
Thu, 9 Jun 2016 21:27:36 +0000 (17:27 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 7 Jul 2016 18:51:30 +0000 (14:51 -0400)
Align to the jump table offset. May fix hangs on some
asics with GFX PG enabled.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Acked-by: Tom St Denis <tom.stdenis@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/cik.c

index 3beac4e..0c1b9ff 100644 (file)
@@ -8366,7 +8366,7 @@ static int cik_startup(struct radeon_device *rdev)
                }
        }
        rdev->rlc.cs_data = ci_cs_data;
-       rdev->rlc.cp_table_size = CP_ME_TABLE_SIZE * 5 * 4; /* CP JT */
+       rdev->rlc.cp_table_size = ALIGN(CP_ME_TABLE_SIZE * 5 * 4, 2048); /* CP JT */
        rdev->rlc.cp_table_size += 64 * 1024; /* GDS */
        r = sumo_rlc_init(rdev);
        if (r) {