2021-01-15 18:20:30

by Lee Jones

[permalink] [raw]
Subject: [PATCH 00/29] [Set 15] Finally rid W=1 warnings from GPU!

This set is part of a larger effort attempting to clean-up W=1
kernel builds, which are currently overwhelmingly riddled with
niggly little warnings.

Last set! All clean after this for; Arm, Arm64, PPC, MIPS and x86.

Lee Jones (29):
drm/vmwgfx/vmwgfx_cmdbuf: Fix misnaming of 'headers' should be plural
drm/vmwgfx/vmwgfx_cotable: Fix a couple of simple documentation
problems
drm/vmwgfx/vmwgfx_so: Add description for 'vmw_view's 'rcu' member
drm/vmwgfx/vmwgfx_binding: Provide some missing param descriptions and
remove others
drm/vmwgfx/vmwgfx_msg: Fix misspelling of 'msg'
drm/gma500/mmu: Actually return an error if one occurs
drm/vmwgfx/vmwgfx_blit: Add description for 'vmw_bo_cpu_blit's 'diff'
param
drm/vmwgfx/vmwgfx_validation: Add some missing struct member/function
param descriptions
drm/vmwgfx/ttm_object: Demote half-assed headers and fix-up another
drm/vmwgfx/vmwgfx_thp: Add description for 'vmw_thp_manager's member
'manager'
drm/gma500/psb_intel_sdvo: Demote kernel-doc abuses
drm/gma500/psb_irq: Demote kernel-doc abuse
drm/drm_dp_helper: Fix spelling issue and add missing description for
'enable_frl_ready_hpd'
drm/gma500/cdv_intel_crt: Demote kernel-doc abuse in
'cdv_intel_crt_detect_hotplug()'s header
drm/gma500/cdv_intel_display: Demote kernel-doc abuse in
'cdv_intel_panel_fitter_pipe()'s header
drm/gma500/cdv_intel_lvds: Demote unworthy headers to standard blocks
and fix another
drm/gma500/cdv_intel_dp: Demote one unworthy header fix another
drm/gma500/oaktrail_lvds_i2c: Remove unused variables 'tmp'
drm/gma500/oaktrail_lvds: Demote one documentation header fix another
drm/gma500/oaktrail_crtc: Demote unworthy kernel-doc headers
drm/gma500/mdfld_dsi_output: Demote a couple of kernel-doc formatting
abuses
drm/gma500/mdfld_intel_display: Demote three kernel-doc formatting
abuses
drm/drm_agpsupport: Strip out obviously wrong descriptions and demote
to standard headers
drm/i915/gvt/handlers: Remove kernel-doc formatting from
non-kernel-doc header
drm/nouveau/nouveau_ioc32: File headers are not good candidates for
kernel-doc
drm/nouveau/nouveau_svm: Remove unused variable 'ret' from void
function
drm/nouveau/nouveau_bios: Remove unused variable 'pdev' from
'nouveau_bios_init()'
drm/nouveau/nouveau_ioc32: Demote kernel-doc abuse to standard comment
block
drm/vmwgfx/ttm_object: Reorder header to immediately precede its
struct

drivers/gpu/drm/drm_agpsupport.c | 46 +++++---------------
drivers/gpu/drm/drm_dp_helper.c | 3 +-
drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_display.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 +-
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 7 +--
drivers/gpu/drm/gma500/mdfld_dsi_output.c | 4 +-
drivers/gpu/drm/gma500/mdfld_intel_display.c | 6 +--
drivers/gpu/drm/gma500/mmu.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_crtc.c | 6 +--
drivers/gpu/drm/gma500/oaktrail_lvds.c | 3 +-
drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 8 ++--
drivers/gpu/drm/gma500/psb_intel_sdvo.c | 6 +--
drivers/gpu/drm/gma500/psb_irq.c | 3 +-
drivers/gpu/drm/i915/gvt/handlers.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_bios.c | 2 -
drivers/gpu/drm/nouveau/nouveau_ioc32.c | 4 +-
drivers/gpu/drm/nouveau/nouveau_svm.c | 5 +--
drivers/gpu/drm/vmwgfx/ttm_object.c | 25 ++++++-----
drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 9 ++--
drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +-
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 5 ++-
27 files changed, 74 insertions(+), 90 deletions(-)

Cc: Ben Skeggs <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Dave Airlie <[email protected]>
Cc: David Airlie <[email protected]>
Cc: [email protected]
Cc: Eddie Dong <[email protected]>
Cc: Eric Anholt <[email protected]>
Cc: Faith <[email protected]>
Cc: Gareth Hughes <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Jackie Li <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: Jan Safrata <[email protected]>
Cc: Jesse Barnes <[email protected]>
Cc: jim liu <[email protected]>
Cc: Joonas Lahtinen <[email protected]>
Cc: Keith Packard <[email protected]>
Cc: Kevin Tian <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Min He <[email protected]>
Cc: Niu Bing <[email protected]>
Cc: [email protected]
Cc: Patrik Jakobsson <[email protected]>
Cc: Pei Zhang <[email protected]>
Cc: Ping Gao <[email protected]>
Cc: Rob Clark <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Cc: Roland Scheidegger <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: Tina Zhang <[email protected]>
Cc: VMware Graphics <[email protected]>
Cc: Zack Rusin <[email protected]>
Cc: Zhenyu Wang <[email protected]>
Cc: Zhi Wang <[email protected]>
Cc: Zhiyuan Lv <[email protected]>
--
2.25.1


2021-01-15 18:20:34

by Lee Jones

[permalink] [raw]
Subject: [PATCH 13/29] drm/drm_dp_helper: Fix spelling issue and add missing description for 'enable_frl_ready_hpd'

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/drm_dp_helper.c:965: warning: Function parameter or member 'color_spc' not described in 'drm_dp_downstream_rgb_to_ycbcr_conversion'
drivers/gpu/drm/drm_dp_helper.c:965: warning: Excess function parameter 'colorspc' description in 'drm_dp_downstream_rgb_to_ycbcr_conversion'
drivers/gpu/drm/drm_dp_helper.c:2678: warning: Function parameter or member 'enable_frl_ready_hpd' not described in 'drm_dp_pcon_frl_prepare'

Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/drm_dp_helper.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index 3ecde451f5231..3c5b04abb66f1 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -954,7 +954,7 @@ EXPORT_SYMBOL(drm_dp_downstream_444_to_420_conversion);
* RGB->YCbCr conversion capability
* @dpcd: DisplayPort configuration data
* @port_cap: downstream facing port capabilities
- * @colorspc: Colorspace for which conversion cap is sought
+ * @color_spc: Colorspace for which conversion cap is sought
*
* Returns: whether the downstream facing port can convert RGB->YCbCr for a given
* colorspace.
@@ -2671,6 +2671,7 @@ EXPORT_SYMBOL(drm_dp_get_pcon_max_frl_bw);
/**
* drm_dp_pcon_frl_prepare() - Prepare PCON for FRL.
* @aux: DisplayPort AUX channel
+ * @enable_frl_ready_hpd: Configure DP_PCON_ENABLE_HPD_READY.
*
* Returns 0 if success, else returns negative error code.
*/
--
2.25.1

