* [PATCH v2 0/7] agp: Various minor fixes
@ 2021-12-01 11:46 Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 1/7] agp: Remove trailing whitespaces Thomas Zimmermann
` (7 more replies)
0 siblings, 8 replies; 10+ messages in thread
From: Thomas Zimmermann @ 2021-12-01 11:46 UTC (permalink / raw)
To: airlied, daniel.vetter, arnd, gregkh, James.Bottomley, deller
Cc: dri-devel, linux-kernel, Thomas Zimmermann
Fix a number of compiler warnings in the AGP drivers. No functional
changes.
v2:
* ati-agp: free page in error branch (Helge)
* nvidia-agp: Mark temp as __maybe_unused (Helge)
Thomas Zimmermann (7):
agp: Remove trailing whitespaces
agp: Include "compat_ioctl.h" where necessary
agp: Documentation fixes
agp/ati: Return error from ati_create_page_map()
agp/nvidia: Declare value returned by readl() as unused
agp/sworks: Remove unused variable 'current_size'
agp/via: Remove unused variable 'current_size'
drivers/char/agp/ati-agp.c | 8 ++++++--
drivers/char/agp/backend.c | 2 ++
drivers/char/agp/frontend.c | 4 +++-
drivers/char/agp/nvidia-agp.c | 3 ++-
drivers/char/agp/sworks-agp.c | 5 +----
drivers/char/agp/via-agp.c | 3 ---
6 files changed, 14 insertions(+), 11 deletions(-)
base-commit: 6a8f90ec433e2f5de5fc16d7a4839771b7027cc0
--
2.34.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 1/7] agp: Remove trailing whitespaces
2021-12-01 11:46 [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
@ 2021-12-01 11:46 ` Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 2/7] agp: Include "compat_ioctl.h" where necessary Thomas Zimmermann
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Thomas Zimmermann @ 2021-12-01 11:46 UTC (permalink / raw)
To: airlied, daniel.vetter, arnd, gregkh, James.Bottomley, deller
Cc: dri-devel, linux-kernel, Thomas Zimmermann
Trivial coding-style fix.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Helge Deller <deller@gmx.de>
---
drivers/char/agp/ati-agp.c | 2 +-
drivers/char/agp/frontend.c | 2 +-
drivers/char/agp/sworks-agp.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 20bf5f78a362..857b37141a07 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -303,7 +303,7 @@ static int ati_insert_memory(struct agp_memory * mem,
for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
addr = (j * PAGE_SIZE) + agp_bridge->gart_bus_addr;
cur_gatt = GET_GATT(addr);
- writel(agp_bridge->driver->mask_memory(agp_bridge,
+ writel(agp_bridge->driver->mask_memory(agp_bridge,
page_to_phys(mem->pages[i]),
mem->type),
cur_gatt+GET_GATT_OFF(addr));
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 00ff5fcb808a..6802a6bbf0f2 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -1017,7 +1017,7 @@ static long agp_ioctl(struct file *file,
case AGPIOC_UNBIND:
ret_val = agpioc_unbind_wrap(curr_priv, (void __user *) arg);
break;
-
+
case AGPIOC_CHIPSET_FLUSH:
break;
}
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index f875970bda65..b15d3d4f71d5 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -350,7 +350,7 @@ static int serverworks_insert_memory(struct agp_memory *mem,
for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
addr = (j * PAGE_SIZE) + agp_bridge->gart_bus_addr;
cur_gatt = SVRWRKS_GET_GATT(addr);
- writel(agp_bridge->driver->mask_memory(agp_bridge,
+ writel(agp_bridge->driver->mask_memory(agp_bridge,
page_to_phys(mem->pages[i]), mem->type),
cur_gatt+GET_GATT_OFF(addr));
}
--
2.34.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/7] agp: Include "compat_ioctl.h" where necessary
2021-12-01 11:46 [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 1/7] agp: Remove trailing whitespaces Thomas Zimmermann
@ 2021-12-01 11:46 ` Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 3/7] agp: Documentation fixes Thomas Zimmermann
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Thomas Zimmermann @ 2021-12-01 11:46 UTC (permalink / raw)
To: airlied, daniel.vetter, arnd, gregkh, James.Bottomley, deller
Cc: dri-devel, linux-kernel, Thomas Zimmermann
Fix compiler warnings like
drivers/char/agp/frontend.c:46:20: warning: no previous prototype for 'agp_find_mem_by_key' [-Wmissing-prototypes]
46 | struct agp_memory *agp_find_mem_by_key(int key)
by including the compat_ioctl.h in the source file.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Helge Deller <deller@gmx.de>
---
drivers/char/agp/frontend.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 6802a6bbf0f2..321118a9cfa5 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -39,7 +39,9 @@
#include <linux/fs.h>
#include <linux/sched.h>
#include <linux/uaccess.h>
+
#include "agp.h"
+#include "compat_ioctl.h"
struct agp_front_data agp_fe;
--
2.34.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 3/7] agp: Documentation fixes
2021-12-01 11:46 [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 1/7] agp: Remove trailing whitespaces Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 2/7] agp: Include "compat_ioctl.h" where necessary Thomas Zimmermann
@ 2021-12-01 11:46 ` Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 4/7] agp/ati: Return error from ati_create_page_map() Thomas Zimmermann
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Thomas Zimmermann @ 2021-12-01 11:46 UTC (permalink / raw)
To: airlied, daniel.vetter, arnd, gregkh, James.Bottomley, deller
Cc: dri-devel, linux-kernel, Thomas Zimmermann
Fix compiler warnings
drivers/char/agp/backend.c:68: warning: Function parameter or member 'pdev' not described in 'agp_backend_acquire'
drivers/char/agp/backend.c:93: warning: Function parameter or member 'bridge' not described in 'agp_backend_release'
by adding the necessary documentation.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Helge Deller <deller@gmx.de>
---
drivers/char/agp/backend.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index 004a3ce8ba72..0e19c600db53 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -62,6 +62,7 @@ EXPORT_SYMBOL(agp_find_bridge);
/**
* agp_backend_acquire - attempt to acquire an agp backend.
+ * @pdev: the PCI device
*
*/
struct agp_bridge_data *agp_backend_acquire(struct pci_dev *pdev)
@@ -83,6 +84,7 @@ EXPORT_SYMBOL(agp_backend_acquire);
/**
* agp_backend_release - release the lock on the agp backend.
+ * @bridge: the AGP backend to release
*
* The caller must insure that the graphics aperture translation table
* is read for use by another entity.
--
2.34.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 4/7] agp/ati: Return error from ati_create_page_map()
2021-12-01 11:46 [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
` (2 preceding siblings ...)
2021-12-01 11:46 ` [PATCH v2 3/7] agp: Documentation fixes Thomas Zimmermann
@ 2021-12-01 11:46 ` Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 5/7] agp/nvidia: Declare value returned by readl() as unused Thomas Zimmermann
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Thomas Zimmermann @ 2021-12-01 11:46 UTC (permalink / raw)
To: airlied, daniel.vetter, arnd, gregkh, James.Bottomley, deller
Cc: dri-devel, linux-kernel, Thomas Zimmermann
Fix the compiler warning
drivers/char/agp/ati-agp.c: In function 'ati_create_page_map':
drivers/char/agp/ati-agp.c:58:16: warning: variable 'err' set but not used [-Wunused-but-set-variable]
58 | int i, err = 0;
by returing the error to the caller.
v2:
* free page in error branch (Helge)
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/char/agp/ati-agp.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 857b37141a07..6f5530482d83 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -55,7 +55,7 @@ static struct _ati_generic_private {
static int ati_create_page_map(struct ati_page_map *page_map)
{
- int i, err = 0;
+ int i, err;
page_map->real = (unsigned long *) __get_free_page(GFP_KERNEL);
if (page_map->real == NULL)
@@ -63,6 +63,10 @@ static int ati_create_page_map(struct ati_page_map *page_map)
set_memory_uc((unsigned long)page_map->real, 1);
err = map_page_into_agp(virt_to_page(page_map->real));
+ if (err) {
+ free_page((unsigned long)page_map->real);
+ return err;
+ }
page_map->remapped = page_map->real;
for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
--
2.34.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 5/7] agp/nvidia: Declare value returned by readl() as unused
2021-12-01 11:46 [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
` (3 preceding siblings ...)
2021-12-01 11:46 ` [PATCH v2 4/7] agp/ati: Return error from ati_create_page_map() Thomas Zimmermann
@ 2021-12-01 11:46 ` Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 6/7] agp/sworks: Remove unused variable 'current_size' Thomas Zimmermann
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Thomas Zimmermann @ 2021-12-01 11:46 UTC (permalink / raw)
To: airlied, daniel.vetter, arnd, gregkh, James.Bottomley, deller
Cc: dri-devel, linux-kernel, Thomas Zimmermann
Fix the compiler warning
drivers/char/agp/nvidia-agp.c: In function 'nvidia_tlbflush':
drivers/char/agp/nvidia-agp.c:264:22: warning: variable 'temp' set but not used [-Wunused-but-set-variable]
264 | u32 wbc_reg, temp;
by marking the temp variable with __maybe_unused. The affected readl()
is only required for flushing caches, but the returned value is not of
interest.
v2:
* declare temp as __maybe_unused (Helge)
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/char/agp/nvidia-agp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index f78e756157db..826dbd06f6bb 100644
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -261,7 +261,8 @@ static int nvidia_remove_memory(struct agp_memory *mem, off_t pg_start, int type
static void nvidia_tlbflush(struct agp_memory *mem)
{
unsigned long end;
- u32 wbc_reg, temp;
+ u32 wbc_reg;
+ u32 __maybe_unused temp;
int i;
/* flush chipset */
--
2.34.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 6/7] agp/sworks: Remove unused variable 'current_size'
2021-12-01 11:46 [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
` (4 preceding siblings ...)
2021-12-01 11:46 ` [PATCH v2 5/7] agp/nvidia: Declare value returned by readl() as unused Thomas Zimmermann
@ 2021-12-01 11:46 ` Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 7/7] agp/via: " Thomas Zimmermann
2022-01-13 8:51 ` [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
7 siblings, 0 replies; 10+ messages in thread
From: Thomas Zimmermann @ 2021-12-01 11:46 UTC (permalink / raw)
To: airlied, daniel.vetter, arnd, gregkh, James.Bottomley, deller
Cc: dri-devel, linux-kernel, Thomas Zimmermann
Fix the compiler warning
drivers/char/agp/sworks-agp.c: In function 'serverworks_configure':
drivers/char/agp/sworks-agp.c:265:37: warning: variable 'current_size' set but not used [-Wunused-but-set-variable]
265 | struct aper_size_info_lvl2 *current_size;
by removing the variable.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Helge Deller <deller@gmx.de>
---
drivers/char/agp/sworks-agp.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index b15d3d4f71d5..b91da5998dd7 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -262,13 +262,10 @@ static void serverworks_tlbflush(struct agp_memory *temp)
static int serverworks_configure(void)
{
- struct aper_size_info_lvl2 *current_size;
u32 temp;
u8 enable_reg;
u16 cap_reg;
- current_size = A_SIZE_LVL2(agp_bridge->current_size);
-
/* Get the memory mapped registers */
pci_read_config_dword(agp_bridge->dev, serverworks_private.mm_addr_ofs, &temp);
temp = (temp & PCI_BASE_ADDRESS_MEM_MASK);
--
2.34.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 7/7] agp/via: Remove unused variable 'current_size'
2021-12-01 11:46 [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
` (5 preceding siblings ...)
2021-12-01 11:46 ` [PATCH v2 6/7] agp/sworks: Remove unused variable 'current_size' Thomas Zimmermann
@ 2021-12-01 11:46 ` Thomas Zimmermann
2022-01-13 8:51 ` [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
7 siblings, 0 replies; 10+ messages in thread
From: Thomas Zimmermann @ 2021-12-01 11:46 UTC (permalink / raw)
To: airlied, daniel.vetter, arnd, gregkh, James.Bottomley, deller
Cc: dri-devel, linux-kernel, Thomas Zimmermann
Fix the compiler warning
drivers/char/agp/via-agp.c: In function 'via_configure_agp3':
drivers/char/agp/via-agp.c:131:35: warning: variable 'current_size' set but not used [-Wunused-but-set-variable]
131 | struct aper_size_info_16 *current_size;
by removing the variable.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Helge Deller <deller@gmx.de>
---
drivers/char/agp/via-agp.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 87a92a044570..dc594f4eca38 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -128,9 +128,6 @@ static int via_fetch_size_agp3(void)
static int via_configure_agp3(void)
{
u32 temp;
- struct aper_size_info_16 *current_size;
-
- current_size = A_SIZE_16(agp_bridge->current_size);
/* address to map to */
agp_bridge->gart_bus_addr = pci_bus_address(agp_bridge->dev,
--
2.34.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/7] agp: Various minor fixes
2021-12-01 11:46 [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
` (6 preceding siblings ...)
2021-12-01 11:46 ` [PATCH v2 7/7] agp/via: " Thomas Zimmermann
@ 2022-01-13 8:51 ` Thomas Zimmermann
2022-01-13 16:42 ` Helge Deller
7 siblings, 1 reply; 10+ messages in thread
From: Thomas Zimmermann @ 2022-01-13 8:51 UTC (permalink / raw)
To: airlied, daniel.vetter, arnd, gregkh, James.Bottomley, deller
Cc: dri-devel, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1296 bytes --]
ping!
This patchset got lost. Patches 4 and 5 still need a review.
Am 01.12.21 um 12:46 schrieb Thomas Zimmermann:
> Fix a number of compiler warnings in the AGP drivers. No functional
> changes.
>
> v2:
> * ati-agp: free page in error branch (Helge)
> * nvidia-agp: Mark temp as __maybe_unused (Helge)
>
> Thomas Zimmermann (7):
> agp: Remove trailing whitespaces
> agp: Include "compat_ioctl.h" where necessary
> agp: Documentation fixes
> agp/ati: Return error from ati_create_page_map()
> agp/nvidia: Declare value returned by readl() as unused
> agp/sworks: Remove unused variable 'current_size'
> agp/via: Remove unused variable 'current_size'
>
> drivers/char/agp/ati-agp.c | 8 ++++++--
> drivers/char/agp/backend.c | 2 ++
> drivers/char/agp/frontend.c | 4 +++-
> drivers/char/agp/nvidia-agp.c | 3 ++-
> drivers/char/agp/sworks-agp.c | 5 +----
> drivers/char/agp/via-agp.c | 3 ---
> 6 files changed, 14 insertions(+), 11 deletions(-)
>
>
> base-commit: 6a8f90ec433e2f5de5fc16d7a4839771b7027cc0
> --
> 2.34.0
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 0/7] agp: Various minor fixes
2022-01-13 8:51 ` [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
@ 2022-01-13 16:42 ` Helge Deller
0 siblings, 0 replies; 10+ messages in thread
From: Helge Deller @ 2022-01-13 16:42 UTC (permalink / raw)
To: Thomas Zimmermann, airlied, daniel.vetter, arnd, gregkh, James.Bottomley
Cc: dri-devel, linux-kernel
On 1/13/22 09:51, Thomas Zimmermann wrote:
> ping!
>
> This patchset got lost. Patches 4 and 5 still need a review.
for patches 4 & 5:
Acked-by: Helge Deller <deller@gmx.de>
Helge
>
> Am 01.12.21 um 12:46 schrieb Thomas Zimmermann:
>> Fix a number of compiler warnings in the AGP drivers. No functional
>> changes.
>>
>> v2:
>> * ati-agp: free page in error branch (Helge)
>> * nvidia-agp: Mark temp as __maybe_unused (Helge)
>>
>> Thomas Zimmermann (7):
>> agp: Remove trailing whitespaces
>> agp: Include "compat_ioctl.h" where necessary
>> agp: Documentation fixes
>> agp/ati: Return error from ati_create_page_map()
>> agp/nvidia: Declare value returned by readl() as unused
>> agp/sworks: Remove unused variable 'current_size'
>> agp/via: Remove unused variable 'current_size'
>>
>> drivers/char/agp/ati-agp.c | 8 ++++++--
>> drivers/char/agp/backend.c | 2 ++
>> drivers/char/agp/frontend.c | 4 +++-
>> drivers/char/agp/nvidia-agp.c | 3 ++-
>> drivers/char/agp/sworks-agp.c | 5 +----
>> drivers/char/agp/via-agp.c | 3 ---
>> 6 files changed, 14 insertions(+), 11 deletions(-)
>>
>>
>> base-commit: 6a8f90ec433e2f5de5fc16d7a4839771b7027cc0
>> --
>> 2.34.0
>>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-01-13 16:44 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-01 11:46 [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 1/7] agp: Remove trailing whitespaces Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 2/7] agp: Include "compat_ioctl.h" where necessary Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 3/7] agp: Documentation fixes Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 4/7] agp/ati: Return error from ati_create_page_map() Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 5/7] agp/nvidia: Declare value returned by readl() as unused Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 6/7] agp/sworks: Remove unused variable 'current_size' Thomas Zimmermann
2021-12-01 11:46 ` [PATCH v2 7/7] agp/via: " Thomas Zimmermann
2022-01-13 8:51 ` [PATCH v2 0/7] agp: Various minor fixes Thomas Zimmermann
2022-01-13 16:42 ` Helge Deller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).