mbox series

[v2,00/42] Rid W=1 warnings from GPU (non-Radeon)

Message ID 20201116174112.1833368-1-lee.jones@linaro.org
Headers show
Series Rid W=1 warnings from GPU (non-Radeon) | expand

Message

Lee Jones Nov. 16, 2020, 5:40 p.m. UTC
[sending again, as `git send-email` crashed!]

This set contains fixes for some "wouldn't it be nice if" issues,
however most of the patches seen here have been on the MLs, but
were left unreviewed.

Lee Jones (42):
  drm/amd/amdgpu/atombios_encoders: Remove set but unused variable
    'backlight_level'
  drm/armada/armada_overlay: Staticify local function
    'armada_overlay_duplicate_state'
  drm/drm_dp_mst_topology: Remove set but never used variable 'len'
  drm/exynos/exynos7_drm_decon: Supply missing description for  param
    'ctx'
  drm/exynos/exynos_drm_fimd: Add missing description for param 'ctx'
  drm/exynos/exynos_drm_gsc: Supply missing description for 'num_limits'
  drm/mediatek/mtk_dpi: Remove unused struct definition
    'mtk_dpi_encoder_funcs'
  drm/mediatek/mtk_disp_color: Fix formatting and provide missing member
    description
  drm/mediatek/mtk_disp_ovl: Fix formatting and provide missing member
    description
  drm/mediatek/mtk_disp_rdma: Fix formatting and supply missing struct
    member description
  drm/mediatek/mtk_drm_crtc: Demote seriously out-of-date struct header
  drm/mediatek/mtk_drm_drv: Staticise local function invoked by
    reference
  drm/meson/meson_venc: Make local function
    'meson_venc_hdmi_get_dmt_vmode' static
  drm/meson/meson_vclk: Make two local functions static
  drm/msm/adreno/a6xx_gpu: Staticise local function 'a6xx_idle'
  drm/msm/disp/mdp5/mdp5_crtc: Make local function
    'mdp5_crtc_setup_pipeline()' static
  drm/msm/disp/mdp5/mdp5_ctl: Demote non-conformant kernel-doc headers
  drm/msm/disp/mdp5/mdp5_kms: Make local functions 'mdp5_{en,dis}able()'
    static
  drm/msm/disp/dpu1/dpu_core_perf: Remove set but unused variable
    'dpu_cstate'
  drm/msm/disp/dpu1/dpu_encoder: Remove a bunch of unused variables
  drm/nouveau/nvkm/core/firmware: Fix formatting, provide missing param
    description
  drm/pl111/pl111_display: Make local function static
  drm/pl111/pl111_debugfs: Make local function 'pl111_debugfs_regs()'
    static
  drm/rockchip/dw-mipi-dsi-rockchip: Demote non-conformant kernel-doc
    headers
  drm/rockchip/rockchip_rgb: Consume our own header
  drm/rockchip/rockchip_lvds: Fix struct document formatting
  drm/selftests/test-drm_mm: Mark 'hole_end' as always_unused
  drm/selftests/test-drm_framebuffer: Remove set but unused variable
    'fb'
  drm/selftests/test-drm_dp_mst_helper: Place 'struct
    drm_dp_sideband_msg_req_body' onto the heap
  drm/selftests/test-drm_dp_mst_helper: Move
    'sideband_msg_req_encode_decode' onto the heap
  drm/ttm/ttm_bo: Fix one function header - demote lots of kernel-doc
    abuses
  drm/ttm/ttm_tt: Demote kernel-doc header format abuses
  drm/ttm/ttm_range_manager: Demote non-conformant kernel-doc header
  drm/v3d/v3d_drv: Remove unused static variable 'v3d_v3d_pm_ops'
  drm/v3d/v3d_gem: Provide descriptions for 'v3d_lookup_bos's params
  drm/v3d/v3d_sched: Demote non-conformant kernel-doc header
  drm/vc4/vc4_hdmi_regs: Mark some data sets as __maybe_unused
  drm/vc4/vc4_hdmi: Remove set but unused variable 'ret'
  drm/vc4/vc4_v3d: Demote non-conformant kernel-doc headers
  drm/vc4/vc4_debugfs: Demote non-conformant kernel-doc headers
  gpu/ipu-v3/ipu-di: Strip out 2 unused 'di_sync_config' entries
  include/drm/drm_atomic: Make use of 'new_crtc_state'

 .../gpu/drm/amd/amdgpu/atombios_encoders.c    |  3 --
 drivers/gpu/drm/armada/armada_overlay.c       |  2 +-
 drivers/gpu/drm/drm_dp_mst_topology.c         |  4 +-
 drivers/gpu/drm/exynos/exynos7_drm_decon.c    |  1 +
 drivers/gpu/drm/exynos/exynos_drm_fimd.c      |  1 +
 drivers/gpu/drm/exynos/exynos_drm_gsc.c       |  1 +
 drivers/gpu/drm/mediatek/mtk_disp_color.c     |  5 ++-
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c       |  5 ++-
 drivers/gpu/drm/mediatek/mtk_disp_rdma.c      |  5 ++-
 drivers/gpu/drm/mediatek/mtk_dpi.c            |  9 -----
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c       |  4 +-
 drivers/gpu/drm/mediatek/mtk_drm_drv.c        |  4 +-
 drivers/gpu/drm/meson/meson_vclk.c            |  8 ++--
 drivers/gpu/drm/meson/meson_venc.c            |  4 +-
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c         |  2 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c |  3 --
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c   | 12 +-----
 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c     |  6 +--
 drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c      |  6 +--
 drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c      |  4 +-
 drivers/gpu/drm/nouveau/nvkm/core/firmware.c  |  9 +++--
 drivers/gpu/drm/pl111/pl111_debugfs.c         |  2 +-
 drivers/gpu/drm/pl111/pl111_display.c         |  2 +-
 .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c   |  4 +-
 drivers/gpu/drm/rockchip/rockchip_lvds.c      |  2 +-
 drivers/gpu/drm/rockchip/rockchip_rgb.c       |  1 +
 .../drm/selftests/test-drm_dp_mst_helper.c    | 40 +++++++++++++------
 .../gpu/drm/selftests/test-drm_framebuffer.c  |  3 +-
 drivers/gpu/drm/selftests/test-drm_mm.c       |  2 +-
 drivers/gpu/drm/ttm/ttm_bo.c                  | 23 ++++++-----
 drivers/gpu/drm/ttm/ttm_range_manager.c       |  2 +-
 drivers/gpu/drm/ttm/ttm_tt.c                  |  4 +-
 drivers/gpu/drm/v3d/v3d_drv.c                 | 36 -----------------
 drivers/gpu/drm/v3d/v3d_gem.c                 |  2 +
 drivers/gpu/drm/v3d/v3d_sched.c               |  2 +-
 drivers/gpu/drm/vc4/vc4_debugfs.c             |  4 +-
 drivers/gpu/drm/vc4/vc4_hdmi.c                |  3 +-
 drivers/gpu/drm/vc4/vc4_hdmi_regs.h           |  6 +--
 drivers/gpu/drm/vc4/vc4_v3d.c                 |  4 +-
 drivers/gpu/ipu-v3/ipu-di.c                   |  4 --
 include/drm/drm_atomic.h                      |  3 +-
 41 files changed, 105 insertions(+), 142 deletions(-)

