[PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[Oak Zeng]

ioremap_cache is not supported on some architecture
such as s390. Put the codes into a #ifdef to fix
some compile error reported by test robot.

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reported-by: Kernel test robot <lkp@intel.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 37751e7..1091585 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1817,7 +1817,7 @@ 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);
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[Oak Zeng]

ioremap_cache is not supported on some architecture
such as s390. Put the codes into a #ifdef to fix
some compile error reported by test robot.

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reported-by: Kernel test robot <lkp@intel.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 37751e7..1091585 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1817,7 +1817,7 @@ 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);
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 2/2] drm/amdgpu: fix a few compiler warnings

[Oak Zeng]

1. make function mmhub_v1_7_setup_vm_pt_regs static
2. indent a if statement

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 4 ++--
 drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
index 3b4193c..8fca72e 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
@@ -88,14 +88,14 @@ int gfxhub_v1_1_get_xgmi_info(struct amdgpu_device *adev)
 		adev->gmc.xgmi.num_physical_nodes = max_region + 1;
 
 		if (adev->gmc.xgmi.num_physical_nodes > max_num_physical_nodes)
-		return -EINVAL;
+			return -EINVAL;
 
 		adev->gmc.xgmi.physical_node_id =
 		REG_GET_FIELD(xgmi_lfb_cntl, MC_VM_XGMI_LFB_CNTL,
 			      PF_LFB_REGION);
 
 		if (adev->gmc.xgmi.physical_node_id > max_physical_node_id)
-		return -EINVAL;
+			return -EINVAL;
 
 		adev->gmc.xgmi.node_segment_size = seg_size;
 	}
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
index ac74d66..29d7f50 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
@@ -53,7 +53,7 @@ static u64 mmhub_v1_7_get_fb_location(struct amdgpu_device *adev)
 	return base;
 }
 
-void mmhub_v1_7_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,
+static void mmhub_v1_7_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,
 				uint64_t page_table_base)
 {
 	struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0];
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 2/2] drm/amdgpu: fix a few compiler warnings

[Oak Zeng]

1. make function mmhub_v1_7_setup_vm_pt_regs static
2. indent a if statement

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 4 ++--
 drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
index 3b4193c..8fca72e 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
@@ -88,14 +88,14 @@ int gfxhub_v1_1_get_xgmi_info(struct amdgpu_device *adev)
 		adev->gmc.xgmi.num_physical_nodes = max_region + 1;
 
 		if (adev->gmc.xgmi.num_physical_nodes > max_num_physical_nodes)
-		return -EINVAL;
+			return -EINVAL;
 
 		adev->gmc.xgmi.physical_node_id =
 		REG_GET_FIELD(xgmi_lfb_cntl, MC_VM_XGMI_LFB_CNTL,
 			      PF_LFB_REGION);
 
 		if (adev->gmc.xgmi.physical_node_id > max_physical_node_id)
-		return -EINVAL;
+			return -EINVAL;
 
 		adev->gmc.xgmi.node_segment_size = seg_size;
 	}
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
index ac74d66..29d7f50 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
@@ -53,7 +53,7 @@ static u64 mmhub_v1_7_get_fb_location(struct amdgpu_device *adev)
 	return base;
 }
 
-void mmhub_v1_7_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,
+static void mmhub_v1_7_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,
 				uint64_t page_table_base)
 {
 	struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0];
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[Christian König]

Am 11.03.21 um 04:29 schrieb Oak Zeng:
> ioremap_cache is not supported on some architecture
> such as s390. Put the codes into a #ifdef to fix
> some compile error reported by test robot.
>
> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
> Reported-by: Kernel test robot <lkp@intel.com>

Reviewed-by: Christian König <christian.koenig@amd.com> for the series.

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 37751e7..1091585 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1817,7 +1817,7 @@ 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);

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[Christian König]

Am 11.03.21 um 04:29 schrieb Oak Zeng:
> ioremap_cache is not supported on some architecture
> such as s390. Put the codes into a #ifdef to fix
> some compile error reported by test robot.
>
> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
> Reported-by: Kernel test robot <lkp@intel.com>

Reviewed-by: Christian König <christian.koenig@amd.com> for the series.

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 37751e7..1091585 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1817,7 +1817,7 @@ 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);

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 2/2] drm/amdgpu: fix a few compiler warnings

[Bhardwaj, Rajneesh]

[AMD Official Use Only - Internal Distribution Only]

Reviewed-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>

-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Oak Zeng
Sent: Wednesday, March 10, 2021 10:29 PM
To: dri-devel@lists.freedesktop.org; amd-gfx@lists.freedesktop.org
Cc: Zeng, Oak <Oak.Zeng@amd.com>
Subject: [PATCH 2/2] drm/amdgpu: fix a few compiler warnings

[CAUTION: External Email]

1. make function mmhub_v1_7_setup_vm_pt_regs static 2. indent a if statement

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 4 ++--  drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
index 3b4193c..8fca72e 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
@@ -88,14 +88,14 @@ int gfxhub_v1_1_get_xgmi_info(struct amdgpu_device *adev)
                adev->gmc.xgmi.num_physical_nodes = max_region + 1;

                if (adev->gmc.xgmi.num_physical_nodes > max_num_physical_nodes)
-               return -EINVAL;
+                       return -EINVAL;

                adev->gmc.xgmi.physical_node_id =
                REG_GET_FIELD(xgmi_lfb_cntl, MC_VM_XGMI_LFB_CNTL,
                              PF_LFB_REGION);

                if (adev->gmc.xgmi.physical_node_id > max_physical_node_id)
-               return -EINVAL;
+                       return -EINVAL;

                adev->gmc.xgmi.node_segment_size = seg_size;
        }
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
index ac74d66..29d7f50 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
@@ -53,7 +53,7 @@ static u64 mmhub_v1_7_get_fb_location(struct amdgpu_device *adev)
        return base;
 }

-void mmhub_v1_7_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,
+static void mmhub_v1_7_setup_vm_pt_regs(struct amdgpu_device *adev, 
+uint32_t vmid,
                                uint64_t page_table_base)  {
        struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0];
--
2.7.4

_______________________________________________
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&amp;data=04%7C01%7Crajneesh.bhardwaj%40amd.com%7C8f296a25634a47c40dde08d8e43dde97%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637510301669209178%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=ucX2H8f4HhlXKJ4OBcZZwjfBTBAXYDSrGpPF%2BK1JOLw%3D&amp;reserved=0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

RE: [PATCH 2/2] drm/amdgpu: fix a few compiler warnings

[Bhardwaj, Rajneesh]

[AMD Official Use Only - Internal Distribution Only]

Reviewed-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>

-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Oak Zeng
Sent: Wednesday, March 10, 2021 10:29 PM
To: dri-devel@lists.freedesktop.org; amd-gfx@lists.freedesktop.org
Cc: Zeng, Oak <Oak.Zeng@amd.com>
Subject: [PATCH 2/2] drm/amdgpu: fix a few compiler warnings

[CAUTION: External Email]

1. make function mmhub_v1_7_setup_vm_pt_regs static 2. indent a if statement

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c | 4 ++--  drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
index 3b4193c..8fca72e 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_1.c
@@ -88,14 +88,14 @@ int gfxhub_v1_1_get_xgmi_info(struct amdgpu_device *adev)
                adev->gmc.xgmi.num_physical_nodes = max_region + 1;

                if (adev->gmc.xgmi.num_physical_nodes > max_num_physical_nodes)
-               return -EINVAL;
+                       return -EINVAL;

                adev->gmc.xgmi.physical_node_id =
                REG_GET_FIELD(xgmi_lfb_cntl, MC_VM_XGMI_LFB_CNTL,
                              PF_LFB_REGION);

                if (adev->gmc.xgmi.physical_node_id > max_physical_node_id)
-               return -EINVAL;
+                       return -EINVAL;

                adev->gmc.xgmi.node_segment_size = seg_size;
        }
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
index ac74d66..29d7f50 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
@@ -53,7 +53,7 @@ static u64 mmhub_v1_7_get_fb_location(struct amdgpu_device *adev)
        return base;
 }

-void mmhub_v1_7_setup_vm_pt_regs(struct amdgpu_device *adev, uint32_t vmid,
+static void mmhub_v1_7_setup_vm_pt_regs(struct amdgpu_device *adev, 
+uint32_t vmid,
                                uint64_t page_table_base)  {
        struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_MMHUB_0];
--
2.7.4

_______________________________________________
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&amp;data=04%7C01%7Crajneesh.bhardwaj%40amd.com%7C8f296a25634a47c40dde08d8e43dde97%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637510301669209178%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=ucX2H8f4HhlXKJ4OBcZZwjfBTBAXYDSrGpPF%2BK1JOLw%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[Nirmoy]

Wouldn't this restrict amdgpu for only x86 platform?

On 3/11/21 4:29 AM, Oak Zeng wrote:
> ioremap_cache is not supported on some architecture
> such as s390. Put the codes into a #ifdef to fix
> some compile error reported by test robot.
>
> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
> Reported-by: Kernel test robot <lkp@intel.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 37751e7..1091585 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1817,7 +1817,7 @@ 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);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[Deucher, Alexander]

[AMD Public Use]

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of
> Nirmoy
> Sent: Monday, March 15, 2021 2:43 PM
> To: Zeng, Oak <Oak.Zeng@amd.com>; amd-gfx@lists.freedesktop.org
> Subject: Re: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390
> 
> Wouldn't this restrict amdgpu for only x86 platform?

This particular case will only be x86.

Alex

> 
> On 3/11/21 4:29 AM, Oak Zeng wrote:
> > ioremap_cache is not supported on some architecture such as s390. Put
> > the codes into a #ifdef to fix some compile error reported by test
> > robot.
> >
> > Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
> > Reported-by: Kernel test robot <lkp@intel.com>
> > ---
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > index 37751e7..1091585 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > @@ -1817,7 +1817,7 @@ 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);
> _______________________________________________
> 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&amp;data=04%7C01%7Calexander.deucher%40amd.com%7C6fab18a743
> c84b8abbd008d8e7e21e10%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
> C0%7C637514305648085244%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
> p;sdata=KLYRSc45rllptRvyiOF18qA9IFt5zAGXL1zsHasgdLs%3D&amp;reserved
> =0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[Nirmoy]

Hi Alex,

On 3/15/21 7:46 PM, Deucher, Alexander wrote:
> [AMD Public Use]
>
>> -----Original Message-----
>> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of
>> Nirmoy
>> Sent: Monday, March 15, 2021 2:43 PM
>> To: Zeng, Oak <Oak.Zeng@amd.com>; amd-gfx@lists.freedesktop.org
>> Subject: Re: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390
>>
>> Wouldn't this restrict amdgpu for only x86 platform?
> This particular case will only be x86.


If I understand correctly, we map all the VRAM at startup to avoid

mapping each BOs. Can't we do that for other Archs ?


Nirmoy


>
> Alex
>
>> On 3/11/21 4:29 AM, Oak Zeng wrote:
>>> ioremap_cache is not supported on some architecture such as s390. Put
>>> the codes into a #ifdef to fix some compile error reported by test
>>> robot.
>>>
>>> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
>>> Reported-by: Kernel test robot <lkp@intel.com>
>>> ---
>>>    drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>> index 37751e7..1091585 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>>> @@ -1817,7 +1817,7 @@ 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);
>> _______________________________________________
>> 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&amp;data=04%7C01%7Calexander.deucher%40amd.com%7C6fab18a743
>> c84b8abbd008d8e7e21e10%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
>> C0%7C637514305648085244%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
>> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
>> p;sdata=KLYRSc45rllptRvyiOF18qA9IFt5zAGXL1zsHasgdLs%3D&amp;reserved
>> =0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[Deucher, Alexander]

[AMD Public Use]

> -----Original Message-----
> From: Das, Nirmoy <Nirmoy.Das@amd.com>
> Sent: Monday, March 15, 2021 3:17 PM
> To: Deucher, Alexander <Alexander.Deucher@amd.com>; Das, Nirmoy
> <Nirmoy.Das@amd.com>; Zeng, Oak <Oak.Zeng@amd.com>; amd-
> gfx@lists.freedesktop.org
> Subject: Re: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390
> 
> Hi Alex,
> 
> On 3/15/21 7:46 PM, Deucher, Alexander wrote:
> > [AMD Public Use]
> >
> >> -----Original Message-----
> >> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of
> >> Nirmoy
> >> Sent: Monday, March 15, 2021 2:43 PM
> >> To: Zeng, Oak <Oak.Zeng@amd.com>; amd-gfx@lists.freedesktop.org
> >> Subject: Re: [PATCH 1/2] drm/amdgpu: fix compile error on
> >> architecture s390
> >>
> >> Wouldn't this restrict amdgpu for only x86 platform?
> > This particular case will only be x86.
> 
> 
> If I understand correctly, we map all the VRAM at startup to avoid
> 
> mapping each BOs. Can't we do that for other Archs ?

You are right.  The else should be CONFIG_64BIT not CONFIG_X86.  @Zeng, Oak can you fix this up?

Alex


> 
> 
> Nirmoy
> 
> 
> >
> > Alex
> >
> >> On 3/11/21 4:29 AM, Oak Zeng wrote:
> >>> ioremap_cache is not supported on some architecture such as s390.
> >>> Put the codes into a #ifdef to fix some compile error reported by
> >>> test robot.
> >>>
> >>> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
> >>> Reported-by: Kernel test robot <lkp@intel.com>
> >>> ---
> >>>    drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
> >>>    1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> >>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> >>> index 37751e7..1091585 100644
> >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> >>> @@ -1817,7 +1817,7 @@ 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);
> >> _______________________________________________
> >> 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&amp;data=04%7C01%7Calexander.deucher%40amd.com%7C6fab18a743
> >>
> c84b8abbd008d8e7e21e10%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
> >>
> C0%7C637514305648085244%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
> >>
> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
> >>
> p;sdata=KLYRSc45rllptRvyiOF18qA9IFt5zAGXL1zsHasgdLs%3D&amp;reserved
> >> =0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[Deucher, Alexander]

[AMD Public Use]

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of
> Deucher, Alexander
> Sent: Monday, March 15, 2021 3:24 PM
> To: Das, Nirmoy <Nirmoy.Das@amd.com>; Zeng, Oak
> <Oak.Zeng@amd.com>; amd-gfx@lists.freedesktop.org
> Subject: RE: [PATCH 1/2] drm/amdgpu: fix compile error on architecture s390
> 
> [AMD Public Use]
> 
> > -----Original Message-----
> > From: Das, Nirmoy <Nirmoy.Das@amd.com>
> > Sent: Monday, March 15, 2021 3:17 PM
> > To: Deucher, Alexander <Alexander.Deucher@amd.com>; Das, Nirmoy
> > <Nirmoy.Das@amd.com>; Zeng, Oak <Oak.Zeng@amd.com>; amd-
> > gfx@lists.freedesktop.org
> > Subject: Re: [PATCH 1/2] drm/amdgpu: fix compile error on architecture
> > s390
> >
> > Hi Alex,
> >
> > On 3/15/21 7:46 PM, Deucher, Alexander wrote:
> > > [AMD Public Use]
> > >
> > >> -----Original Message-----
> > >> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of
> > >> Nirmoy
> > >> Sent: Monday, March 15, 2021 2:43 PM
> > >> To: Zeng, Oak <Oak.Zeng@amd.com>; amd-gfx@lists.freedesktop.org
> > >> Subject: Re: [PATCH 1/2] drm/amdgpu: fix compile error on
> > >> architecture s390
> > >>
> > >> Wouldn't this restrict amdgpu for only x86 platform?
> > > This particular case will only be x86.
> >
> >
> > If I understand correctly, we map all the VRAM at startup to avoid
> >
> > mapping each BOs. Can't we do that for other Archs ?
> 
> You are right.  The else should be CONFIG_64BIT not CONFIG_X86.  @Zeng,
> Oak can you fix this up?

Just sent out the fix.

Alex

> 
> Alex
> 
> 
> >
> >
> > Nirmoy
> >
> >
> > >
> > > Alex
> > >
> > >> On 3/11/21 4:29 AM, Oak Zeng wrote:
> > >>> ioremap_cache is not supported on some architecture such as s390.
> > >>> Put the codes into a #ifdef to fix some compile error reported by
> > >>> test robot.
> > >>>
> > >>> Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
> > >>> Reported-by: Kernel test robot <lkp@intel.com>
> > >>> ---
> > >>>    drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
> > >>>    1 file changed, 1 insertion(+), 1 deletion(-)
> > >>>
> > >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > >>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > >>> index 37751e7..1091585 100644
> > >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> > >>> @@ -1817,7 +1817,7 @@ 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);
> > >> _______________________________________________
> > >> 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&amp;data=04%7C01%7Calexander.deucher%40amd.com%7C6fab18a743
> > >>
> >
> c84b8abbd008d8e7e21e10%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
> > >>
> >
> C0%7C637514305648085244%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
> > >>
> >
> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
> > >>
> >
> p;sdata=KLYRSc45rllptRvyiOF18qA9IFt5zAGXL1zsHasgdLs%3D&amp;reserved
> > >> =0
> _______________________________________________
> 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&amp;data=04%7C01%7Calexander.deucher%40amd.com%7Cb8ba85a6c5
> 2449ad7ea908d8e7e7f43e%7C3dd8961fe4884e608e11a82d994e183d%7C0%7
> C0%7C637514330707623225%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4w
> LjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&am
> p;sdata=k0wrS%2BIRR7D%2B7%2FA4S%2B%2F3Hcrb6VWJueVibaFaKlStNic%3
> D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 1/2] drm/amdgpu: fix compile error on architecture s390

[Oak Zeng]

ioremap_cache is not supported on some architecture
such as s390. Put the codes into a #ifdef to fix
some compile error reported by test robot.

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reported-by: Kernel test robot <lkp@intel.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 37751e7..1091585 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1817,7 +1817,7 @@ 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);
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel