From: abhinavk@codeaurora.org
To: Lee Jones <lee.jones@linaro.org>
Cc: linux-kernel@vger.kernel.org, Rob Clark <robdclark@gmail.com>,
Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
freedreno@lists.freedesktop.org
Subject: Re: [PATCH 14/40] drm/msm/disp/dpu1/dpu_hw_catalog: Move definitions to the only place they are used
Date: Mon, 23 Nov 2020 13:23:25 -0800 [thread overview]
Message-ID: <56afb74961dab35946922ec5fed91502@codeaurora.org> (raw)
In-Reply-To: <20201123111919.233376-15-lee.jones@linaro.org>
On 2020-11-23 03:18, Lee Jones wrote:
> These tables are not large or overbearing, so moving them into the
> source file seems like the right thing to do. The alternative is to
> use __maybe_unused, which is undesirable.
>
> Fixes the following W=1 kernel build warning(s):
>
> In file included from
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c:11:
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h:7:23: warning:
> ‘qcom_compressed_supported_formats’ defined but not used
> [-Wunused-const-variable=]
> 7 | static const uint32_t qcom_compressed_supported_formats[] = {
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h:48:23: warning:
> ‘plane_formats_yuv’ defined but not used [-Wunused-const-variable=]
> 48 | static const uint32_t plane_formats_yuv[] = {
> | ^~~~~~~~~~~~~~~~~
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h:17:23: warning:
> ‘plane_formats’ defined but not used [-Wunused-const-variable=]
> 17 | static const uint32_t plane_formats[] = {
> | ^~~~~~~~~~~~~
>
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Sean Paul <sean@poorly.run>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: linux-arm-msm@vger.kernel.org
> Cc: dri-devel@lists.freedesktop.org
> Cc: freedreno@lists.freedesktop.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
I think this is reasonable,
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
> ---
> .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 74 +++++++++++++++-
> .../drm/msm/disp/dpu1/dpu_hw_catalog_format.h | 88 -------------------
> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 11 ++-
> 3 files changed, 83 insertions(+), 90 deletions(-)
> delete mode 100644
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> index a7004f18523b0..9ed6d0c6cd9b2 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> @@ -8,7 +8,6 @@
> #include <linux/platform_device.h>
> #include "dpu_hw_mdss.h"
> #include "dpu_hw_catalog.h"
> -#include "dpu_hw_catalog_format.h"
> #include "dpu_kms.h"
>
> #define VIG_MASK \
> @@ -62,6 +61,79 @@
>
> #define STRCAT(X, Y) (X Y)
>
> +static const uint32_t plane_formats[] = {
> + DRM_FORMAT_ARGB8888,
> + DRM_FORMAT_ABGR8888,
> + DRM_FORMAT_RGBA8888,
> + DRM_FORMAT_BGRA8888,
> + DRM_FORMAT_XRGB8888,
> + DRM_FORMAT_RGBX8888,
> + DRM_FORMAT_BGRX8888,
> + DRM_FORMAT_XBGR8888,
> + DRM_FORMAT_RGB888,
> + DRM_FORMAT_BGR888,
> + DRM_FORMAT_RGB565,
> + DRM_FORMAT_BGR565,
> + DRM_FORMAT_ARGB1555,
> + DRM_FORMAT_ABGR1555,
> + DRM_FORMAT_RGBA5551,
> + DRM_FORMAT_BGRA5551,
> + DRM_FORMAT_XRGB1555,
> + DRM_FORMAT_XBGR1555,
> + DRM_FORMAT_RGBX5551,
> + DRM_FORMAT_BGRX5551,
> + DRM_FORMAT_ARGB4444,
> + DRM_FORMAT_ABGR4444,
> + DRM_FORMAT_RGBA4444,
> + DRM_FORMAT_BGRA4444,
> + DRM_FORMAT_XRGB4444,
> + DRM_FORMAT_XBGR4444,
> + DRM_FORMAT_RGBX4444,
> + DRM_FORMAT_BGRX4444,
> +};
> +
> +static const uint32_t plane_formats_yuv[] = {
> + DRM_FORMAT_ARGB8888,
> + DRM_FORMAT_ABGR8888,
> + DRM_FORMAT_RGBA8888,
> + DRM_FORMAT_BGRX8888,
> + DRM_FORMAT_BGRA8888,
> + DRM_FORMAT_XRGB8888,
> + DRM_FORMAT_XBGR8888,
> + DRM_FORMAT_RGBX8888,
> + DRM_FORMAT_RGB888,
> + DRM_FORMAT_BGR888,
> + DRM_FORMAT_RGB565,
> + DRM_FORMAT_BGR565,
> + DRM_FORMAT_ARGB1555,
> + DRM_FORMAT_ABGR1555,
> + DRM_FORMAT_RGBA5551,
> + DRM_FORMAT_BGRA5551,
> + DRM_FORMAT_XRGB1555,
> + DRM_FORMAT_XBGR1555,
> + DRM_FORMAT_RGBX5551,
> + DRM_FORMAT_BGRX5551,
> + DRM_FORMAT_ARGB4444,
> + DRM_FORMAT_ABGR4444,
> + DRM_FORMAT_RGBA4444,
> + DRM_FORMAT_BGRA4444,
> + DRM_FORMAT_XRGB4444,
> + DRM_FORMAT_XBGR4444,
> + DRM_FORMAT_RGBX4444,
> + DRM_FORMAT_BGRX4444,
> +
> + DRM_FORMAT_NV12,
> + DRM_FORMAT_NV21,
> + DRM_FORMAT_NV16,
> + DRM_FORMAT_NV61,
> + DRM_FORMAT_VYUY,
> + DRM_FORMAT_UYVY,
> + DRM_FORMAT_YUYV,
> + DRM_FORMAT_YVYU,
> + DRM_FORMAT_YUV420,
> + DRM_FORMAT_YVU420,
> +};
> +
> /*************************************************************
> * DPU sub blocks config
> *************************************************************/
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h
> deleted file mode 100644
> index 3766f0fd0bf08..0000000000000
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h
> +++ /dev/null
> @@ -1,88 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> -/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
> - */
> -
> -#include "dpu_hw_mdss.h"
> -
> -static const uint32_t qcom_compressed_supported_formats[] = {
> - DRM_FORMAT_ABGR8888,
> - DRM_FORMAT_ARGB8888,
> - DRM_FORMAT_XBGR8888,
> - DRM_FORMAT_XRGB8888,
> - DRM_FORMAT_BGR565,
> -
> - DRM_FORMAT_NV12,
> -};
> -
> -static const uint32_t plane_formats[] = {
> - DRM_FORMAT_ARGB8888,
> - DRM_FORMAT_ABGR8888,
> - DRM_FORMAT_RGBA8888,
> - DRM_FORMAT_BGRA8888,
> - DRM_FORMAT_XRGB8888,
> - DRM_FORMAT_RGBX8888,
> - DRM_FORMAT_BGRX8888,
> - DRM_FORMAT_XBGR8888,
> - DRM_FORMAT_RGB888,
> - DRM_FORMAT_BGR888,
> - DRM_FORMAT_RGB565,
> - DRM_FORMAT_BGR565,
> - DRM_FORMAT_ARGB1555,
> - DRM_FORMAT_ABGR1555,
> - DRM_FORMAT_RGBA5551,
> - DRM_FORMAT_BGRA5551,
> - DRM_FORMAT_XRGB1555,
> - DRM_FORMAT_XBGR1555,
> - DRM_FORMAT_RGBX5551,
> - DRM_FORMAT_BGRX5551,
> - DRM_FORMAT_ARGB4444,
> - DRM_FORMAT_ABGR4444,
> - DRM_FORMAT_RGBA4444,
> - DRM_FORMAT_BGRA4444,
> - DRM_FORMAT_XRGB4444,
> - DRM_FORMAT_XBGR4444,
> - DRM_FORMAT_RGBX4444,
> - DRM_FORMAT_BGRX4444,
> -};
> -
> -static const uint32_t plane_formats_yuv[] = {
> - DRM_FORMAT_ARGB8888,
> - DRM_FORMAT_ABGR8888,
> - DRM_FORMAT_RGBA8888,
> - DRM_FORMAT_BGRX8888,
> - DRM_FORMAT_BGRA8888,
> - DRM_FORMAT_XRGB8888,
> - DRM_FORMAT_XBGR8888,
> - DRM_FORMAT_RGBX8888,
> - DRM_FORMAT_RGB888,
> - DRM_FORMAT_BGR888,
> - DRM_FORMAT_RGB565,
> - DRM_FORMAT_BGR565,
> - DRM_FORMAT_ARGB1555,
> - DRM_FORMAT_ABGR1555,
> - DRM_FORMAT_RGBA5551,
> - DRM_FORMAT_BGRA5551,
> - DRM_FORMAT_XRGB1555,
> - DRM_FORMAT_XBGR1555,
> - DRM_FORMAT_RGBX5551,
> - DRM_FORMAT_BGRX5551,
> - DRM_FORMAT_ARGB4444,
> - DRM_FORMAT_ABGR4444,
> - DRM_FORMAT_RGBA4444,
> - DRM_FORMAT_BGRA4444,
> - DRM_FORMAT_XRGB4444,
> - DRM_FORMAT_XBGR4444,
> - DRM_FORMAT_RGBX4444,
> - DRM_FORMAT_BGRX4444,
> -
> - DRM_FORMAT_NV12,
> - DRM_FORMAT_NV21,
> - DRM_FORMAT_NV16,
> - DRM_FORMAT_NV61,
> - DRM_FORMAT_VYUY,
> - DRM_FORMAT_UYVY,
> - DRM_FORMAT_YUYV,
> - DRM_FORMAT_YVYU,
> - DRM_FORMAT_YUV420,
> - DRM_FORMAT_YVU420,
> -};
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index 7ea90d25a3b69..c0b1d77369e53 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -19,7 +19,6 @@
> #include "dpu_kms.h"
> #include "dpu_formats.h"
> #include "dpu_hw_sspp.h"
> -#include "dpu_hw_catalog_format.h"
> #include "dpu_trace.h"
> #include "dpu_crtc.h"
> #include "dpu_vbif.h"
> @@ -63,6 +62,16 @@ enum {
>
> #define DEFAULT_REFRESH_RATE 60
>
> +static const uint32_t qcom_compressed_supported_formats[] = {
> + DRM_FORMAT_ABGR8888,
> + DRM_FORMAT_ARGB8888,
> + DRM_FORMAT_XBGR8888,
> + DRM_FORMAT_XRGB8888,
> + DRM_FORMAT_BGR565,
> +
> + DRM_FORMAT_NV12,
> +};
> +
> /**
> * enum dpu_plane_qos - Different qos configurations for each pipe
> *
next prev parent reply other threads:[~2020-11-23 21:24 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 11:18 [PATCH 00/40] [Set 8] Rid W=1 warnings from GPU Lee Jones
2020-11-23 11:18 ` [PATCH 10/40] drm/msm/disp/dpu1/dpu_core_perf: Fix kernel-doc formatting issues Lee Jones
2020-11-23 21:10 ` [Freedreno] " abhinavk
2020-11-23 11:18 ` [PATCH 11/40] drm/msm/disp/dpu1/dpu_hw_blk: Add one missing and remove an extra param description Lee Jones
2020-11-23 21:06 ` [Freedreno] " abhinavk
2020-11-23 11:18 ` [PATCH 12/40] drm/msm/disp/dpu1/dpu_formats: Demote non-conformant kernel-doc header Lee Jones
2020-11-23 21:08 ` [Freedreno] " abhinavk
2020-11-23 11:18 ` [PATCH 13/40] drm/msm/disp/dpu1/dpu_hw_catalog: Remove duplicated initialisation of 'max_linewidth' Lee Jones
2020-11-23 21:07 ` [Freedreno] " abhinavk
2020-11-23 11:18 ` [PATCH 14/40] drm/msm/disp/dpu1/dpu_hw_catalog: Move definitions to the only place they are used Lee Jones
2020-11-23 21:23 ` abhinavk [this message]
2020-11-23 11:18 ` [PATCH 18/40] drm/msm/disp/dpu1/dpu_encoder: Fix a few parameter/member formatting issues Lee Jones
2020-11-23 21:10 ` [Freedreno] " abhinavk
2020-11-23 11:18 ` [PATCH 19/40] drm/msm/disp/dpu1/dpu_hw_lm: Fix misnaming of parameter 'ctx' Lee Jones
2020-11-23 21:12 ` [Freedreno] " abhinavk
2020-11-23 11:18 ` [PATCH 20/40] drm/msm/disp/dpu1/dpu_hw_sspp: Fix kernel-doc formatting abuse Lee Jones
2020-11-23 21:12 ` [Freedreno] " abhinavk
2020-11-23 11:19 ` [PATCH 31/40] drm/msm/disp/dpu1/dpu_rm: Fix formatting issues and supply 'global_state' description Lee Jones
2020-11-23 21:13 ` [Freedreno] " abhinavk
2020-11-23 11:19 ` [PATCH 32/40] drm/msm/disp/dpu1/dpu_vbif: Fix a couple of function param descriptions Lee Jones
2020-11-23 11:19 ` [PATCH 35/40] drm/msm/disp/dpu1/dpu_plane: Fix some spelling and missing " Lee Jones
2020-11-23 21:13 ` [Freedreno] " abhinavk
2020-11-23 11:19 ` [PATCH 38/40] drm/msm/msm_drv: Make '_msm_ioremap()' static Lee Jones
2020-11-23 21:14 ` [Freedreno] " abhinavk
2020-11-23 11:52 ` [PATCH 00/40] [Set 8] Rid W=1 warnings from GPU Christian König
2020-11-23 12:30 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56afb74961dab35946922ec5fed91502@codeaurora.org \
--to=abhinavk@codeaurora.org \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).