Commit 09c7e370 authored by Lee Jones's avatar Lee Jones Committed by Rob Clark
Browse files

drm/msm/disp/dpu1/dpu_hw_catalog: Move definitions to the only place they are used 



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: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 14bcdfe4

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c

+73 −1
Original line number Diff line number Diff line
@@ -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

 *************************************************************/

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog_format.h

deleted100644 → 0
+0 −88
Original line number Diff line number Diff line 
/* 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,

};

drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c

+10 −1
Original line number Diff line number Diff line
@@ -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

 *