Re: [PATCH 16/28] drm/i915/color: Create a transfer function color pipeline
Hi Uma,
kernel test robot noticed the following build warnings:
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url:
https://github.com/intel-lab-lkp/linux/commits/Uma-Shankar/drm-color-pipeline-base-work/20240213-144544
base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next
patch link:
https://lore.kernel.org/r/20240213064835.139464-17-uma.shankar%40intel.com
patch subject: [PATCH 16/28] drm/i915/color: Create a transfer function color
pipeline
config: i386-randconfig-141-20240217
(https://download.01.org/0day-ci/archive/20240218/202402180310.gmdixajx-...@intel.com/config)
compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project
6009708b4367171ccdbf4b5905cb6a803753fe18)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot
| Reported-by: Dan Carpenter
| Closes: https://lore.kernel.org/r/202402180310.gmdixajx-...@intel.com/
New smatch warnings:
drivers/gpu/drm/i915/display/intel_color.c:3867 intel_plane_tf_pipeline_init()
error: 'colorop' dereferencing possible ERR_PTR()
vim +/colorop +3867 drivers/gpu/drm/i915/display/intel_color.c
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3852 int
intel_plane_tf_pipeline_init(struct drm_plane *plane, struct drm_prop_enum_list
*list)
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3853 {
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3854 struct intel_plane
*intel_plane = to_intel_plane(plane);
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3855 struct
intel_plane_colorop *colorop;
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3856 struct drm_device *dev
= plane->dev;
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3857 struct drm_i915_private
*i915 = to_i915(dev);
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3858 int ret;
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3859 struct drm_colorop
*prev_op;
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3860
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3861 colorop =
intel_plane_colorop_create(CB_PLANE_PRE_CSC_LUT);
No error checking
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3862
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3863 ret =
drm_colorop_init(dev, >base, plane, DRM_COLOROP_1D_LUT);
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3864 if (ret)
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3865 return ret;
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3866
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 @3867 list->type =
colorop->base.base.id;
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3868 list->name =
kasprintf(GFP_KERNEL, "Color Pipeline %d", colorop->base.base.id);
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3869
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3870 /* TODO: handle
failures and clean up*/
5e1e0f87c9bcae Chaitanya Kumar Borah 2024-02-13 3871 prev_op =
>base;
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
[PATCH 16/28] drm/i915/color: Create a transfer function color pipeline
From: Chaitanya Kumar Borah
Add a color pipeline with three colorops in the sequence
1D LUT - CTM - 1D LUT
This pipeline can be used to do any color space conversion or HDR
tone mapping
Signed-off-by: Chaitanya Kumar Borah
Signed-off-by: Uma Shankar
---
drivers/gpu/drm/i915/display/intel_color.c | 42 ++
drivers/gpu/drm/i915/display/intel_color.h | 3 ++
2 files changed, 45 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_color.c
b/drivers/gpu/drm/i915/display/intel_color.c
index e187135d4363..e223edbe4c13 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -28,6 +28,7 @@
#include "intel_de.h"
#include "intel_display_types.h"
#include "intel_dsb.h"
+#include "skl_universal_plane.h"
struct intel_color_funcs {
int (*color_check)(struct intel_crtc_state *crtc_state);
@@ -3849,6 +3850,47 @@ struct intel_plane_colorop
*intel_plane_colorop_create(enum intel_color_block id
return colorop;
}
+int intel_plane_tf_pipeline_init(struct drm_plane *plane, struct
drm_prop_enum_list *list)
+{
+ struct intel_plane *intel_plane = to_intel_plane(plane);
+ struct intel_plane_colorop *colorop;
+ struct drm_device *dev = plane->dev;
+ struct drm_i915_private *i915 = to_i915(dev);
+ int ret;
+ struct drm_colorop *prev_op;
+
+ colorop = intel_plane_colorop_create(CB_PLANE_PRE_CSC_LUT);
+
+ ret = drm_colorop_init(dev, >base, plane, DRM_COLOROP_1D_LUT);
+ if (ret)
+ return ret;
+
+ list->type = colorop->base.base.id;
+ list->name = kasprintf(GFP_KERNEL, "Color Pipeline %d",
colorop->base.base.id);
+
+ /* TODO: handle failures and clean up*/
+ prev_op = >base;
+
+ if (icl_is_hdr_plane(i915, intel_plane->id)) {
+ colorop = intel_plane_colorop_create(CB_PLANE_CSC);
+ ret = drm_colorop_init(dev, >base, plane,
DRM_COLOROP_CTM_3X3);
+ if (ret)
+ return ret;
+
+ drm_colorop_set_next_property(prev_op, >base);
+ prev_op = >base;
+ }
+
+ colorop = intel_plane_colorop_create(CB_PLANE_POST_CSC_LUT);
+ ret = drm_colorop_init(dev, >base, plane, DRM_COLOROP_1D_LUT);
+ if (ret)
+ return ret;
+
+ drm_colorop_set_next_property(prev_op, >base);
+
+ return 0;
+}
+
void intel_color_crtc_init(struct intel_crtc *crtc)
{
struct drm_i915_private *i915 = to_i915(crtc->base.dev);
diff --git a/drivers/gpu/drm/i915/display/intel_color.h
b/drivers/gpu/drm/i915/display/intel_color.h
index d03dad425671..e0b75dcb1b65 100644
--- a/drivers/gpu/drm/i915/display/intel_color.h
+++ b/drivers/gpu/drm/i915/display/intel_color.h
@@ -12,6 +12,8 @@ struct intel_crtc_state;
struct intel_crtc;
struct drm_i915_private;
struct drm_property_blob;
+struct drm_plane;
+struct drm_prop_enum_list;
enum intel_color_block;
void intel_color_init_hooks(struct drm_i915_private *i915);
@@ -34,5 +36,6 @@ bool intel_color_lut_equal(const struct intel_crtc_state
*crtc_state,
void intel_color_assert_luts(const struct intel_crtc_state *crtc_state);
struct intel_plane_colorop *intel_colorop_alloc(void);
struct intel_plane_colorop *intel_plane_colorop_create(enum intel_color_block
id);
+int intel_plane_tf_pipeline_init(struct drm_plane *plane, struct
drm_prop_enum_list *list);
#endif /* __INTEL_COLOR_H__ */
--
2.42.0