Cc: Ajay Kumar <ajaykumar.rs@samsung.com>
Cc: Akshu Agarwal <akshua@gmail.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Christian Koenig <christian.koenig@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Chris Zhong <zyw@rock-chips.com>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Cc: David Francis <David.Francis@amd.com>
Cc: dri-devel@lists.freedesktop.org
Cc: Eric Anholt <eric@anholt.net>
Cc: Eunchul Kim <chulspro.kim@samsung.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: freedreno@lists.freedesktop.org
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Huang Rui <ray.huang@amd.com>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Jie Qiu <jie.qiu@mediatek.com>
Cc: Jinyoung Jeon <jy0.jeon@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Kalyan Thota <kalyan_t@codeaurora.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: linaro-mm-sig@lists.linaro.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-media@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: Luben Tuikov <luben.tuikov@amd.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Mark Yao <mark.yao@rock-chips.com>
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Nickey Yang <nickey.yang@rock-chips.com>
Cc: Nirmoy Das <nirmoy.aiemd@gmail.com>
Cc: nouveau@lists.freedesktop.org
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: Sangmin Lee <lsmin.lee@samsung.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Sean Paul <sean@poorly.run>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: YT SHEN <yt.shen@mediatek.com>

Comments

Christian König Nov. 16, 2020, 8:33 p.m. UTC | #1
Am 16.11.20 um 18:41 schrieb Lee Jones:
> Fixes the following W=1 kernel build warning(s):
>
>   drivers/gpu/drm/ttm/ttm_bo.c:51: warning: Function parameter or member 'ttm_global_mutex' not described in 'DEFINE_MUTEX'
>   drivers/gpu/drm/ttm/ttm_bo.c:286: warning: Function parameter or member 'bo' not described in 'ttm_bo_cleanup_memtype_use'
>   drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'bo' not described in 'ttm_bo_cleanup_refs'
>   drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'interruptible' not described in 'ttm_bo_cleanup_refs'
>   drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'no_wait_gpu' not described in 'ttm_bo_cleanup_refs'
>   drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'unlock_resv' not described in 'ttm_bo_cleanup_refs'
>   drivers/gpu/drm/ttm/ttm_bo.c:424: warning: Function parameter or member 'bdev' not described in 'ttm_bo_delayed_delete'
>   drivers/gpu/drm/ttm/ttm_bo.c:424: warning: Function parameter or member 'remove_all' not described in 'ttm_bo_delayed_delete'
>   drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'bo' not described in 'ttm_bo_evict_swapout_allowable'
>   drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'ctx' not described in 'ttm_bo_evict_swapout_allowable'
>   drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'locked' not described in 'ttm_bo_evict_swapout_allowable'
>   drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'busy' not described in 'ttm_bo_evict_swapout_allowable'
>   drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'bo' not described in 'ttm_bo_add_move_fence'
>   drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'man' not described in 'ttm_bo_add_move_fence'
>   drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'mem' not described in 'ttm_bo_add_move_fence'
>   drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'no_wait_gpu' not described in 'ttm_bo_add_move_fence'
>   drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'bo' not described in 'ttm_bo_mem_force_space'
>   drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'place' not described in 'ttm_bo_mem_force_space'
>   drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'mem' not described in 'ttm_bo_mem_force_space'
>   drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'ctx' not described in 'ttm_bo_mem_force_space'
>   drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'bo' not described in 'ttm_bo_mem_space'
>   drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'placement' not described in 'ttm_bo_mem_space'
>   drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'mem' not described in 'ttm_bo_mem_space'
>   drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'ctx' not described in 'ttm_bo_mem_space'
>   drivers/gpu/drm/ttm/ttm_bo.c:1387: warning: Function parameter or member 'ctx' not described in 'ttm_bo_swapout'
>
> Cc: Christian Koenig <christian.koenig@amd.com>
> Cc: Huang Rui <ray.huang@amd.com>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>
> Cc: dri-devel@lists.freedesktop.org
> Cc: linux-media@vger.kernel.org
> Cc: linaro-mm-sig@lists.linaro.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

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

Going to pick that one up for upstreaming.

Thanks,
Christian.

> ---
>   drivers/gpu/drm/ttm/ttm_bo.c | 23 ++++++++++++-----------
>   1 file changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index e6bcbfe530ecc..9a03c7834b1ed 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -45,7 +45,7 @@
>   
>   static void ttm_bo_global_kobj_release(struct kobject *kobj);
>   
> -/**
> +/*
>    * ttm_global_mutex - protecting the global BO state
>    */
>   DEFINE_MUTEX(ttm_global_mutex);
> @@ -278,7 +278,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
>   	return ret;
>   }
>   
> -/**
> +/*
>    * Call bo::reserved.
>    * Will release GPU memory type usage on destruction.
>    * This is the place to put in driver specific hooks to release
> @@ -352,9 +352,10 @@ static void ttm_bo_flush_all_fences(struct ttm_buffer_object *bo)
>    * Must be called with lru_lock and reservation held, this function
>    * will drop the lru lock and optionally the reservation lock before returning.
>    *
> - * @interruptible         Any sleeps should occur interruptibly.
> - * @no_wait_gpu           Never wait for gpu. Return -EBUSY instead.
> - * @unlock_resv           Unlock the reservation lock as well.
> + * @bo:                    The buffer object to clean-up
> + * @interruptible:         Any sleeps should occur interruptibly.
> + * @no_wait_gpu:           Never wait for gpu. Return -EBUSY instead.
> + * @unlock_resv:           Unlock the reservation lock as well.
>    */
>   
>   static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo,
> @@ -420,7 +421,7 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo,
>   	return 0;
>   }
>   
> -/**
> +/*
>    * Traverse the delayed list, and call ttm_bo_cleanup_refs on all
>    * encountered buffers.
>    */
> @@ -628,7 +629,7 @@ bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
>   }
>   EXPORT_SYMBOL(ttm_bo_eviction_valuable);
>   
> -/**
> +/*
>    * Check the target bo is allowable to be evicted or swapout, including cases:
>    *
>    * a. if share same reservation object with ctx->resv, have assumption
> @@ -767,7 +768,7 @@ int ttm_mem_evict_first(struct ttm_bo_device *bdev,
>   	return ret;
>   }
>   
> -/**
> +/*
>    * Add the last move fence to the BO and reserve a new shared slot.
>    */
>   static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,
> @@ -803,7 +804,7 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,
>   	return 0;
>   }
>   
> -/**
> +/*
>    * Repeatedly evict memory from the LRU for @mem_type until we create enough
>    * space, or we've evicted everything and there isn't enough space.
>    */
> @@ -865,7 +866,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo,
>   	return 0;
>   }
>   
> -/**
> +/*
>    * Creates space for memory region @mem according to its type.
>    *
>    * This function first searches for free space in compatible memory types in
> @@ -1430,7 +1431,7 @@ int ttm_bo_wait(struct ttm_buffer_object *bo,
>   }
>   EXPORT_SYMBOL(ttm_bo_wait);
>   
> -/**
> +/*
>    * A buffer object shrink method that tries to swap out the first
>    * buffer object on the bo_global::swap_lru list.
>    */
Daniel Vetter Nov. 17, 2020, 7:11 p.m. UTC | #2
On Mon, Nov 16, 2020 at 09:33:48PM +0100, Christian König wrote:
> Am 16.11.20 um 18:41 schrieb Lee Jones:

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

> > 

> >   drivers/gpu/drm/ttm/ttm_bo.c:51: warning: Function parameter or member 'ttm_global_mutex' not described in 'DEFINE_MUTEX'

> >   drivers/gpu/drm/ttm/ttm_bo.c:286: warning: Function parameter or member 'bo' not described in 'ttm_bo_cleanup_memtype_use'

> >   drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'bo' not described in 'ttm_bo_cleanup_refs'

> >   drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'interruptible' not described in 'ttm_bo_cleanup_refs'

> >   drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'no_wait_gpu' not described in 'ttm_bo_cleanup_refs'

> >   drivers/gpu/drm/ttm/ttm_bo.c:359: warning: Function parameter or member 'unlock_resv' not described in 'ttm_bo_cleanup_refs'

> >   drivers/gpu/drm/ttm/ttm_bo.c:424: warning: Function parameter or member 'bdev' not described in 'ttm_bo_delayed_delete'

> >   drivers/gpu/drm/ttm/ttm_bo.c:424: warning: Function parameter or member 'remove_all' not described in 'ttm_bo_delayed_delete'

> >   drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'bo' not described in 'ttm_bo_evict_swapout_allowable'

> >   drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'ctx' not described in 'ttm_bo_evict_swapout_allowable'

> >   drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'locked' not described in 'ttm_bo_evict_swapout_allowable'

> >   drivers/gpu/drm/ttm/ttm_bo.c:635: warning: Function parameter or member 'busy' not described in 'ttm_bo_evict_swapout_allowable'

> >   drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'bo' not described in 'ttm_bo_add_move_fence'

> >   drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'man' not described in 'ttm_bo_add_move_fence'

> >   drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'mem' not described in 'ttm_bo_add_move_fence'

> >   drivers/gpu/drm/ttm/ttm_bo.c:769: warning: Function parameter or member 'no_wait_gpu' not described in 'ttm_bo_add_move_fence'

> >   drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'bo' not described in 'ttm_bo_mem_force_space'

> >   drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'place' not described in 'ttm_bo_mem_force_space'

> >   drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'mem' not described in 'ttm_bo_mem_force_space'

> >   drivers/gpu/drm/ttm/ttm_bo.c:806: warning: Function parameter or member 'ctx' not described in 'ttm_bo_mem_force_space'

> >   drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'bo' not described in 'ttm_bo_mem_space'

> >   drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'placement' not described in 'ttm_bo_mem_space'

> >   drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'mem' not described in 'ttm_bo_mem_space'

> >   drivers/gpu/drm/ttm/ttm_bo.c:872: warning: Function parameter or member 'ctx' not described in 'ttm_bo_mem_space'

> >   drivers/gpu/drm/ttm/ttm_bo.c:1387: warning: Function parameter or member 'ctx' not described in 'ttm_bo_swapout'

> > 

> > Cc: Christian Koenig <christian.koenig@amd.com>

> > Cc: Huang Rui <ray.huang@amd.com>

> > Cc: David Airlie <airlied@linux.ie>

> > Cc: Daniel Vetter <daniel@ffwll.ch>

> > Cc: Sumit Semwal <sumit.semwal@linaro.org>

> > Cc: dri-devel@lists.freedesktop.org

> > Cc: linux-media@vger.kernel.org

> > Cc: linaro-mm-sig@lists.linaro.org

> > Signed-off-by: Lee Jones <lee.jones@linaro.org>

> 

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

> 

> Going to pick that one up for upstreaming.


I mass applied this pile, so also this one. Thanks for patch&review.
-Daniel

> 

> Thanks,

> Christian.

> 

> > ---

> >   drivers/gpu/drm/ttm/ttm_bo.c | 23 ++++++++++++-----------

> >   1 file changed, 12 insertions(+), 11 deletions(-)

> > 

> > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c

> > index e6bcbfe530ecc..9a03c7834b1ed 100644

> > --- a/drivers/gpu/drm/ttm/ttm_bo.c

> > +++ b/drivers/gpu/drm/ttm/ttm_bo.c

> > @@ -45,7 +45,7 @@

> >   static void ttm_bo_global_kobj_release(struct kobject *kobj);

> > -/**

> > +/*

> >    * ttm_global_mutex - protecting the global BO state

> >    */

> >   DEFINE_MUTEX(ttm_global_mutex);

> > @@ -278,7 +278,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,

> >   	return ret;

> >   }

> > -/**

> > +/*

> >    * Call bo::reserved.

> >    * Will release GPU memory type usage on destruction.

> >    * This is the place to put in driver specific hooks to release

> > @@ -352,9 +352,10 @@ static void ttm_bo_flush_all_fences(struct ttm_buffer_object *bo)

> >    * Must be called with lru_lock and reservation held, this function

> >    * will drop the lru lock and optionally the reservation lock before returning.

> >    *

> > - * @interruptible         Any sleeps should occur interruptibly.

> > - * @no_wait_gpu           Never wait for gpu. Return -EBUSY instead.

> > - * @unlock_resv           Unlock the reservation lock as well.

> > + * @bo:                    The buffer object to clean-up

> > + * @interruptible:         Any sleeps should occur interruptibly.

> > + * @no_wait_gpu:           Never wait for gpu. Return -EBUSY instead.

> > + * @unlock_resv:           Unlock the reservation lock as well.

> >    */

> >   static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo,

> > @@ -420,7 +421,7 @@ static int ttm_bo_cleanup_refs(struct ttm_buffer_object *bo,

> >   	return 0;

> >   }

> > -/**

> > +/*

> >    * Traverse the delayed list, and call ttm_bo_cleanup_refs on all

> >    * encountered buffers.

> >    */

> > @@ -628,7 +629,7 @@ bool ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,

> >   }

> >   EXPORT_SYMBOL(ttm_bo_eviction_valuable);

> > -/**

> > +/*

> >    * Check the target bo is allowable to be evicted or swapout, including cases:

> >    *

> >    * a. if share same reservation object with ctx->resv, have assumption

> > @@ -767,7 +768,7 @@ int ttm_mem_evict_first(struct ttm_bo_device *bdev,

> >   	return ret;

> >   }

> > -/**

> > +/*

> >    * Add the last move fence to the BO and reserve a new shared slot.

> >    */

> >   static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,

> > @@ -803,7 +804,7 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,

> >   	return 0;

> >   }

> > -/**

> > +/*

> >    * Repeatedly evict memory from the LRU for @mem_type until we create enough

> >    * space, or we've evicted everything and there isn't enough space.

> >    */

> > @@ -865,7 +866,7 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo,

> >   	return 0;

> >   }

> > -/**

> > +/*

> >    * Creates space for memory region @mem according to its type.

> >    *

> >    * This function first searches for free space in compatible memory types in

> > @@ -1430,7 +1431,7 @@ int ttm_bo_wait(struct ttm_buffer_object *bo,

> >   }

> >   EXPORT_SYMBOL(ttm_bo_wait);

> > -/**

> > +/*

> >    * A buffer object shrink method that tries to swap out the first

> >    * buffer object on the bo_global::swap_lru list.

> >    */

> 


-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel