diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-27 02:14:15 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-27 02:14:15 +0300 |
| commit | f43dff0ee00a259f524ce17ba4f8030553c66590 (patch) | |
| tree | a26355ed5a6a7df27e885b5beb4a9ff49b6b49fb /drivers/gpu/drm/radeon | |
| parent | e37bfa1aac6dd98ad17d98b4691c40ff561ba410 (diff) | |
| parent | f9dcced8d49804081850f78b2336c83cf050eeab (diff) | |
| download | linux-f43dff0ee00a259f524ce17ba4f8030553c66590.tar.xz | |
Merge tag 'drm-amdkfd-next-fixes-2015-01-25' of git://people.freedesktop.org/~gabbayo/linux into drm-next
Here is a pull request of fixes for 3.20 patches, including the fix you asked
me when you merged the previous pull request.
* tag 'drm-amdkfd-next-fixes-2015-01-25' of git://people.freedesktop.org/~gabbayo/linux:
drm/amdkfd: change amdkfd version to 0.7.1
drm/radeon: cik_sdma_ctx_switch_enable() can be static
drm/amdkfd: Fix sparse errors
drm/amdkfd: Handle case of invalid queue type
drm/amdkfd: Add break at the end of case
drm/amdkfd: Remove negative check of uint variable
Diffstat (limited to 'drivers/gpu/drm/radeon')
| -rw-r--r-- | drivers/gpu/drm/radeon/cik_sdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 479519c24a1f..7d2ff31c35a5 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -290,7 +290,7 @@ static void cik_sdma_rlc_stop(struct radeon_device *rdev) * * Halt or unhalt the async dma engines (CIK). */ -void cik_sdma_ctx_switch_enable(struct radeon_device *rdev, bool enable) +static void cik_sdma_ctx_switch_enable(struct radeon_device *rdev, bool enable) { uint32_t reg_offset, value; int i; |