ni.c (12e04ffcd93b25dfd726d46338c2ee7d23de556e) | ni.c (e49f3959a96dc279860af7e86e6dbcfda50580a5) |
---|---|
1/* 2 * Copyright 2010 Advanced Micro Devices, Inc. 3 * 4 * Permission is hereby granted, free of charge, to any person obtaining a 5 * copy of this software and associated documentation files (the "Software"), 6 * to deal in the Software without restriction, including without limitation 7 * the rights to use, copy, modify, merge, publish, distribute, sublicense, 8 * and/or sell copies of the Software, and to permit persons to whom the --- 2011 unchanged lines hidden (view full) --- 2020 2021 r = radeon_fence_driver_start_ring(rdev, CAYMAN_RING_TYPE_DMA1_INDEX); 2022 if (r) { 2023 dev_err(rdev->dev, "failed initializing DMA fences (%d).\n", r); 2024 return r; 2025 } 2026 2027 /* Enable IRQ */ | 1/* 2 * Copyright 2010 Advanced Micro Devices, Inc. 3 * 4 * Permission is hereby granted, free of charge, to any person obtaining a 5 * copy of this software and associated documentation files (the "Software"), 6 * to deal in the Software without restriction, including without limitation 7 * the rights to use, copy, modify, merge, publish, distribute, sublicense, 8 * and/or sell copies of the Software, and to permit persons to whom the --- 2011 unchanged lines hidden (view full) --- 2020 2021 r = radeon_fence_driver_start_ring(rdev, CAYMAN_RING_TYPE_DMA1_INDEX); 2022 if (r) { 2023 dev_err(rdev->dev, "failed initializing DMA fences (%d).\n", r); 2024 return r; 2025 } 2026 2027 /* Enable IRQ */ |
2028 if (!rdev->irq.installed) { 2029 r = radeon_irq_kms_init(rdev); 2030 if (r) 2031 return r; 2032 } 2033 |
|
2028 r = r600_irq_init(rdev); 2029 if (r) { 2030 DRM_ERROR("radeon: IH init failed (%d).\n", r); 2031 radeon_irq_kms_fini(rdev); 2032 return r; 2033 } 2034 evergreen_irq_set(rdev); 2035 --- 149 unchanged lines hidden (view full) --- 2185 r = evergreen_mc_init(rdev); 2186 if (r) 2187 return r; 2188 /* Memory manager */ 2189 r = radeon_bo_init(rdev); 2190 if (r) 2191 return r; 2192 | 2034 r = r600_irq_init(rdev); 2035 if (r) { 2036 DRM_ERROR("radeon: IH init failed (%d).\n", r); 2037 radeon_irq_kms_fini(rdev); 2038 return r; 2039 } 2040 evergreen_irq_set(rdev); 2041 --- 149 unchanged lines hidden (view full) --- 2191 r = evergreen_mc_init(rdev); 2192 if (r) 2193 return r; 2194 /* Memory manager */ 2195 r = radeon_bo_init(rdev); 2196 if (r) 2197 return r; 2198 |
2193 r = radeon_irq_kms_init(rdev); 2194 if (r) 2195 return r; 2196 | |
2197 ring->ring_obj = NULL; 2198 r600_ring_init(rdev, ring, 1024 * 1024); 2199 2200 ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX]; 2201 ring->ring_obj = NULL; 2202 r600_ring_init(rdev, ring, 64 * 1024); 2203 2204 ring = &rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX]; --- 271 unchanged lines hidden --- | 2199 ring->ring_obj = NULL; 2200 r600_ring_init(rdev, ring, 1024 * 1024); 2201 2202 ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX]; 2203 ring->ring_obj = NULL; 2204 r600_ring_init(rdev, ring, 64 * 1024); 2205 2206 ring = &rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX]; --- 271 unchanged lines hidden --- |