* [PATCH] drm/amdgpu/ttm: fix ifdefs for non-x86
@ 2021-03-15 19:38 Alex Deucher
2021-03-15 19:49 ` Nirmoy
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Alex Deucher @ 2021-03-15 19:38 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
The else clause needs to be CONFIG_64BIT not CONFIG_X86.
Fixes: e98f250bddb5 ("drm/amdgpu: fix compile error on architecture s390")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 158c987696ff..6d5cf0525325 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1731,12 +1731,14 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
/* Change the size here instead of the init above so only lpfn is affected */
amdgpu_ttm_set_buffer_funcs_status(adev, false);
+#ifdef CONFIG_64BIT
#ifdef CONFIG_X86
if (adev->gmc.xgmi.connected_to_cpu)
adev->mman.aper_base_kaddr = ioremap_cache(adev->gmc.aper_base,
adev->gmc.visible_vram_size);
else
+#endif
adev->mman.aper_base_kaddr = ioremap_wc(adev->gmc.aper_base,
adev->gmc.visible_vram_size);
#endif
--
2.30.2
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu/ttm: fix ifdefs for non-x86
2021-03-15 19:38 [PATCH] drm/amdgpu/ttm: fix ifdefs for non-x86 Alex Deucher
@ 2021-03-15 19:49 ` Nirmoy
2021-03-15 20:56 ` Zeng, Oak
2021-03-16 7:34 ` Christian König
2 siblings, 0 replies; 4+ messages in thread
From: Nirmoy @ 2021-03-15 19:49 UTC (permalink / raw)
To: Alex Deucher, amd-gfx
Reviewed-by: Nirmoy Das <nirmoy.das@amd.com>
On 3/15/21 8:38 PM, Alex Deucher wrote:
> The else clause needs to be CONFIG_64BIT not CONFIG_X86.
>
> Fixes: e98f250bddb5 ("drm/amdgpu: fix compile error on architecture s390")
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 158c987696ff..6d5cf0525325 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1731,12 +1731,14 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
>
> /* Change the size here instead of the init above so only lpfn is affected */
> amdgpu_ttm_set_buffer_funcs_status(adev, false);
> +#ifdef CONFIG_64BIT
> #ifdef CONFIG_X86
> if (adev->gmc.xgmi.connected_to_cpu)
> adev->mman.aper_base_kaddr = ioremap_cache(adev->gmc.aper_base,
> adev->gmc.visible_vram_size);
>
> else
> +#endif
> adev->mman.aper_base_kaddr = ioremap_wc(adev->gmc.aper_base,
> adev->gmc.visible_vram_size);
> #endif
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu/ttm: fix ifdefs for non-x86
2021-03-15 19:38 [PATCH] drm/amdgpu/ttm: fix ifdefs for non-x86 Alex Deucher
2021-03-15 19:49 ` Nirmoy
@ 2021-03-15 20:56 ` Zeng, Oak
2021-03-16 7:34 ` Christian König
2 siblings, 0 replies; 4+ messages in thread
From: Zeng, Oak @ 2021-03-15 20:56 UTC (permalink / raw)
To: Deucher, Alexander, amd-gfx
[AMD Official Use Only - Internal Distribution Only]
Reviewed-by: Oak Zeng <Oak.Zeng@amd.com>
Regards,
Oak
On 2021-03-15, 3:39 PM, "amd-gfx on behalf of Alex Deucher" <amd-gfx-bounces@lists.freedesktop.org on behalf of Alexander.Deucher@amd.com> wrote:
The else clause needs to be CONFIG_64BIT not CONFIG_X86.
Fixes: e98f250bddb5 ("drm/amdgpu: fix compile error on architecture s390")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 158c987696ff..6d5cf0525325 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1731,12 +1731,14 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
/* Change the size here instead of the init above so only lpfn is affected */
amdgpu_ttm_set_buffer_funcs_status(adev, false);
+#ifdef CONFIG_64BIT
#ifdef CONFIG_X86
if (adev->gmc.xgmi.connected_to_cpu)
adev->mman.aper_base_kaddr = ioremap_cache(adev->gmc.aper_base,
adev->gmc.visible_vram_size);
else
+#endif
adev->mman.aper_base_kaddr = ioremap_wc(adev->gmc.aper_base,
adev->gmc.visible_vram_size);
#endif
--
2.30.2
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Coak.zeng%40amd.com%7Cceea8bc6256f495cddad08d8e7e9fcde%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637514339444360808%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=Hj63cLZN3bGKvnGDReHKmjpsLJApBE8%2ByO6lKTztkpY%3D&reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu/ttm: fix ifdefs for non-x86
2021-03-15 19:38 [PATCH] drm/amdgpu/ttm: fix ifdefs for non-x86 Alex Deucher
2021-03-15 19:49 ` Nirmoy
2021-03-15 20:56 ` Zeng, Oak
@ 2021-03-16 7:34 ` Christian König
2 siblings, 0 replies; 4+ messages in thread
From: Christian König @ 2021-03-16 7:34 UTC (permalink / raw)
To: Alex Deucher, amd-gfx
Reviewed-by: Christian König <christian.koenig@amd.com>
Am 15.03.21 um 20:38 schrieb Alex Deucher:
> The else clause needs to be CONFIG_64BIT not CONFIG_X86.
>
> Fixes: e98f250bddb5 ("drm/amdgpu: fix compile error on architecture s390")
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 158c987696ff..6d5cf0525325 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1731,12 +1731,14 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
>
> /* Change the size here instead of the init above so only lpfn is affected */
> amdgpu_ttm_set_buffer_funcs_status(adev, false);
> +#ifdef CONFIG_64BIT
> #ifdef CONFIG_X86
> if (adev->gmc.xgmi.connected_to_cpu)
> adev->mman.aper_base_kaddr = ioremap_cache(adev->gmc.aper_base,
> adev->gmc.visible_vram_size);
>
> else
> +#endif
> adev->mman.aper_base_kaddr = ioremap_wc(adev->gmc.aper_base,
> adev->gmc.visible_vram_size);
> #endif
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-16 7:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-15 19:38 [PATCH] drm/amdgpu/ttm: fix ifdefs for non-x86 Alex Deucher
2021-03-15 19:49 ` Nirmoy
2021-03-15 20:56 ` Zeng, Oak
2021-03-16 7:34 ` Christian König
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.