2021-01-15 18:20:34

by Lee Jones

[permalink] [raw]
Subject: [PATCH 22/29] drm/gma500/mdfld_intel_display: Demote three kernel-doc formatting abuses

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/gma500/mdfld_intel_display.c:103: warning: Function parameter or member 'dev' not described in 'psb_intel_panel_fitter_pipe'
drivers/gpu/drm/gma500/mdfld_intel_display.c:273: warning: Function parameter or member 'crtc' not described in 'mdfld_crtc_dpms'
drivers/gpu/drm/gma500/mdfld_intel_display.c:273: warning: Function parameter or member 'mode' not described in 'mdfld_crtc_dpms'
drivers/gpu/drm/gma500/mdfld_intel_display.c:609: warning: Function parameter or member 'crtc' not described in 'mdfldFindBestPLL'
drivers/gpu/drm/gma500/mdfld_intel_display.c:609: warning: Function parameter or member 'target' not described in 'mdfldFindBestPLL'
drivers/gpu/drm/gma500/mdfld_intel_display.c:609: warning: Function parameter or member 'refclk' not described in 'mdfldFindBestPLL'
drivers/gpu/drm/gma500/mdfld_intel_display.c:609: warning: Function parameter or member 'best_clock' not described in 'mdfldFindBestPLL'

Cc: Patrik Jakobsson <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Eric Anholt <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/gma500/mdfld_intel_display.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c
index aae2d358364cc..462aba8f75288 100644
--- a/drivers/gpu/drm/gma500/mdfld_intel_display.c
+++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c
@@ -95,7 +95,7 @@ void mdfldWaitForPipeEnable(struct drm_device *dev, int pipe)
}
}

-/**
+/*
* Return the pipe currently connected to the panel fitter,
* or -1 if the panel fitter is not present or not in use
*/
@@ -263,7 +263,7 @@ void mdfld_disable_crtc(struct drm_device *dev, int pipe)

}

-/**
+/*
* Sets the power management mode of the pipe and plane.
*
* This code should probably grow support for turning the cursor off and back
@@ -599,7 +599,7 @@ static void mdfld_clock(int refclk, struct mrst_clock_t *clock)
clock->dot = (refclk * clock->m) / clock->p1;
}

-/**
+/*
* Returns a set of divisors for the desired target clock with the given refclk,
* or FALSE. Divisor values are the actual divisors for
*/
--
2.25.1

2021-01-15 18:20:41

by Lee Jones

[permalink] [raw]
Subject: [PATCH 25/29] drm/nouveau/nouveau_ioc32: File headers are not good candidates for kernel-doc

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/nouveau/nouveau_ioc32.c:2: warning: Cannot understand * file mga_ioc32.c

Cc: Ben Skeggs <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
index adf01ca9e035d..8ddf9b2325a42 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
@@ -1,4 +1,4 @@
-/**
+/*
* \file mga_ioc32.c
*
* 32-bit ioctl compatibility routines for the MGA DRM.
--
2.25.1

2021-01-15 18:20:51

by Lee Jones

[permalink] [raw]
Subject: [PATCH 27/29] drm/nouveau/nouveau_bios: Remove unused variable 'pdev' from 'nouveau_bios_init()'

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/nouveau/nouveau_bios.c: In function ‘nouveau_bios_init’:
drivers/gpu/drm/nouveau/nouveau_bios.c:2086:18: warning: variable ‘pdev’ set but not used [-Wunused-but-set-variable]

Cc: Ben Skeggs <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/nouveau/nouveau_bios.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 7cc683b8dc7a6..e8c445eb11004 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -2083,13 +2083,11 @@ nouveau_bios_init(struct drm_device *dev)
{
struct nouveau_drm *drm = nouveau_drm(dev);
struct nvbios *bios = &drm->vbios;
- struct pci_dev *pdev;
int ret;

/* only relevant for PCI devices */
if (!dev_is_pci(dev->dev))
return 0;
- pdev = to_pci_dev(dev->dev);

if (!NVInitVBIOS(dev))
return -ENODEV;
--
2.25.1

2021-01-15 18:20:52

by Lee Jones

[permalink] [raw]
Subject: [PATCH 29/29] drm/vmwgfx/ttm_object: Reorder header to immediately precede its struct

Also add missing description for 'refcount'

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/vmwgfx/ttm_object.c:60: error: Cannot parse struct or union!

Cc: VMware Graphics <[email protected]>
Cc: Roland Scheidegger <[email protected]>
Cc: Zack Rusin <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: Dave Airlie <[email protected]>
Cc: Rob Clark <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/vmwgfx/ttm_object.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/ttm_object.c b/drivers/gpu/drm/vmwgfx/ttm_object.c
index b3fdc630497cb..112394dd0ab6a 100644
--- a/drivers/gpu/drm/vmwgfx/ttm_object.c
+++ b/drivers/gpu/drm/vmwgfx/ttm_object.c
@@ -42,6 +42,14 @@
*/


+#define pr_fmt(fmt) "[TTM] " fmt
+
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/slab.h>
+#include <linux/atomic.h>
+#include "ttm_object.h"
+
/**
* struct ttm_object_file
*
@@ -55,16 +63,9 @@
*
* @ref_hash: Hash tables of ref objects, one per ttm_ref_type,
* for fast lookup of ref objects given a base object.
+ *
+ * @refcount: reference/usage count
*/
-
-#define pr_fmt(fmt) "[TTM] " fmt
-
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/slab.h>
-#include <linux/atomic.h>
-#include "ttm_object.h"
-
struct ttm_object_file {
struct ttm_object_device *tdev;
spinlock_t lock;
--
2.25.1

2021-01-15 18:21:20

by Lee Jones

[permalink] [raw]
Subject: [PATCH 21/29] drm/gma500/mdfld_dsi_output: Demote a couple of kernel-doc formatting abuses

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/gma500/mdfld_dsi_output.c:71: warning: Function parameter or member 'dev' not described in 'mdfld_dsi_gen_fifo_ready'
drivers/gpu/drm/gma500/mdfld_dsi_output.c:71: warning: Function parameter or member 'gen_fifo_stat_reg' not described in 'mdfld_dsi_gen_fifo_ready'
drivers/gpu/drm/gma500/mdfld_dsi_output.c:71: warning: Function parameter or member 'fifo_stat' not described in 'mdfld_dsi_gen_fifo_ready'
drivers/gpu/drm/gma500/mdfld_dsi_output.c:95: warning: Function parameter or member 'dsi_config' not described in 'mdfld_dsi_brightness_init'
drivers/gpu/drm/gma500/mdfld_dsi_output.c:95: warning: Function parameter or member 'pipe' not described in 'mdfld_dsi_brightness_init'

Cc: Patrik Jakobsson <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: jim liu <[email protected]>
Cc: Jackie Li <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/gma500/mdfld_dsi_output.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
index 4aab76613bd9e..24105f45c1c4b 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
@@ -63,7 +63,7 @@ static int __init parse_LABC_control(char *arg)
early_param("LABC", parse_LABC_control);
#endif

-/**
+/*
* Check and see if the generic control or data buffer is empty and ready.
*/
void mdfld_dsi_gen_fifo_ready(struct drm_device *dev, u32 gen_fifo_stat_reg,
@@ -85,7 +85,7 @@ void mdfld_dsi_gen_fifo_ready(struct drm_device *dev, u32 gen_fifo_stat_reg,
gen_fifo_stat_reg);
}

-/**
+/*
* Manage the DSI MIPI keyboard and display brightness.
* FIXME: this is exported to OSPM code. should work out an specific
* display interface to OSPM.
--
2.25.1

2021-01-15 18:21:35

by Lee Jones

[permalink] [raw]
Subject: [PATCH 09/29] drm/vmwgfx/ttm_object: Demote half-assed headers and fix-up another

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/vmwgfx/ttm_object.c:60: error: Cannot parse struct or union!
drivers/gpu/drm/vmwgfx/ttm_object.c:97: warning: Function parameter or member 'mem_glob' not described in 'ttm_object_device'
drivers/gpu/drm/vmwgfx/ttm_object.c:97: warning: Function parameter or member 'ops' not described in 'ttm_object_device'
drivers/gpu/drm/vmwgfx/ttm_object.c:97: warning: Function parameter or member 'dmabuf_release' not described in 'ttm_object_device'
drivers/gpu/drm/vmwgfx/ttm_object.c:97: warning: Function parameter or member 'dma_buf_size' not described in 'ttm_object_device'
drivers/gpu/drm/vmwgfx/ttm_object.c:97: warning: Function parameter or member 'idr' not described in 'ttm_object_device'
drivers/gpu/drm/vmwgfx/ttm_object.c:128: warning: Function parameter or member 'rcu_head' not described in 'ttm_ref_object'
drivers/gpu/drm/vmwgfx/ttm_object.c:128: warning: Function parameter or member 'tfile' not described in 'ttm_ref_object'
drivers/gpu/drm/vmwgfx/ttm_object.c:582: warning: Function parameter or member 'dmabuf' not described in 'get_dma_buf_unless_doomed'
drivers/gpu/drm/vmwgfx/ttm_object.c:582: warning: Excess function parameter 'dma_buf' description in 'get_dma_buf_unless_doomed'

Cc: VMware Graphics <[email protected]>
Cc: Roland Scheidegger <[email protected]>
Cc: Zack Rusin <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: Dave Airlie <[email protected]>
Cc: Rob Clark <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/vmwgfx/ttm_object.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/ttm_object.c b/drivers/gpu/drm/vmwgfx/ttm_object.c
index 0fe869d0fad12..b3fdc630497cb 100644
--- a/drivers/gpu/drm/vmwgfx/ttm_object.c
+++ b/drivers/gpu/drm/vmwgfx/ttm_object.c
@@ -73,7 +73,7 @@ struct ttm_object_file {
struct kref refcount;
};

-/**
+/*
* struct ttm_object_device
*
* @object_lock: lock that protects the object_hash hash table.
@@ -96,7 +96,7 @@ struct ttm_object_device {
struct idr idr;
};

-/**
+/*
* struct ttm_ref_object
*
* @hash: Hash entry for the per-file object reference hash.
@@ -568,7 +568,7 @@ void ttm_object_device_release(struct ttm_object_device **p_tdev)
/**
* get_dma_buf_unless_doomed - get a dma_buf reference if possible.
*
- * @dma_buf: Non-refcounted pointer to a struct dma-buf.
+ * @dmabuf: Non-refcounted pointer to a struct dma-buf.
*
* Obtain a file reference from a lookup structure that doesn't refcount
* the file, but synchronizes with its release method to make sure it has
--
2.25.1

2021-01-15 18:21:42

by Lee Jones

[permalink] [raw]
Subject: [PATCH 18/29] drm/gma500/oaktrail_lvds_i2c: Remove unused variables 'tmp'

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c: In function ‘get_clock’:
drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c:69:11: warning: variable ‘tmp’ set but not used [-Wunused-but-set-variable]
drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c: In function ‘get_data’:
drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c:83:11: warning: variable ‘tmp’ set but not used [-Wunused-but-set-variable]

Cc: Patrik Jakobsson <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Jan Safrata <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c b/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c
index d64aedc69845f..1d2dd6ea1c717 100644
--- a/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c
@@ -66,12 +66,12 @@
static int get_clock(void *data)
{
struct psb_intel_i2c_chan *chan = data;
- u32 val, tmp;
+ u32 val;

val = LPC_READ_REG(chan, RGIO);
val |= GPIO_CLOCK;
LPC_WRITE_REG(chan, RGIO, val);
- tmp = LPC_READ_REG(chan, RGLVL);
+ LPC_READ_REG(chan, RGLVL);
val = (LPC_READ_REG(chan, RGLVL) & GPIO_CLOCK) ? 1 : 0;

return val;
@@ -80,12 +80,12 @@ static int get_clock(void *data)
static int get_data(void *data)
{
struct psb_intel_i2c_chan *chan = data;
- u32 val, tmp;
+ u32 val;

val = LPC_READ_REG(chan, RGIO);
val |= GPIO_DATA;
LPC_WRITE_REG(chan, RGIO, val);
- tmp = LPC_READ_REG(chan, RGLVL);
+ LPC_READ_REG(chan, RGLVL);
val = (LPC_READ_REG(chan, RGLVL) & GPIO_DATA) ? 1 : 0;

return val;
--
2.25.1

2021-01-15 18:21:48

by Lee Jones

[permalink] [raw]
Subject: [PATCH 10/29] drm/vmwgfx/vmwgfx_thp: Add description for 'vmw_thp_manager's member 'manager'

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/vmwgfx/vmwgfx_thp.c:21: warning: Function parameter or member 'manager' not described in 'vmw_thp_manager'

Cc: VMware Graphics <[email protected]>
Cc: Roland Scheidegger <[email protected]>
Cc: Zack Rusin <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
index e8e79de255cf7..eb63cbe64909d 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
@@ -11,6 +11,7 @@
/**
* struct vmw_thp_manager - Range manager implementing huge page alignment
*
+ * @manager: TTM resource manager.
* @mm: The underlying range manager. Protected by @lock.
* @lock: Manager lock.
*/
--
2.25.1

2021-01-15 18:21:52

by Lee Jones

[permalink] [raw]
Subject: [PATCH 14/29] drm/gma500/cdv_intel_crt: Demote kernel-doc abuse in 'cdv_intel_crt_detect_hotplug()'s header

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/gma500/cdv_intel_crt.c:138: warning: Function parameter or member 'connector' not described in 'cdv_intel_crt_detect_hotplug'
drivers/gpu/drm/gma500/cdv_intel_crt.c:138: warning: Function parameter or member 'force' not described in 'cdv_intel_crt_detect_hotplug'

Cc: Patrik Jakobsson <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Eric Anholt <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/gma500/cdv_intel_crt.c b/drivers/gpu/drm/gma500/cdv_intel_crt.c
index fc58a73ed11d6..c48c9d322dfbd 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_crt.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_crt.c
@@ -127,7 +127,7 @@ static void cdv_intel_crt_mode_set(struct drm_encoder *encoder,
}


-/**
+/*
* Uses CRT_HOTPLUG_EN and CRT_HOTPLUG_STAT to detect CRT presence.
*
* \return true if CRT is connected.
--
2.25.1

2021-01-15 18:22:05

by Lee Jones

[permalink] [raw]
Subject: [PATCH 06/29] drm/gma500/mmu: Actually return an error if one occurs

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/gma500/mmu.c: In function ‘psb_mmu_insert_pfn_sequence’:
drivers/gpu/drm/gma500/mmu.c:651:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]

Cc: Patrik Jakobsson <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/gma500/mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/gma500/mmu.c b/drivers/gpu/drm/gma500/mmu.c
index 014daf0280485..13aff19aae9ba 100644
--- a/drivers/gpu/drm/gma500/mmu.c
+++ b/drivers/gpu/drm/gma500/mmu.c
@@ -681,7 +681,7 @@ int psb_mmu_insert_pfn_sequence(struct psb_mmu_pd *pd, uint32_t start_pfn,
if (pd->hw_context != -1)
psb_mmu_flush(pd->driver);

- return 0;
+ return ret;
}

int psb_mmu_insert_pages(struct psb_mmu_pd *pd, struct page **pages,
--
2.25.1

2021-01-15 18:22:22

by Lee Jones

[permalink] [raw]
Subject: [PATCH 08/29] drm/vmwgfx/vmwgfx_validation: Add some missing struct member/function param descriptions

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/vmwgfx/vmwgfx_validation.c:85: warning: Function parameter or member 'dirty' not described in 'vmw_validation_res_node'
drivers/gpu/drm/vmwgfx/vmwgfx_validation.c:85: warning: Function parameter or member 'dirty_set' not described in 'vmw_validation_res_node'
drivers/gpu/drm/vmwgfx/vmwgfx_validation.c:216: warning: Function parameter or member 'res' not described in 'vmw_validation_find_res_dup'
drivers/gpu/drm/vmwgfx/vmwgfx_validation.c:216: warning: Excess function parameter 'vbo' description in 'vmw_validation_find_res_dup'

Cc: VMware Graphics <[email protected]>
Cc: Roland Scheidegger <[email protected]>
Cc: Zack Rusin <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c b/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c
index f2e2bf6d1421f..e7570f422400d 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c
@@ -48,7 +48,6 @@ struct vmw_validation_bo_node {
u32 as_mob : 1;
u32 cpu_blit : 1;
};
-
/**
* struct vmw_validation_res_node - Resource validation metadata.
* @head: List head for the resource validation list.
@@ -64,6 +63,8 @@ struct vmw_validation_bo_node {
* @first_usage: True iff the resource has been seen only once in the current
* validation batch.
* @reserved: Whether the resource is currently reserved by this process.
+ * @dirty_set: Change dirty status of the resource.
+ * @dirty: Dirty information VMW_RES_DIRTY_XX.
* @private: Optionally additional memory for caller-private data.
*
* Bit fields are used since these structures are allocated and freed in
@@ -205,7 +206,7 @@ vmw_validation_find_bo_dup(struct vmw_validation_context *ctx,
* vmw_validation_find_res_dup - Find a duplicate resource entry in the
* validation context's lists.
* @ctx: The validation context to search.
- * @vbo: The buffer object to search for.
+ * @res: Reference counted resource pointer.
*
* Return: Pointer to the struct vmw_validation_bo_node referencing the
* duplicate, or NULL if none found.
--
2.25.1

2021-01-15 18:22:24

by Lee Jones

[permalink] [raw]
Subject: [PATCH 16/29] drm/gma500/cdv_intel_lvds: Demote unworthy headers to standard blocks and fix another

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/gma500/cdv_intel_lvds.c:83: warning: Function parameter or member 'dev' not described in 'cdv_intel_lvds_set_backlight'
drivers/gpu/drm/gma500/cdv_intel_lvds.c:83: warning: Function parameter or member 'level' not described in 'cdv_intel_lvds_set_backlight'
drivers/gpu/drm/gma500/cdv_intel_lvds.c:107: warning: Function parameter or member 'dev' not described in 'cdv_intel_lvds_set_power'
drivers/gpu/drm/gma500/cdv_intel_lvds.c:107: warning: Function parameter or member 'encoder' not described in 'cdv_intel_lvds_set_power'
drivers/gpu/drm/gma500/cdv_intel_lvds.c:107: warning: Function parameter or member 'on' not described in 'cdv_intel_lvds_set_power'
drivers/gpu/drm/gma500/cdv_intel_lvds.c:298: warning: Function parameter or member 'connector' not described in 'cdv_intel_lvds_get_modes'
drivers/gpu/drm/gma500/cdv_intel_lvds.c:480: warning: Function parameter or member 'mode_dev' not described in 'cdv_intel_lvds_init'

Cc: Patrik Jakobsson <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Eric Anholt <[email protected]>
Cc: Jesse Barnes <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/gma500/cdv_intel_lvds.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
index b62368962c219..5bff7d9e3aa6e 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
@@ -74,7 +74,7 @@ static u32 cdv_intel_lvds_get_max_backlight(struct drm_device *dev)
return retval;
}

-/**
+/*
* Sets the backlight level.
*
* level backlight level, from 0 to cdv_intel_lvds_get_max_backlight().
@@ -99,7 +99,7 @@ static void cdv_intel_lvds_set_backlight(struct drm_device *dev, int level)
}
}

-/**
+/*
* Sets the power state for the panel.
*/
static void cdv_intel_lvds_set_power(struct drm_device *dev,
@@ -291,7 +291,7 @@ static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder,
REG_WRITE(PFIT_CONTROL, pfit_control);
}

-/**
+/*
* Return the list of DDC modes if available, or the BIOS fixed mode otherwise.
*/
static int cdv_intel_lvds_get_modes(struct drm_connector *connector)
@@ -471,6 +471,7 @@ static bool lvds_is_present_in_vbt(struct drm_device *dev,
/**
* cdv_intel_lvds_init - setup LVDS connectors on this device
* @dev: drm device
+ * @mode_dev: PSB mode device
*
* Create the connector, register the LVDS DDC bus, and try to figure out what
* modes we can display on the LVDS panel (if present).
--
2.25.1

2021-01-15 18:22:59

by Lee Jones

[permalink] [raw]
Subject: [PATCH 24/29] drm/i915/gvt/handlers: Remove kernel-doc formatting from non-kernel-doc header

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/i915/gvt/handlers.c:1666: warning: Function parameter or member 'vgpu' not described in 'bxt_ppat_low_write'
drivers/gpu/drm/i915/gvt/handlers.c:1666: warning: Function parameter or member 'offset' not described in 'bxt_ppat_low_write'
drivers/gpu/drm/i915/gvt/handlers.c:1666: warning: Function parameter or member 'p_data' not described in 'bxt_ppat_low_write'
drivers/gpu/drm/i915/gvt/handlers.c:1666: warning: Function parameter or member 'bytes' not described in 'bxt_ppat_low_write'

Cc: Zhenyu Wang <[email protected]>
Cc: Zhi Wang <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: Joonas Lahtinen <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Kevin Tian <[email protected]>
Cc: Eddie Dong <[email protected]>
Cc: Zhiyuan Lv <[email protected]>
Cc: Min He <[email protected]>
Cc: Tina Zhang <[email protected]>
Cc: Pei Zhang <[email protected]>
Cc: Niu Bing <[email protected]>
Cc: Ping Gao <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/i915/gvt/handlers.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index eaba80975f42a..0d124ced5f940 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -1651,7 +1651,7 @@ static int edp_psr_imr_iir_write(struct intel_vgpu *vgpu,
return 0;
}

-/**
+/*
* FixMe:
* If guest fills non-priv batch buffer on ApolloLake/Broxton as Mesa i965 did:
* 717e7539124d (i965: Use a WC map and memcpy for the batch instead of pwrite.)
--
2.25.1

2021-01-15 18:23:03

by Lee Jones

[permalink] [raw]
Subject: [PATCH 20/29] drm/gma500/oaktrail_crtc: Demote unworthy kernel-doc headers

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/gma500/oaktrail_crtc.c:184: warning: Function parameter or member 'limit' not described in 'mrst_lvds_find_best_pll'
drivers/gpu/drm/gma500/oaktrail_crtc.c:184: warning: Function parameter or member 'crtc' not described in 'mrst_lvds_find_best_pll'
drivers/gpu/drm/gma500/oaktrail_crtc.c:184: warning: Function parameter or member 'target' not described in 'mrst_lvds_find_best_pll'
drivers/gpu/drm/gma500/oaktrail_crtc.c:184: warning: Function parameter or member 'refclk' not described in 'mrst_lvds_find_best_pll'
drivers/gpu/drm/gma500/oaktrail_crtc.c:184: warning: Function parameter or member 'best_clock' not described in 'mrst_lvds_find_best_pll'
drivers/gpu/drm/gma500/oaktrail_crtc.c:215: warning: Function parameter or member 'crtc' not described in 'oaktrail_crtc_dpms'
drivers/gpu/drm/gma500/oaktrail_crtc.c:215: warning: Function parameter or member 'mode' not described in 'oaktrail_crtc_dpms'
drivers/gpu/drm/gma500/oaktrail_crtc.c:345: warning: Function parameter or member 'dev' not described in 'oaktrail_panel_fitter_pipe'

Cc: Patrik Jakobsson <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/gma500/oaktrail_crtc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c
index 900e5499249d5..129f879710022 100644
--- a/drivers/gpu/drm/gma500/oaktrail_crtc.c
+++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c
@@ -174,7 +174,7 @@ static bool mrst_sdvo_find_best_pll(const struct gma_limit_t *limit,
return min_error == 0;
}

-/**
+/*
* Returns a set of divisors for the desired target clock with the given refclk,
* or FALSE. Divisor values are the actual divisors for
*/
@@ -205,7 +205,7 @@ static bool mrst_lvds_find_best_pll(const struct gma_limit_t *limit,
return err != target;
}

-/**
+/*
* Sets the power management mode of the pipe and plane.
*
* This code should probably grow support for turning the cursor off and back
@@ -337,7 +337,7 @@ static void oaktrail_crtc_dpms(struct drm_crtc *crtc, int mode)
gma_power_end(dev);
}

-/**
+/*
* Return the pipe currently connected to the panel fitter,
* or -1 if the panel fitter is not present or not in use
*/
--
2.25.1

2021-01-15 18:23:23

by Lee Jones

[permalink] [raw]
Subject: [PATCH 23/29] drm/drm_agpsupport: Strip out obviously wrong descriptions and demote to standard headers

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/drm_agpsupport.c:61: warning: Function parameter or member 'dev' not described in 'drm_agp_info'
drivers/gpu/drm/drm_agpsupport.c:61: warning: Function parameter or member 'info' not described in 'drm_agp_info'
drivers/gpu/drm/drm_agpsupport.c:105: warning: Function parameter or member 'dev' not described in 'drm_agp_acquire'
drivers/gpu/drm/drm_agpsupport.c:132: warning: Function parameter or member 'dev' not described in 'drm_agp_acquire_ioctl'
drivers/gpu/drm/drm_agpsupport.c:132: warning: Function parameter or member 'data' not described in 'drm_agp_acquire_ioctl'
drivers/gpu/drm/drm_agpsupport.c:132: warning: Function parameter or member 'file_priv' not described in 'drm_agp_acquire_ioctl'
drivers/gpu/drm/drm_agpsupport.c:145: warning: Function parameter or member 'dev' not described in 'drm_agp_release'
drivers/gpu/drm/drm_agpsupport.c:171: warning: Function parameter or member 'dev' not described in 'drm_agp_enable'
drivers/gpu/drm/drm_agpsupport.c:171: warning: Function parameter or member 'mode' not described in 'drm_agp_enable'
drivers/gpu/drm/drm_agpsupport.c:203: warning: Function parameter or member 'dev' not described in 'drm_agp_alloc'
drivers/gpu/drm/drm_agpsupport.c:203: warning: Function parameter or member 'request' not described in 'drm_agp_alloc'
drivers/gpu/drm/drm_agpsupport.c:256: warning: Function parameter or member 'dev' not described in 'drm_agp_lookup_entry'
drivers/gpu/drm/drm_agpsupport.c:256: warning: Function parameter or member 'handle' not described in 'drm_agp_lookup_entry'
drivers/gpu/drm/drm_agpsupport.c:279: warning: Function parameter or member 'dev' not described in 'drm_agp_unbind'
drivers/gpu/drm/drm_agpsupport.c:279: warning: Function parameter or member 'request' not described in 'drm_agp_unbind'
drivers/gpu/drm/drm_agpsupport.c:318: warning: Function parameter or member 'dev' not described in 'drm_agp_bind'
drivers/gpu/drm/drm_agpsupport.c:318: warning: Function parameter or member 'request' not described in 'drm_agp_bind'
drivers/gpu/drm/drm_agpsupport.c:363: warning: Function parameter or member 'dev' not described in 'drm_agp_free'
drivers/gpu/drm/drm_agpsupport.c:363: warning: Function parameter or member 'request' not described in 'drm_agp_free'
drivers/gpu/drm/drm_agpsupport.c:404: warning: Function parameter or member 'dev' not described in 'drm_agp_init'

Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Faith <[email protected]>
Cc: Gareth Hughes <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/drm_agpsupport.c | 46 ++++++++------------------------
1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index 8b690ef306dec..7ae446fb84ad2 100644
--- a/drivers/gpu/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c
@@ -45,13 +45,9 @@

#include "drm_legacy.h"

-/**
+/*
* Get AGP information.
*
- * \param inode device inode.
- * \param file_priv DRM file private.
- * \param cmd command.
- * \param arg pointer to a (output) drm_agp_info structure.
* \return zero on success or a negative number on failure.
*
* Verifies the AGP device has been initialized and acquired and fills in the
@@ -92,7 +88,7 @@ int drm_agp_info_ioctl(struct drm_device *dev, void *data,
return 0;
}

-/**
+/*
* Acquire the AGP device.
*
* \param dev DRM device that is to acquire AGP.
@@ -115,13 +111,9 @@ int drm_agp_acquire(struct drm_device *dev)
}
EXPORT_SYMBOL(drm_agp_acquire);

-/**
+/*
* Acquire the AGP device (ioctl).
*
- * \param inode device inode.
- * \param file_priv DRM file private.
- * \param cmd command.
- * \param arg user argument.
* \return zero on success or a negative number on failure.
*
* Verifies the AGP device hasn't been acquired before and calls
@@ -133,7 +125,7 @@ int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
return drm_agp_acquire((struct drm_device *) file_priv->minor->dev);
}

-/**
+/*
* Release the AGP device.
*
* \param dev DRM device that is to release AGP.
@@ -157,7 +149,7 @@ int drm_agp_release_ioctl(struct drm_device *dev, void *data,
return drm_agp_release(dev);
}

-/**
+/*
* Enable the AGP bus.
*
* \param dev DRM device that has previously acquired AGP.
@@ -187,13 +179,9 @@ int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
return drm_agp_enable(dev, *mode);
}

-/**
+/*
* Allocate AGP memory.
*
- * \param inode device inode.
- * \param file_priv file private pointer.
- * \param cmd command.
- * \param arg pointer to a drm_agp_buffer structure.
* \return zero on success or a negative number on failure.
*
* Verifies the AGP device is present and has been acquired, allocates the
@@ -242,7 +230,7 @@ int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
return drm_agp_alloc(dev, request);
}

-/**
+/*
* Search for the AGP memory entry associated with a handle.
*
* \param dev DRM device structure.
@@ -263,13 +251,9 @@ static struct drm_agp_mem *drm_agp_lookup_entry(struct drm_device *dev,
return NULL;
}

-/**
+/*
* Unbind AGP memory from the GATT (ioctl).
*
- * \param inode device inode.
- * \param file_priv DRM file private.
- * \param cmd command.
- * \param arg pointer to a drm_agp_binding structure.
* \return zero on success or a negative number on failure.
*
* Verifies the AGP device is present and acquired, looks-up the AGP memory
@@ -301,13 +285,9 @@ int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
return drm_agp_unbind(dev, request);
}

-/**
+/*
* Bind AGP memory into the GATT (ioctl)
*
- * \param inode device inode.
- * \param file_priv DRM file private.
- * \param cmd command.
- * \param arg pointer to a drm_agp_binding structure.
* \return zero on success or a negative number on failure.
*
* Verifies the AGP device is present and has been acquired and that no memory
@@ -345,13 +325,9 @@ int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
return drm_agp_bind(dev, request);
}

-/**
+/*
* Free AGP memory (ioctl).
*
- * \param inode device inode.
- * \param file_priv DRM file private.
- * \param cmd command.
- * \param arg pointer to a drm_agp_buffer structure.
* \return zero on success or a negative number on failure.
*
* Verifies the AGP device is present and has been acquired and looks up the
@@ -388,7 +364,7 @@ int drm_agp_free_ioctl(struct drm_device *dev, void *data,
return drm_agp_free(dev, request);
}

-/**
+/*
* Initialize the AGP resources.
*
* \return pointer to a drm_agp_head structure.
--
2.25.1

2021-01-15 18:23:31

by Lee Jones

[permalink] [raw]
Subject: [PATCH 26/29] drm/nouveau/nouveau_svm: Remove unused variable 'ret' from void function

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/nouveau/nouveau_svm.c: In function ‘nouveau_pfns_map’:
drivers/gpu/drm/nouveau/nouveau_svm.c:810:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]

Cc: Ben Skeggs <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/nouveau/nouveau_svm.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c
index 4f69e4c3dafde..84c5bf53fe967 100644
--- a/drivers/gpu/drm/nouveau/nouveau_svm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_svm.c
@@ -807,7 +807,6 @@ nouveau_pfns_map(struct nouveau_svmm *svmm, struct mm_struct *mm,
unsigned long addr, u64 *pfns, unsigned long npages)
{
struct nouveau_pfnmap_args *args = nouveau_pfns_to_args(pfns);
- int ret;

args->p.addr = addr;
args->p.size = npages << PAGE_SHIFT;
@@ -815,8 +814,8 @@ nouveau_pfns_map(struct nouveau_svmm *svmm, struct mm_struct *mm,
mutex_lock(&svmm->mutex);

svmm->vmm->vmm.object.client->super = true;
- ret = nvif_object_ioctl(&svmm->vmm->vmm.object, args, sizeof(*args) +
- npages * sizeof(args->p.phys[0]), NULL);
+ nvif_object_ioctl(&svmm->vmm->vmm.object, args, sizeof(*args) +
+ npages * sizeof(args->p.phys[0]), NULL);
svmm->vmm->vmm.object.client->super = false;

mutex_unlock(&svmm->mutex);
--
2.25.1

2021-01-15 18:24:12

by Lee Jones

[permalink] [raw]
Subject: [PATCH 07/29] drm/vmwgfx/vmwgfx_blit: Add description for 'vmw_bo_cpu_blit's 'diff' param

Fixes the following W=1 kernel build warning(s):

drivers/gpu/drm/vmwgfx/vmwgfx_blit.c:452: warning: Function parameter or member 'diff' not described in 'vmw_bo_cpu_blit'

Cc: VMware Graphics <[email protected]>
Cc: Roland Scheidegger <[email protected]>
Cc: Zack Rusin <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/vmwgfx/vmwgfx_blit.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c b/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c
index 9f2779ddcf083..118db24eb756c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_blit.c
@@ -431,6 +431,7 @@ static int vmw_bo_cpu_blit_line(struct vmw_bo_blit_line_data *d,
* @src_stride: Source stride in bytes.
* @w: Width of blit.
* @h: Height of blit.
+ * @diff: The struct vmw_diff_cpy used to track the modified bounding box.
* return: Zero on success. Negative error value on failure. Will print out
* kernel warnings on caller bugs.
*
--
2.25.1

2021-01-15 18:32:15

by Zack Rusin

[permalink] [raw]
Subject: Re: [PATCH 00/29] [Set 15] Finally rid W=1 warnings from GPU!


> On Jan 15, 2021, at 13:15, Lee Jones <[email protected]> wrote:
>
> This set is part of a larger effort attempting to clean-up W=1
> kernel builds, which are currently overwhelmingly riddled with
> niggly little warnings.
>
> Last set! All clean after this for; Arm, Arm64, PPC, MIPS and x86.

Thanks! For all the vmwgfx bits:
Reviewed-by: Zack Rusin <[email protected]>

z

2021-01-18 10:20:54

by Daniel Vetter

[permalink] [raw]
Subject: Re: [PATCH 00/29] [Set 15] Finally rid W=1 warnings from GPU!

On Fri, Jan 15, 2021 at 06:27:15PM +0000, Zack Rusin wrote:
>
> > On Jan 15, 2021, at 13:15, Lee Jones <[email protected]> wrote:
> >
> > This set is part of a larger effort attempting to clean-up W=1
> > kernel builds, which are currently overwhelmingly riddled with
> > niggly little warnings.
> >
> > Last set! All clean after this for; Arm, Arm64, PPC, MIPS and x86.
>
> Thanks! For all the vmwgfx bits:
> Reviewed-by: Zack Rusin <[email protected]>

Can you pls push them to drm-misc-next? I'm planning to go pull in all the
other patches later today that belong into drm-misc-next, but some patch
monkey help would be really great :-)

Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

2021-01-19 04:35:45

by Daniel Vetter

[permalink] [raw]
Subject: Re: [PATCH 00/29] [Set 15] Finally rid W=1 warnings from GPU!

On Fri, Jan 15, 2021 at 06:27:15PM +0000, Zack Rusin wrote:
>
> > On Jan 15, 2021, at 13:15, Lee Jones <[email protected]> wrote:
> >
> > This set is part of a larger effort attempting to clean-up W=1
> > kernel builds, which are currently overwhelmingly riddled with
> > niggly little warnings.
> >
> > Last set! All clean after this for; Arm, Arm64, PPC, MIPS and x86.
>
> Thanks! For all the vmwgfx bits:
> Reviewed-by: Zack Rusin <[email protected]>

Ok I merged everything except vmwgfx (that's for Zack) and i915/nouveau
(those generally go through other trees, pls holler if they're stuck).

Note that we have some build issue on some of the configs sfr uses, so drm
trees are still stuck on old versions in linux-next. Hopefully should get
resolved soon, the bugfix is in some subtree I've heard.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

2021-01-19 04:39:04

by Lee Jones

[permalink] [raw]
Subject: Re: [PATCH 00/29] [Set 15] Finally rid W=1 warnings from GPU!

On Mon, 18 Jan 2021, Daniel Vetter wrote:

> On Fri, Jan 15, 2021 at 06:27:15PM +0000, Zack Rusin wrote:
> >
> > > On Jan 15, 2021, at 13:15, Lee Jones <[email protected]> wrote:
> > >
> > > This set is part of a larger effort attempting to clean-up W=1
> > > kernel builds, which are currently overwhelmingly riddled with
> > > niggly little warnings.
> > >
> > > Last set! All clean after this for; Arm, Arm64, PPC, MIPS and x86.
> >
> > Thanks! For all the vmwgfx bits:
> > Reviewed-by: Zack Rusin <[email protected]>
>
> Ok I merged everything except vmwgfx (that's for Zack) and i915/nouveau
> (those generally go through other trees, pls holler if they're stuck).

Thanks Daniel, you're a superstar!

So Zack will take the vmwgfx parts? Despite providing a R-b?

> Note that we have some build issue on some of the configs sfr uses, so drm
> trees are still stuck on old versions in linux-next. Hopefully should get
> resolved soon, the bugfix is in some subtree I've heard.

No worries. Thanks for letting me know.

--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

2021-01-19 04:52:10

by Daniel Vetter

[permalink] [raw]
Subject: Re: [PATCH 00/29] [Set 15] Finally rid W=1 warnings from GPU!

On Mon, Jan 18, 2021 at 03:09:45PM +0000, Lee Jones wrote:
> On Mon, 18 Jan 2021, Daniel Vetter wrote:
>
> > On Fri, Jan 15, 2021 at 06:27:15PM +0000, Zack Rusin wrote:
> > >
> > > > On Jan 15, 2021, at 13:15, Lee Jones <[email protected]> wrote:
> > > >
> > > > This set is part of a larger effort attempting to clean-up W=1
> > > > kernel builds, which are currently overwhelmingly riddled with
> > > > niggly little warnings.
> > > >
> > > > Last set! All clean after this for; Arm, Arm64, PPC, MIPS and x86.
> > >
> > > Thanks! For all the vmwgfx bits:
> > > Reviewed-by: Zack Rusin <[email protected]>
> >
> > Ok I merged everything except vmwgfx (that's for Zack) and i915/nouveau
> > (those generally go through other trees, pls holler if they're stuck).
>
> Thanks Daniel, you're a superstar!
>
> So Zack will take the vmwgfx parts? Despite providing a R-b?

I only merge stuff that's defacto abandoned already. Everything else I try
to offload to whomever actually cares :-)
-Daniel

>
> > Note that we have some build issue on some of the configs sfr uses, so drm
> > trees are still stuck on old versions in linux-next. Hopefully should get
> > resolved soon, the bugfix is in some subtree I've heard.
>
> No worries. Thanks for letting me know.
>
> --
> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

2021-01-19 08:32:09

by Lee Jones

[permalink] [raw]
Subject: Re: [PATCH 00/29] [Set 15] Finally rid W=1 warnings from GPU!

On Mon, 18 Jan 2021, Daniel Vetter wrote:

> On Mon, Jan 18, 2021 at 03:09:45PM +0000, Lee Jones wrote:
> > On Mon, 18 Jan 2021, Daniel Vetter wrote:
> >
> > > On Fri, Jan 15, 2021 at 06:27:15PM +0000, Zack Rusin wrote:
> > > >
> > > > > On Jan 15, 2021, at 13:15, Lee Jones <[email protected]> wrote:
> > > > >
> > > > > This set is part of a larger effort attempting to clean-up W=1
> > > > > kernel builds, which are currently overwhelmingly riddled with
> > > > > niggly little warnings.
> > > > >
> > > > > Last set! All clean after this for; Arm, Arm64, PPC, MIPS and x86.
> > > >
> > > > Thanks! For all the vmwgfx bits:
> > > > Reviewed-by: Zack Rusin <[email protected]>
> > >
> > > Ok I merged everything except vmwgfx (that's for Zack) and i915/nouveau
> > > (those generally go through other trees, pls holler if they're stuck).
> >
> > Thanks Daniel, you're a superstar!
> >
> > So Zack will take the vmwgfx parts? Despite providing a R-b?
>
> I only merge stuff that's defacto abandoned already. Everything else I try
> to offload to whomever actually cares :-)

Understood. Thanks for the explanation.

Hopefully Zack actually cares. :D

--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

2021-01-19 19:38:56

by Zack Rusin

[permalink] [raw]
Subject: Re: [PATCH 00/29] [Set 15] Finally rid W=1 warnings from GPU!



> On Jan 19, 2021, at 03:29, Lee Jones <[email protected]> wrote:
>
> On Mon, 18 Jan 2021, Daniel Vetter wrote:
>
>> On Mon, Jan 18, 2021 at 03:09:45PM +0000, Lee Jones wrote:
>>> On Mon, 18 Jan 2021, Daniel Vetter wrote:
>>>
>>>> On Fri, Jan 15, 2021 at 06:27:15PM +0000, Zack Rusin wrote:
>>>>>
>>>>>> On Jan 15, 2021, at 13:15, Lee Jones <[email protected]> wrote:
>>>>>>
>>>>>> This set is part of a larger effort attempting to clean-up W=1
>>>>>> kernel builds, which are currently overwhelmingly riddled with
>>>>>> niggly little warnings.
>>>>>>
>>>>>> Last set! All clean after this for; Arm, Arm64, PPC, MIPS and x86.
>>>>>
>>>>> Thanks! For all the vmwgfx bits:
>>>>> Reviewed-by: Zack Rusin <[email protected]>
>>>>
>>>> Ok I merged everything except vmwgfx (that's for Zack) and i915/nouveau
>>>> (those generally go through other trees, pls holler if they're stuck).
>>>
>>> Thanks Daniel, you're a superstar!
>>>
>>> So Zack will take the vmwgfx parts? Despite providing a R-b?
>>
>> I only merge stuff that's defacto abandoned already. Everything else I try
>> to offload to whomever actually cares :-)
>
> Understood. Thanks for the explanation.
>
> Hopefully Zack actually cares. :D

hah, I do. I just pushed all of the changes to drm-misc-next. Let me know if I missed anything. Thanks!

z


2021-01-20 08:21:02

by Lee Jones

[permalink] [raw]
Subject: Re: [PATCH 00/29] [Set 15] Finally rid W=1 warnings from GPU!

On Tue, 19 Jan 2021, Zack Rusin wrote:

>
>
> > On Jan 19, 2021, at 03:29, Lee Jones <[email protected]> wrote:
> >
> > On Mon, 18 Jan 2021, Daniel Vetter wrote:
> >
> >> On Mon, Jan 18, 2021 at 03:09:45PM +0000, Lee Jones wrote:
> >>> On Mon, 18 Jan 2021, Daniel Vetter wrote:
> >>>
> >>>> On Fri, Jan 15, 2021 at 06:27:15PM +0000, Zack Rusin wrote:
> >>>>>
> >>>>>> On Jan 15, 2021, at 13:15, Lee Jones <[email protected]> wrote:
> >>>>>>
> >>>>>> This set is part of a larger effort attempting to clean-up W=1
> >>>>>> kernel builds, which are currently overwhelmingly riddled with
> >>>>>> niggly little warnings.
> >>>>>>
> >>>>>> Last set! All clean after this for; Arm, Arm64, PPC, MIPS and x86.
> >>>>>
> >>>>> Thanks! For all the vmwgfx bits:
> >>>>> Reviewed-by: Zack Rusin <[email protected]>
> >>>>
> >>>> Ok I merged everything except vmwgfx (that's for Zack) and i915/nouveau
> >>>> (those generally go through other trees, pls holler if they're stuck).
> >>>
> >>> Thanks Daniel, you're a superstar!
> >>>
> >>> So Zack will take the vmwgfx parts? Despite providing a R-b?
> >>
> >> I only merge stuff that's defacto abandoned already. Everything else I try
> >> to offload to whomever actually cares :-)
> >
> > Understood. Thanks for the explanation.
> >
> > Hopefully Zack actually cares. :D
>
> hah, I do. I just pushed all of the changes to drm-misc-next. Let me
> know if I missed anything. Thanks!

Perfect. Thank you Zack.

--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog