Skip to contentSkip to conversation

drm/amdgpu: Fix error in amdgpu_bo_create_restricted()

PATCH In review Nils Holland 3 participants 5 messages Jan 24, 2017 4 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: Fix error in amdgpu_bo_create_restricted()

So I decided to fix this with the following follow-up patch. I hope this is the right approach (vs. reverting the commit and instead using a fixed v2 of the original patch).

From 41775d2c8a14873f522667a57b66cfbe119e28a4 Mon Sep 17 00:00:00 2001
From: Nils Holland <[email protected]>
Date: Tue, 24 Jan 2017 01:36:45 +0100
Subject: [PATCH] drm/amdgpu: Fix error in amdgpu_bo_create_restricted()

Remove mistakedly placed ; that prevents the code from compiling. No functional change.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
index f71fe41c1c99..89d32131e3f5 100644
@@ -377,7 +377,7 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,
 #warning Please enable CONFIG_MTRR and CONFIG_X86_PAT for better performance \
 	 thanks to write-combining
 
-	if (bo->flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC;)
+	if (bo->flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC)
 		DRM_INFO_ONCE("Please enable CONFIG_MTRR and CONFIG_X86_PAT for "
 			      "better performance thanks to write-combining\n");
 	bo->flags &= ~AMDGPU_GEM_CREATE_CPU_GTT_USWC;
Signature · 8 lines
2.11.0

Greetings
Nils
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20170124005551.GA22069-iI9p2NPcQ/[email protected]

Reviewed-by
#2 lore raw
Quoted 8 lines · Nils Holland

So I decided to fix this with the following follow-up patch. I hope this is the right approach (vs. reverting the commit and instead using a fixed v2 of the original patch).

From 41775d2c8a14873f522667a57b66cfbe119e28a4 Mon Sep 17 00:00:00 2001
From: Nils Holland <[email protected]>
Date: Tue, 24 Jan 2017 01:36:45 +0100
Subject: [PATCH] drm/amdgpu: Fix error in amdgpu_bo_create_restricted()

Note that the way your e-mail was formatted, the above commentary and mail headers would end up in the Git commit log, unless the person applying the patch pays attention and removes them. Commentary that isn't to be part of the commit log should be added between the --- marker below and the actual code diff.

Quoted 4 lines

Remove mistakedly placed ; that prevents the code from compiling. No functional change.

Quoted 18 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
index f71fe41c1c99..89d32131e3f5 100644
@@ -377,7 +377,7 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev,
 #warning Please enable CONFIG_MTRR and CONFIG_X86_PAT for better performance \
 	 thanks to write-combining
 
-	if (bo->flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC;)
+	if (bo->flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC)
 		DRM_INFO_ONCE("Please enable CONFIG_MTRR and CONFIG_X86_PAT for "
 			      "better performance thanks to write-combining\n");
 	bo->flags &= ~AMDGPU_GEM_CREATE_CPU_GTT_USWC;
Signature · 6 lines
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 97f6e4c1-0851-51cc-c496-66c1e8f83c61-otUistvHUpPR7s880joybQ@public.gmane.org

#4 lore raw
Quoted 10 lines · Michel Dänzer
Quoted 8 lines · Nils Holland

So I decided to fix this with the following follow-up patch. I hope this is the right approach (vs. reverting the commit and instead using a fixed v2 of the original patch).

From 41775d2c8a14873f522667a57b66cfbe119e28a4 Mon Sep 17 00:00:00 2001
From: Nils Holland <[email protected]>
Date: Tue, 24 Jan 2017 01:36:45 +0100
Subject: [PATCH] drm/amdgpu: Fix error in amdgpu_bo_create_restricted()

Quoted 5 lines

Note that the way your e-mail was formatted, the above commentary and mail headers would end up in the Git commit log, unless the person applying the patch pays attention and removes them. Commentary that isn't to be part of the commit log should be added between the --- marker below and the actual code diff.

Ah, I see! Making the job unnecessarily difficult for a maintainer is no good idea, so I will certainly do this better / correctly the next time I submit something!

Quoted 1 line

Thanks!!

Greetings
Nils
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20170124074340.GA9899-iI9p2NPcQ/[email protected]

Reviewed-by
#6 lore raw

Am 24.01.2017 um 08:43 schrieb Nils Holland:

Quoted 10 lines · Michel Dänzer
Quoted 9 lines · Nils Holland
Quoted 8 lines

So I decided to fix this with the following follow-up patch. I hope this is the right approach (vs. reverting the commit and instead using a fixed v2 of the original patch).

From 41775d2c8a14873f522667a57b66cfbe119e28a4 Mon Sep 17 00:00:00 2001
From: Nils Holland <[email protected]>
Date: Tue, 24 Jan 2017 01:36:45 +0100
Subject: [PATCH] drm/amdgpu: Fix error in amdgpu_bo_create_restricted()

Quoted 10 lines
Quoted 5 lines

Note that the way your e-mail was formatted, the above commentary and mail headers would end up in the Git commit log, unless the person applying the patch pays attention and removes them. Commentary that isn't to be part of the commit log should be added between the --- marker below and the actual code diff.

Ah, I see! Making the job unnecessarily difficult for a maintainer is no good idea, so I will certainly do this better / correctly the next time I submit something!

Quoted 1 line
Quoted 8 lines

Thanks!!

Greetings
Nils
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): c42e3767-1f6e-a04f-956d-8112666c1dec-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

#8 lore raw
Quoted 16 lines · Christian König

Am 24.01.2017 um 08:43 schrieb Nils Holland:

Quoted 15 lines · Michel Dänzer
Quoted 14 lines · Nils Holland
Quoted 8 lines

So I decided to fix this with the following follow-up patch. I hope this is the right approach (vs. reverting the commit and instead using a fixed v2 of the original patch).

From 41775d2c8a14873f522667a57b66cfbe119e28a4 Mon Sep 17 00:00:00 2001
From: Nils Holland <[email protected]>
Date: Tue, 24 Jan 2017 01:36:45 +0100
Subject: [PATCH] drm/amdgpu: Fix error in amdgpu_bo_create_restricted()

Note that the way your e-mail was formatted, the above commentary and mail headers would end up in the Git commit log, unless the person applying the patch pays attention and removes them. Commentary that isn't to be part of the commit log should be added between the --- marker below and the actual code diff.

Quoted 7 lines
Quoted 5 lines

Ah, I see! Making the job unnecessarily difficult for a maintainer is no good idea, so I will certainly do this better / correctly the next time I submit something!

Quoted 1 line

Just a note: I've just had a look at the official amdgpu Git tree for the first time, and saw that when Alex Deucher commited my patch into drm-next-4.11-wip yesterday, he obviously already spotted the mistake and fixed it. That would mean that my follow-up patch is void and can be discarded. I should probably have verified the state of the patch in the tree before reacting to the kernel test robot's output (or,
rather: Should have tested well enough to prevent this mistake right from the start...)

Thanks Alex!

Greetings
Nils
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx