Plane Color Pipeline support for Intel platforms
Subsystems (8)
v3 cover Plane Color Pipeline support for Intel platforms
This series intends to add support for Plane Color Management for Intel platforms. This is based on the design which has been agreed upon by the community. Series implementing the design for generic DRM core has been sent out by Harry Wentland and is under review below:
https://patchwork.freedesktop.org/series/123446/
The base work of above series is squashed under 1 patch and support for Intel platform is added on top of it.
Any reviews on the original core design is expected to be done in Harry's series to avoid any forking of the discussion.
Changes added on core design:
1. Implemented a HW capability property to expose segmented luts.
drm: Add Color lut range attributes
drm: Add Color ops capability property
drm: Define helper to initialize segmented 1D LUT
This helps in generically defining the hardware lut capabilities, lut distribution, precision, segmented or PWL LUTS.
2. Added support for enhanced prescision, 3x3 matrix and 1d LUT:
drm: Add Enhanced LUT precision structure
drm: Add support for 3x3 CTM
drm: Add 1D LUT color op
On top of this base work for DRM core plane color pipeline design, implementation is done for Intel hardware platforms. Below patches include the same:
drm/i915: Add identifiers for intel color blocks drm/i915: Add intel_color_op
drm/i915/color: Add helper to allocate intel colorop drm/i915/color: Add helper to create intel colorop drm/i915/color: Create a transfer function color pipeline drm/i915/color: Add and attach COLORPIPELINE plane property drm/i915/color: Add framework to set colorop drm/i915/color: Add callbacks to set plane CTM drm/i915/color: Add framework to program PRE/POST CSC LUT drm/i915/color: Enable Plane Color Pipelines drm/i915: Define segmented Lut and add capabilities to colorop drm/i915/color: Add plane CTM callback for TGL and beyond drm/i915: Add register definitions for Plane Degamma drm/i915: Add register definitions for Plane Post CSC drm/i915/color: Program Pre-CSC registers drm/i915/xelpd: Program Plane Post CSC Registers
IGT Changes to validate the same have been implemented and can be found in the below github repository:
https://github.com/ckborah/igt-sandbox/tree/amd-intel-color-pipeline-v5-new_seg
Changes in v2:
- Added documentation for hardware capability detection for segmented luts
- Added documentation for lut computation in userspace based on hardware caps
- Updated drm_color_lut_range data structure and handling
- Enhanced the structure to avoid ambiguity and cater to varying hardware implementations of 1D Lut blocks
- replaced drm_color_lut_ext with drm_color_lut32
- Changed namespace for drm_color_lut_range flags (Sebastien)
- Program super fine post csc gamma lut segment for Intel hardware
Changes in v3:
- Rebased on latest plane color pipeline series (v7) from AMD
- Updated documentation for 3x3 CTM colorop (Dmitry)
- Fixed documentation for multi segmented 1D lut (Dmitry)
- Squashed changes for 1d LUT helpers (Dmitry)
ToDo:
- Implement Checks for sanity of hardware capability structure
- Implement and Enhance Checks for user data for Lut Blob
- Implement post blending color API's
Chaitanya Kumar Borah (12):
drm: Add support for 3x3 CTM
drm: Add 1D LUT multi-segmented color op drm/i915: Add identifiers for intel color blocks drm/i915: Add intel_color_op
drm/i915/color: Add helper to create intel colorop drm/i915/color: Create a transfer function color pipeline drm/i915/color: Add and attach COLORPIPELINE plane property drm/i915/color: Add framework to set colorop drm/i915/color: Add callbacks to set plane CTM drm/i915/color: Add new color callbacks for Xelpd drm/i915/color: Add framework to program PRE/POST CSC LUT drm/i915/color: Enable Plane Color Pipelines
Harry Wentland (1):
drm: color pipeline base work
Uma Shankar (10):
drm: Add Enhanced LUT precision structure
drm: Add Color lut range attributes
drm: Add Color ops capability property
drm: Define helper to initialize segmented 1D LUT drm/i915/color: Add plane CTM callback for D13 and beyond drm/i915: Add register definitions for Plane Degamma drm/i915: Add register definitions for Plane Post CSC drm/i915/color: Program Pre-CSC registers drm/i915/xelpd: Program Plane Post CSC Registers drm/doc/rfc: Add documentation for multi-segmented 1D LUT
Documentation/gpu/drm-kms.rst | 15 + Documentation/gpu/rfc/color_pipeline.rst | 518 +++++++++++ Documentation/gpu/rfc/index.rst | 3 + drivers/gpu/drm/Makefile | 1 + .../gpu/drm/amd/display/amdgpu_dm/Makefile | 3 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 + .../amd/display/amdgpu_dm/amdgpu_dm_color.c | 566 ++++++++++++- .../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 206 +++++ .../amd/display/amdgpu_dm/amdgpu_dm_colorop.h | 36 + .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 32 + drivers/gpu/drm/drm_atomic.c | 177 +++- drivers/gpu/drm/drm_atomic_helper.c | 12 + drivers/gpu/drm/drm_atomic_state_helper.c | 5 + drivers/gpu/drm/drm_atomic_uapi.c | 174 ++++ drivers/gpu/drm/drm_color_mgmt.c | 43 + drivers/gpu/drm/drm_colorop.c | 707 ++++++++++++++++ drivers/gpu/drm/drm_ioctl.c | 7 + drivers/gpu/drm/drm_mode_config.c | 7 + drivers/gpu/drm/drm_plane.c | 52 ++ drivers/gpu/drm/i915/display/intel_color.c | 628 +++++++++++++- drivers/gpu/drm/i915/display/intel_color.h | 17 +- .../drm/i915/display/intel_display_limits.h | 13 + .../drm/i915/display/intel_display_types.h | 19 + .../drm/i915/display/skl_universal_plane.c | 5 + .../i915/display/skl_universal_plane_regs.h | 126 +++ drivers/gpu/drm/tests/Makefile | 3 +- drivers/gpu/drm/tests/drm_fixp_test.c | 71 ++ drivers/gpu/drm/vkms/Kconfig | 15 + drivers/gpu/drm/vkms/Makefile | 5 +- drivers/gpu/drm/vkms/tests/.kunitconfig | 4 + drivers/gpu/drm/vkms/tests/Makefile | 3 + drivers/gpu/drm/vkms/tests/vkms_color_test.c | 459 ++++++++++ drivers/gpu/drm/vkms/vkms_colorop.c | 113 +++ drivers/gpu/drm/vkms/vkms_composer.c | 131 ++- drivers/gpu/drm/vkms/vkms_composer.h | 27 + drivers/gpu/drm/vkms/vkms_drv.h | 7 + drivers/gpu/drm/vkms/vkms_luts.c | 801 ++++++++++++++++++ drivers/gpu/drm/vkms/vkms_luts.h | 12 + drivers/gpu/drm/vkms/vkms_plane.c | 1 + include/drm/drm_atomic.h | 130 +++ include/drm/drm_atomic_uapi.h | 3 + include/drm/drm_color_mgmt.h | 13 + include/drm/drm_colorop.h | 473 +++++++++++ include/drm/drm_file.h | 7 + include/drm/drm_fixed.h | 18 + include/drm/drm_mode_config.h | 18 + include/drm/drm_plane.h | 19 + include/uapi/drm/amdgpu_drm.h | 9 - include/uapi/drm/drm.h | 16 + include/uapi/drm/drm_mode.h | 192 +++++ 50 files changed, 5876 insertions(+), 50 deletions(-) create mode 100644 Documentation/gpu/rfc/color_pipeline.rst create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.h create mode 100644 drivers/gpu/drm/drm_colorop.c create mode 100644 drivers/gpu/drm/tests/drm_fixp_test.c create mode 100644 drivers/gpu/drm/vkms/tests/.kunitconfig create mode 100644 drivers/gpu/drm/vkms/tests/Makefile create mode 100644 drivers/gpu/drm/vkms/tests/vkms_color_test.c create mode 100644 drivers/gpu/drm/vkms/vkms_colorop.c create mode 100644 drivers/gpu/drm/vkms/vkms_composer.h create mode 100644 drivers/gpu/drm/vkms/vkms_luts.c create mode 100644 drivers/gpu/drm/vkms/vkms_luts.h create mode 100644 include/drm/drm_colorop.h
Signature · 1 line
2.42.0
PATCH v3 1/23 drm: color pipeline base work
From: Harry Wentland <[email protected]>
This is a squashed patch based on a series sent out by Harry wentland. It contains all the changes in the series(v7) currently under review below.
https://patchwork.freedesktop.org/series/123446/#rev7
This patch lays the ground work for incremental changes and Intel specific pipeline changes.
NOTE: This patch is not meant for review. Any review related to this patch should be done on the original series. In order not to diverge the discussion from the main series.
--- Documentation/gpu/drm-kms.rst | 15 + Documentation/gpu/rfc/color_pipeline.rst | 378 +++++++++ Documentation/gpu/rfc/index.rst | 3 + drivers/gpu/drm/Makefile | 1 + .../gpu/drm/amd/display/amdgpu_dm/Makefile | 3 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 + .../amd/display/amdgpu_dm/amdgpu_dm_color.c | 566 ++++++++++++- .../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 206 +++++ .../amd/display/amdgpu_dm/amdgpu_dm_colorop.h | 36 + .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 32 + drivers/gpu/drm/drm_atomic.c | 170 +++- drivers/gpu/drm/drm_atomic_helper.c | 12 + drivers/gpu/drm/drm_atomic_state_helper.c | 5 + drivers/gpu/drm/drm_atomic_uapi.c | 165 ++++ drivers/gpu/drm/drm_colorop.c | 610 +++++++++++++ drivers/gpu/drm/drm_ioctl.c | 7 + drivers/gpu/drm/drm_mode_config.c | 7 + drivers/gpu/drm/drm_plane.c | 52 ++ drivers/gpu/drm/tests/Makefile | 3 +- drivers/gpu/drm/tests/drm_fixp_test.c | 71 ++ drivers/gpu/drm/vkms/Kconfig | 15 + drivers/gpu/drm/vkms/Makefile | 5 +- drivers/gpu/drm/vkms/tests/.kunitconfig | 4 + drivers/gpu/drm/vkms/tests/Makefile | 3 + drivers/gpu/drm/vkms/tests/vkms_color_test.c | 459 ++++++++++ drivers/gpu/drm/vkms/vkms_colorop.c | 113 +++ drivers/gpu/drm/vkms/vkms_composer.c | 131 ++- drivers/gpu/drm/vkms/vkms_composer.h | 27 + drivers/gpu/drm/vkms/vkms_drv.h | 7 + drivers/gpu/drm/vkms/vkms_luts.c | 801 ++++++++++++++++++ drivers/gpu/drm/vkms/vkms_luts.h | 12 + drivers/gpu/drm/vkms/vkms_plane.c | 1 + include/drm/drm_atomic.h | 130 +++ include/drm/drm_atomic_uapi.h | 3 + include/drm/drm_colorop.h | 442 ++++++++++ include/drm/drm_file.h | 7 + include/drm/drm_fixed.h | 18 + include/drm/drm_mode_config.h | 18 + include/drm/drm_plane.h | 19 + include/uapi/drm/amdgpu_drm.h | 9 - include/uapi/drm/drm.h | 16 + include/uapi/drm/drm_mode.h | 92 ++ 42 files changed, 4630 insertions(+), 48 deletions(-) create mode 100644 Documentation/gpu/rfc/color_pipeline.rst create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.h create mode 100644 drivers/gpu/drm/drm_colorop.c create mode 100644 drivers/gpu/drm/tests/drm_fixp_test.c create mode 100644 drivers/gpu/drm/vkms/tests/.kunitconfig create mode 100644 drivers/gpu/drm/vkms/tests/Makefile create mode 100644 drivers/gpu/drm/vkms/tests/vkms_color_test.c create mode 100644 drivers/gpu/drm/vkms/vkms_colorop.c create mode 100644 drivers/gpu/drm/vkms/vkms_composer.h create mode 100644 drivers/gpu/drm/vkms/vkms_luts.c create mode 100644 drivers/gpu/drm/vkms/vkms_luts.h create mode 100644 include/drm/drm_colorop.h
Documentation/gpu/drm-kms.rst +15 -0
@@ -413,6 +413,21 @@ Plane Panic Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_panic.c :export: +Colorop Abstraction +=================== + +.. kernel-doc:: drivers/gpu/drm/drm_colorop.c + :doc: overview + +Colorop Functions Reference +--------------------------- + +.. kernel-doc:: include/drm/drm_colorop.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_colorop.c + :export: + Display Modes Function Reference ================================
Documentation/gpu/rfc/color_pipeline.rst new file +378 -0
379 lines not on this page · raw message
Documentation/gpu/rfc/index.rst +3 -0
@@ -31,3 +31,6 @@ host such documentation: .. toctree:: i915_vm_bind.rst + +.. toctree:: + color_pipeline.rst
drivers/gpu/drm/Makefile +1 -0
@@ -41,6 +41,7 @@ drm-y := \ drm_bridge.o \ drm_cache.o \ drm_color_mgmt.o \ + drm_colorop.o \ drm_connector.o \ drm_crtc.o \ drm_displayid.o \
drivers/gpu/drm/amd/display/amdgpu_dm/Makefile +2 -1
@@ -38,7 +38,8 @@ AMDGPUDM = \ amdgpu_dm_pp_smu.o \ amdgpu_dm_psr.o \ amdgpu_dm_replay.o \ - amdgpu_dm_wb.o + amdgpu_dm_wb.o \ + amdgpu_dm_colorop.o ifdef CONFIG_DRM_AMD_DC_FP AMDGPUDM += dc_fpu.o
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -0
@@ -5656,6 +5656,10 @@ fill_plane_color_attributes(const struct drm_plane_state *plane_state, *color_space =COLOR_SPACE_SRGB ; +/* Ignore properties when DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE is set */ +if (plane_state->state && plane_state->state->plane_color_pipeline) +return 0 ; +/* DRM color properties only affect non-RGB formats. */ if (format <SURFACE_PIXEL_FORMAT_VIDEO_BEGIN )return 0 ;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c +546 -20
614 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c new file +206 -0
206 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.h new file +36 -0
@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright 2023 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + +#ifndef __AMDGPU_DM_COLOROP_H__ +#define __AMDGPU_DM_COLOROP_H__ + +extern const u64 amdgpu_dm_supported_degam_tfs; +extern const u64 amdgpu_dm_supported_shaper_tfs; +extern const u64 amdgpu_dm_supported_blnd_tfs; + +int amdgpu_dm_initialize_default_pipeline (struct drm_plane *plane,struct drm_prop_enum_list *list); + +#endif /* __AMDGPU_DM_COLOROP_H__*/
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +32 -0
@@ -37,6 +37,7 @@#include "amdgpu_display.h" #include "amdgpu_dm_trace.h" #include "amdgpu_dm_plane.h" +#include "amdgpu_dm_colorop.h" #include "gc/gc_11_0_0_offset.h" #include "gc/gc_11_0_0_sh_mask.h"
@@ -1781,6 +1782,32 @@ dm_atomic_plane_get_property(struct drm_plane *plane, }#endif +#define MAX_COLOR_PIPELINES 5 + +static int +dm_plane_init_colorops (struct drm_plane *plane) +{ +struct drm_prop_enum_list pipelines[MAX_COLOR_PIPELINES ]; +int len =0 ; +int ret; + +if (plane->type ==DRM_PLANE_TYPE_CURSOR ) +return 0 ; + +/* initialize default pipeline */ + ret =amdgpu_dm_initialize_default_pipeline (plane, &(pipelines[len])); +if (ret) { +DRM_ERROR ("Failed to create color pipeline for plane %d: %d\n" , plane->base.id, ret); +return ret; + } + len++; + +/* Create COLOR_PIPELINE property and attach */ +drm_plane_create_color_pipeline_property (plane, pipelines, len); + +return 0 ; +} +static const struct drm_plane_funcs dm_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane,
@@ -1887,7 +1914,12 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,#ifdef AMD_PRIVATE_COLOR dm_atomic_plane_attach_color_mgmt_properties (dm, plane); +#else + res =dm_plane_init_colorops (plane); +if (res) +return res;#endif +/* Create (reset) the plane state */ if (plane->funcs->reset) plane->funcs->reset (plane);
drivers/gpu/drm/drm_atomic.c +169 -1
230 lines not on this page · raw message
drivers/gpu/drm/drm_atomic_helper.c +12 -0
@@ -3060,6 +3060,8 @@ int drm_atomic_helper_swap_state(struct drm_atomic_state *state,struct drm_crtc_state *old_crtc_state, *new_crtc_state;struct drm_plane *plane;struct drm_plane_state *old_plane_state, *new_plane_state; +struct drm_colorop *colorop; +struct drm_colorop_state *old_colorop_state, *new_colorop_state;struct drm_crtc_commit *commit;struct drm_private_obj *obj;struct drm_private_state *old_obj_state, *new_obj_state;
@@ -3137,6 +3139,16 @@ int drm_atomic_helper_swap_state(struct drm_atomic_state *state, } } +for_each_oldnew_colorop_in_state (state, colorop, old_colorop_state, new_colorop_state, i) { +WARN_ON (colorop->state != old_colorop_state); + + old_colorop_state->state = state; + new_colorop_state->state =NULL ; + + state->colorops[i].state = old_colorop_state; + colorop->state = new_colorop_state; + } +drm_panic_lock (state->dev, flags);for_each_oldnew_plane_in_state (state, plane, old_plane_state, new_plane_state, i) {WARN_ON (plane->state != old_plane_state);
drivers/gpu/drm/drm_atomic_state_helper.c +5 -0
@@ -267,6 +267,11 @@ void __drm_atomic_helper_plane_state_reset(struct drm_plane_state *plane_state, plane_state->color_range = val; } +if (plane->color_pipeline_property) { +/* default is always NULL, i.e., bypass */ + plane_state->color_pipeline =NULL ; + } + if (plane->zpos_property) { if (!drm_object_property_get_default_value(&plane->base, plane->zpos_property,
drivers/gpu/drm/drm_atomic_uapi.c +165 -0
213 lines not on this page · raw message
drivers/gpu/drm/drm_colorop.c new file +610 -0
610 lines not on this page · raw message
drivers/gpu/drm/drm_ioctl.c +7 -0
@@ -373,6 +373,13 @@ drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv)return -EINVAL ; file_priv->supports_virtualized_cursor_plane = req->value;break ; +case DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE : +if (!file_priv->atomic) +return -EINVAL ; +if (req->value >1 ) +return -EINVAL ; + file_priv->plane_color_pipeline = req->value; +break ;default :return -EINVAL ; }
drivers/gpu/drm/drm_mode_config.c +7 -0
@@ -29,6 +29,7 @@#include <drm/drm_managed.h> #include <drm/drm_mode_config.h> #include <drm/drm_print.h> +#include <drm/drm_colorop.h> #include <linux/dma-resv.h> #include "drm_crtc_internal.h"
@@ -191,11 +192,15 @@ int drm_mode_getresources(struct drm_device *dev, void *data,void drm_mode_config_reset (struct drm_device *dev) {struct drm_crtc *crtc; +struct drm_colorop *colorop;struct drm_plane *plane;struct drm_encoder *encoder;struct drm_connector *connector;struct drm_connector_list_iter conn_iter; +drm_for_each_colorop (colorop, dev) +drm_colorop_reset (colorop); +drm_for_each_plane (plane, dev)if (plane->funcs->reset) plane->funcs->reset (plane);
@@ -429,6 +434,7 @@ int drmm_mode_config_init(struct drm_device *dev)INIT_LIST_HEAD (&dev->mode_config.property_list);INIT_LIST_HEAD (&dev->mode_config.property_blob_list);INIT_LIST_HEAD (&dev->mode_config.plane_list); +INIT_LIST_HEAD (&dev->mode_config.colorop_list);INIT_LIST_HEAD (&dev->mode_config.privobj_list);idr_init_base (&dev->mode_config.object_idr,1 );idr_init_base (&dev->mode_config.tile_idr,1 );
@@ -450,6 +456,7 @@ int drmm_mode_config_init(struct drm_device *dev) dev->mode_config.num_crtc =0 ; dev->mode_config.num_encoder =0 ; dev->mode_config.num_total_plane =0 ; + dev->mode_config.num_colorop =0 ;if (IS_ENABLED (CONFIG_LOCKDEP )) {struct drm_modeset_acquire_ctx modeset_ctx;
drivers/gpu/drm/drm_plane.c +52 -0
55 lines not on this page · raw message
drivers/gpu/drm/tests/Makefile +2 -1
@@ -21,6 +21,7 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \ drm_modes_test.o \ drm_plane_helper_test.o \ drm_probe_helper_test.o \ - drm_rect_test.o + drm_rect_test.o \ + drm_fixp_test.o CFLAGS_drm_mm_test.o := $(DISABLE_STRUCTLEAK_PLUGIN)
drivers/gpu/drm/tests/drm_fixp_test.c new file +71 -0
71 lines not on this page · raw message
drivers/gpu/drm/vkms/Kconfig +15 -0
@@ -14,3 +14,18 @@ config DRM_VKMS a VKMS. If M is selected the module will be called vkms. + +config DRM_VKMS_KUNIT_TESTS + tristate "KUnit tests for VKMS." if !KUNIT_ALL_TESTS + depends on DRM_VKMS=y && KUNIT + default KUNIT_ALL_TESTS + help + This builds unit tests for VKMS. This option is not useful for + distributions or general kernels, but only for kernel + developers working on VKMS. + + For more information on KUnit and unit tests in general, + please refer to the KUnit documentation in + Documentation/dev-tools/kunit/. + + If in doubt, say "N".
drivers/gpu/drm/vkms/Makefile +4 -1
@@ -6,6 +6,9 @@ vkms-y := \ vkms_formats.o \ vkms_crtc.o \ vkms_composer.o \ - vkms_writeback.o + vkms_writeback.o \ + vkms_colorop.o \ + vkms_luts.o obj-$(CONFIG_DRM_VKMS) += vkms.o +obj-$(CONFIG_DRM_VKMS_KUNIT_TESTS) += tests/
drivers/gpu/drm/vkms/tests/.kunitconfig new file +4 -0
@@ -0,0 +1,4 @@ +CONFIG_KUNIT=y +CONFIG_DRM=y +CONFIG_DRM_VKMS=y +CONFIG_DRM_VKMS_KUNIT_TESTS=y
drivers/gpu/drm/vkms/tests/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_DRM_VKMS_KUNIT_TESTS) += vkms_color_test.o
drivers/gpu/drm/vkms/tests/vkms_color_test.c new file +459 -0
353 lines not on this page · raw message
drivers/gpu/drm/vkms/vkms_colorop.c new file +113 -0
113 lines not on this page · raw message
drivers/gpu/drm/vkms/vkms_composer.c +116 -15
131 lines not on this page · raw message
drivers/gpu/drm/vkms/vkms_composer.h new file +27 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/vkms/vkms_luts.c new file +801 -0
801 lines not on this page · raw message
drivers/gpu/drm/vkms/vkms_luts.h new file +12 -0
Lines of this file are not shown. View the raw message.
include/drm/drm_atomic.h +130 -0
130 lines not on this page · raw message
include/drm/drm_colorop.h new file +442 -0
442 lines not on this page · raw message
include/uapi/drm/drm_mode.h +92 -0
92 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.42.0
Part of the diff is not shown here. View the raw message.
kernel test robot
build botRe: [v3 01/23] drm: color pipeline base work
kernel test robot noticed the following build errors:
Hi Uma,
kernel test robot noticed the following build errors:
[auto build test ERROR on next-20250305]
[also build test ERROR on v6.14-rc5]
[cannot apply to drm-exynos/exynos-drm-next linus/master v6.14-rc5 v6.14-rc4 v6.14-rc3] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
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/20250306-011827 base: next-20250305 patch link: https://lore.kernel.org/r/20250305132608.2379253-2-uma.shankar%40intel.com patch subject: [v3 01/23] drm: color pipeline base work config: x86_64-buildonly-randconfig-002-20250306 (https://download.01.org/0day-ci/archive/20250306/[email protected]/config) compiler: clang version 19.1.7 (https://github.com/llvm/llvm-project cd708029e0b2869e80abe31ddb175f7c35361f90) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250306/[email protected]/reproduce)
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 <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/vkms/tests/vkms_color_test.c:7:
In file included from drivers/gpu/drm/vkms/tests/../vkms_drv.h:10:
In file included from include/drm/drm_gem.h:42:
In file included from include/drm/drm_vma_manager.h:27:
In file included from include/linux/mm.h:2306:
include/linux/vmstat.h:493:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
493 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
494 | item];
| ~~~~
include/linux/vmstat.h:500:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
500 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
501 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:507:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
507 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
include/linux/vmstat.h:513:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
513 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
514 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/vkms/tests/vkms_color_test.c:13:18: error: expected ';' after top level declarator
13 | MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
| ^4 warnings and 1 error generated.
vim +13 drivers/gpu/drm/vkms/tests/vkms_color_test.c
12
> 13 MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
14 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [v3 01/23] drm: color pipeline base work
In reply to Uma Shankarkernel test robot noticed the following build errors:
Hi Uma,
kernel test robot noticed the following build errors:
[auto build test ERROR on next-20250305]
[also build test ERROR on v6.14-rc5]
[cannot apply to drm-exynos/exynos-drm-next linus/master v6.14-rc5 v6.14-rc4 v6.14-rc3] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
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/20250306-011827 base: next-20250305 patch link: https://lore.kernel.org/r/20250305132608.2379253-2-uma.shankar%40intel.com patch subject: [v3 01/23] drm: color pipeline base work config: riscv-randconfig-002-20250306 (https://download.01.org/0day-ci/archive/20250306/[email protected]/config) compiler: riscv64-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250306/[email protected]/reproduce)
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 <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All error/warnings (new ones prefixed by >>):
>> drivers/gpu/drm/drm_colorop.c:162:6: warning: no previous prototype for 'drm_colorop_cleanup' [-Wmissing-prototypes]
162 | void drm_colorop_cleanup(struct drm_colorop *colorop)
| ^~~~~~~~~~~~~~~~~~~
--
In file included from include/linux/module.h:22,
from include/kunit/test.h:24,
from drivers/gpu/drm/vkms/tests/vkms_color_test.c:3:
>> drivers/gpu/drm/vkms/tests/vkms_color_test.c:13:18: error: expected ',' or ';' before 'EXPORTED_FOR_KUNIT_TESTING'
13 | MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/moduleparam.h:26:61: note: in definition of macro '__MODULE_INFO'
26 | = __MODULE_INFO_PREFIX __stringify(tag) "=" info
| ^~~~
include/linux/module.h:299:33: note: in expansion of macro 'MODULE_INFO'
299 | #define MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, ns)
| ^~~~~~~~~~~
drivers/gpu/drm/vkms/tests/vkms_color_test.c:13:1: note: in expansion of macro 'MODULE_IMPORT_NS'
13 | MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
| ^~~~~~~~~~~~~~~~Kconfig warnings: (for reference only)
WARNING: unmet direct dependencies detected for FB_IOMEM_HELPERS
Depends on [n]: HAS_IOMEM [=y] && FB_CORE [=n]
Selected by [m]:
- DRM_XE_DISPLAY [=y] && HAS_IOMEM [=y] && DRM [=y] && DRM_XE [=m] && DRM_XE [=m]=m [=m] && HAS_IOPORT [=y]
vim +13 drivers/gpu/drm/vkms/tests/vkms_color_test.c
12
> 13 MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
14 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [v3 01/23] drm: color pipeline base work
In reply to Uma Shankarkernel test robot noticed the following build warnings:
Hi Uma,
kernel test robot noticed the following build warnings:
[auto build test WARNING on next-20250305]
[also build test WARNING on v6.14-rc5]
[cannot apply to drm-exynos/exynos-drm-next linus/master v6.14-rc5 v6.14-rc4 v6.14-rc3] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
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/20250306-011827 base: next-20250305 patch link: https://lore.kernel.org/r/20250305132608.2379253-2-uma.shankar%40intel.com patch subject: [v3 01/23] drm: color pipeline base work config: i386-buildonly-randconfig-003-20250306 (https://download.01.org/0day-ci/archive/20250306/[email protected]/config) compiler: clang version 19.1.7 (https://github.com/llvm/llvm-project cd708029e0b2869e80abe31ddb175f7c35361f90) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250306/[email protected]/reproduce)
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 <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
In file included from drivers/gpu/drm/drm_colorop.c:30:
In file included from include/drm/drm_plane.h:33:
In file included from include/drm/drm_util.h:36:
In file included from include/linux/kgdb.h:19:
In file included from include/linux/kprobes.h:28:
In file included from include/linux/ftrace.h:13:
In file included from include/linux/kallsyms.h:13:
In file included from include/linux/mm.h:2306:
include/linux/vmstat.h:507:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
507 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
>> drivers/gpu/drm/drm_colorop.c:162:6: warning: no previous prototype for function 'drm_colorop_cleanup' [-Wmissing-prototypes]
162 | void drm_colorop_cleanup(struct drm_colorop *colorop)
| ^
drivers/gpu/drm/drm_colorop.c:162:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
162 | void drm_colorop_cleanup(struct drm_colorop *colorop)
| ^
| static 2 warnings generated.
vim +/drm_colorop_cleanup +162 drivers/gpu/drm/drm_colorop.c
156
157 /**
158 * drm_colorop_cleanup - Cleanup a drm_colorop object in color_pipeline
159 *
160 * @colorop: The drm_colorop object to be cleaned
161 */
> 162 void drm_colorop_cleanup(struct drm_colorop *colorop)
163 {
164 struct drm_device *dev = colorop->dev;
165 struct drm_mode_config *config = &dev->mode_config;
166
167 list_del(&colorop->head);
168 config->num_colorop--;
169
170 if (colorop->state && colorop->state->data) {
171 drm_property_blob_put(colorop->state->data);
172 colorop->state->data = NULL;
173 }
174
175 kfree(colorop->state);
176 kfree(colorop);
177 }
178
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH v3 2/23 drm: Add support for 3x3 CTM
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Add support for 3x3 Color Transformation Matrices in Color Pipeline.
v2: Updated the documentation for 3x3 CTM colorop (Dmitry)
--- drivers/gpu/drm/drm_atomic.c | 3 +++ drivers/gpu/drm/drm_atomic_uapi.c | 3 +++ drivers/gpu/drm/drm_colorop.c | 29 +++++++++++++++++++++++++++++ include/drm/drm_colorop.h | 10 ++++++++++ include/uapi/drm/drm_mode.h | 8 ++++++++ 5 files changed, 53 insertions(+)
drivers/gpu/drm/drm_atomic.c +3 -0
@@ -800,6 +800,9 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p, drm_get_colorop_lut1d_interpolation_name(colorop->lut1d_interpolation));drm_printf (p,"\tdata blob id=%d\n" , state->data ? state->data->base.id :0 );break ; +case DRM_COLOROP_CTM_3X3 : +drm_printf (p,"\tdata blob id=%d\n" , state->data ? state->data->base.id :0 ); +break ;case DRM_COLOROP_CTM_3X4 :drm_printf (p,"\tdata blob id=%d\n" , state->data ? state->data->base.id :0 );break ;
drivers/gpu/drm/drm_atomic_uapi.c +3 -0
@@ -708,6 +708,9 @@ static int drm_atomic_color_set_data_property(struct drm_colorop *colorop,case DRM_COLOROP_CTM_3X4 : size =sizeof (struct drm_color_ctm_3x4 );break ; +case DRM_COLOROP_CTM_3X3 : + size =sizeof (struct drm_color_ctm ); +break ;case DRM_COLOROP_3D_LUT : size = colorop->lut_size * colorop->lut_size * colorop->lut_size *sizeof (struct drm_color_lut );
drivers/gpu/drm/drm_colorop.c +29 -0
@@ -362,6 +362,35 @@ int drm_colorop_ctm_3x4_init(struct drm_device *dev, struct drm_colorop *colorop }EXPORT_SYMBOL (drm_colorop_ctm_3x4_init); +/** +* drm_colorop_ctm_3x3_init - Initialize a DRM_COLOROP_CTM_3X3 +* +* @dev: DRM device +* @colorop: The drm_colorop object to initialize +* @plane: The associated drm_plane +* @allow_bypass: true if BYPASS property should be created, false if bypass of +* this colorop is not possible +* @return zero on success, -E value on failure +*/ +int drm_colorop_ctm_3x3_init (struct drm_device *dev,struct drm_colorop *colorop, +struct drm_plane *plane,bool allow_bypass) +{ +int ret; + + ret =drm_colorop_init (dev, colorop, plane,DRM_COLOROP_CTM_3X3 , allow_bypass); +if (ret) +return ret; + + ret =drm_colorop_create_data_prop (dev, colorop); +if (ret) +return ret; + +drm_colorop_reset (colorop); + +return 0 ; +} +EXPORT_SYMBOL (drm_colorop_ctm_3x3_init); +/** * drm_colorop_mult_init - Initialize a DRM_COLOROP_MULTIPLIER *
include/drm/drm_colorop.h +10 -0
@@ -156,6 +156,14 @@ struct drm_colorop_state {* |G| = |4 5 6 7 | x | G | * |B| |8 9 10 12| | B | * +* For 3x3 matrix (DRM_COLOROP_CTM_3X3), the blob is of type struct drm_color_ctm +* which represents the Conversion matrix in S31.32 sign-magnitude +* (not two's complement!) format. +* out matrix in +* |R| |0 1 2| |R| +* |G| = |3 4 5| x |G| +* |B| |6 7 8| |B| +* * For 3D LUTs (DRM_COLOROP_3D_LUT), the blob is a 3D array of * struct drm_color_lut with dimension length of "lut_size". * The LUT elements are traversed like so:
@@ -376,6 +384,8 @@ int drm_colorop_curve_1d_lut_init(struct drm_device *dev, struct drm_colorop *co struct drm_plane *plane, uint32_t lut_size, enum drm_colorop_lut1d_interpolation_type lut1d_interpolation, bool allow_bypass); +int drm_colorop_ctm_3x3_init (struct drm_device *dev,struct drm_colorop *colorop, +struct drm_plane *plane,bool allow_bypass);int drm_colorop_ctm_3x4_init (struct drm_device *dev,struct drm_colorop *colorop,struct drm_plane *plane,bool allow_bypass); int drm_colorop_mult_init(struct drm_device *dev, struct drm_colorop *colorop,
include/uapi/drm/drm_mode.h +8 -0
@@ -905,6 +905,14 @@ enum drm_colorop_type {*/ DRM_COLOROP_CTM_3X4 , +/** +* @DRM_COLOROP_CTM_3X3: +* +* A 3x3 matrix. Its values are specified via the +* &drm_color_ctm struct provided via the DATA property. +*/ + DRM_COLOROP_CTM_3X3, +/** * @DRM_COLOROP_MULTIPLIER: *
Signature · 1 line
2.42.0
PATCH v3 3/23 drm: Add Enhanced LUT precision structure
In reply to Uma ShankarExisting LUT precision structure is having only 16 bit precision. This is not enough for upcoming enhanced hardwares and advance usecases like HDR processing. Hence added a new structure with 32 bit precision values.
--- drivers/gpu/drm/drm_color_mgmt.c | 43 ++++++++++++++++++++++++++++++++ include/drm/drm_color_mgmt.h | 13 ++++++++++ include/uapi/drm/drm_mode.h | 18 +++++++++++++ 3 files changed, 74 insertions(+)
drivers/gpu/drm/drm_color_mgmt.c +43 -0
@@ -630,3 +630,46 @@ int drm_color_lut_check(const struct drm_property_blob *lut, u32 tests)return 0 ; }EXPORT_SYMBOL (drm_color_lut_check); + +/** +* drm_color_lut_32_check - check validity of extended lookup table +* @lut: property blob containing extended LUT to check +* @tests: bitmask of tests to run +* +* Helper to check whether a userspace-provided extended lookup table is valid and +* satisfies hardware requirements. Drivers pass a bitmask indicating which of +* the tests in &drm_color_lut_tests should be performed. +* +* Returns 0 on success, -EINVAL on failure. +*/ +int drm_color_lut_32_check (const struct drm_property_blob *lut,u32 tests) +{ +const struct drm_color_lut_32 *entry; +int i; + +if (!lut || !tests) +return 0 ; + + entry = lut->data; +for (i =0 ; i <drm_color_lut_32_size (lut); i++) { +if (tests &DRM_COLOR_LUT_EQUAL_CHANNELS ) { +if (entry[i].red != entry[i].blue || + entry[i].red != entry[i].green) { +DRM_DEBUG_KMS ("All LUT entries must have equal r/g/b\n" ); +return -EINVAL ; + } + } + +if (i >0 && tests &DRM_COLOR_LUT_NON_DECREASING ) { +if (entry[i].red < entry[i -1 ].red || + entry[i].green < entry[i -1 ].green || + entry[i].blue < entry[i -1 ].blue) { +DRM_DEBUG_KMS ("LUT entries must never decrease.\n" ); +return -EINVAL ; + } + } + } + +return 0 ; +} +EXPORT_SYMBOL (drm_color_lut_32_check);
include/drm/drm_color_mgmt.h +13 -0
@@ -72,6 +72,18 @@ static inline int drm_color_lut_size(const struct drm_property_blob *blob)return blob->length /sizeof (struct drm_color_lut ); } +/** +* drm_color_lut_32_size - calculate the number of entries in the extended LUT +* @blob: blob containing the LUT +* +* Returns: +* The number of entries in the color LUT stored in @blob. +*/ +static inline int drm_color_lut_32_size (const struct drm_property_blob *blob) +{ +return blob->length /sizeof (struct drm_color_lut_32 ); +} +enum drm_color_encoding {DRM_COLOR_YCBCR_BT601 ,DRM_COLOR_YCBCR_BT709 ,
@@ -118,4 +130,5 @@ enum drm_color_lut_tests { };int drm_color_lut_check (const struct drm_property_blob *lut,u32 tests); +int drm_color_lut_32_check (const struct drm_property_blob *lut,u32 tests);#endif
include/uapi/drm/drm_mode.h +18 -0
@@ -872,6 +872,23 @@ struct drm_color_lut {__u16 reserved; }; +/** +* struct drm_color_lut_32 - Represents high precision lut values +* +* Creating 32 bit palette entries for better data +* precision. This will be required for HDR and +* similar color processing usecases. +*/ +struct drm_color_lut_32 { +/* +* Data for high precision LUTs +*/ +__u32 red; +__u32 green; +__u32 blue; +__u32 reserved; +}; +/** * enum drm_colorop_type - Type of color operation *
@@ -879,6 +896,7 @@ struct drm_color_lut {* and defines a different set of properties. This enum defines all types and * gives a high-level description. */ +enum drm_colorop_type {/** * @DRM_COLOROP_1D_CURVE:
Signature · 1 line
2.42.0
PATCH v3 4/23 drm: Add Color lut range attributes
In reply to Uma ShankarThis defines a new structure to define color lut ranges, along with related macro definitions and enums. This will help describe segmented lut ranges/PWL LUTs in the hardware.
--- include/uapi/drm/drm_mode.h | 64 +++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)
include/uapi/drm/drm_mode.h +64 -0
@@ -1112,6 +1112,70 @@ struct hdr_output_metadata { DRM_MODE_PAGE_FLIP_ASYNC | \ DRM_MODE_PAGE_FLIP_TARGET) +/** +* DRM_COLOROP_1D_LUT_MULTSEG_INTERPOLATE +* +* linearly interpolate between the points +*/ +#define DRM_COLOROP_1D_LUT_MULTSEG_INTERPOLATE BIT(0) + +/** +* DRM_COLOROP_1D_LUT_MULTSEG_REUSE_LAST +* +* the last value of the previous range is the +* first value of the current range. +*/ +#define DRM_COLOROP_1D_LUT_MULTSEG_REUSE_LAST BIT(1) + +/** +* DRM_COLOROP_1D_LUT_MULTSEG_NON_DECREASING +* +* the curve must be non-decreasing +*/ +#define DRM_COLOROP_1D_LUT_MULTSEG_NON_DECREASING BIT(2) + +/** +* DRM_COLOROP_1D_LUT_MULTSEG_REFLECT_NEGATIVE +* +* the curve is reflected across origin for negative inputs +*/ +#define DRM_COLOROP_1D_LUT_MULTSEG_REFLECT_NEGATIVE BIT(3) + +/** +* DRM_COLOROP_1D_LUT_MULTSEG_SINGLE_CHANNEL +* +* the same curve (red) is used for blue and green channels as well +*/ +#define DRM_COLOROP_1D_LUT_MULTSEG_SINGLE_CHANNEL BIT(4) + +/** +* struct drm_color_lut_range +* +* structure to advertise capability of a color hardware +* block that accepts LUT values. It can represent LUTs with +* varied number of entries and distributions +* (Multi segmented, Logarithmic etc). +*/ + +struct drm_color_lut_range { +/* DRM_COLOROP_1D_LUT_MULTSEG_* */ +__u32 flags; +/* number of points on the curve in the segment */ +__u16 count; +/* input start/end values of the segment */ +__s32 start, end; +/* normalization factor. Represents 1.0 in terms of smallest step size */ +__u32 norm_factor; + +/* precision of HW LUT*/ +struct { +/* Integer precision */ +__u16 intp; +/* Fractional precision */ +__u16 fracp; + } precision; +}; +/* * Request a page flip on the specified crtc. *
Signature · 1 line
2.42.0
PATCH v3 5/23 drm: Add Color ops capability property
In reply to Uma ShankarAdd capability property which a colorop can expose it's hardware's abilities. It's a blob property that can be filled with respective data structures depending on the colorop. The user space is expected to read this property and program the colorop accordingly.
v2: Added documentation for hw_caps blob (Dmitry)
--- drivers/gpu/drm/drm_atomic_uapi.c | 3 +++ include/drm/drm_colorop.h | 17 +++++++++++++++++ 2 files changed, 20 insertions(+)
drivers/gpu/drm/drm_atomic_uapi.c +3 -0
@@ -771,6 +771,9 @@ drm_atomic_colorop_get_property(struct drm_colorop *colorop, *val = colorop->lut3d_interpolation; }else if (property == colorop->data_property) { *val = (state->data) ? state->data->base.id :0 ; + }else if (property == colorop->hw_caps_property) { + *val = state->hw_caps ? + state->hw_caps->base.id :0 ; }else {return -EINVAL ; }
include/drm/drm_colorop.h +17 -0
@@ -141,6 +141,16 @@ struct drm_colorop_state {*/ uint64_t multiplier; +/** +* @hw_caps: +* +* This blob will be of type struct drm_color_lut_range which contains the +* hardware capabilities of 1D LUT. These include number of LUT segments, +* number of LUT samples per segment, start and end point of respective +* segments and the precision of the LUT sample along with the normalization factor +*/ +struct drm_property_blob *hw_caps; +/** * @data: *
@@ -309,6 +319,13 @@ struct drm_colorop {*/ struct drm_property *curve_1d_type_property; +/** +* @hw_caps_property: +* +* Property to expose hardware lut capabilities. +*/ +struct drm_property *hw_caps_property; +/** * @multiplier_property: *
Signature · 1 line
2.42.0
PATCH v3 6/23 drm: Add 1D LUT multi-segmented color op
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Add support for color ops that can be programmed
by 1 dimensional multi segmented Look Up Tables.
v2: Fixed the documentation for Multi segmented lut (Dmitry)
--- drivers/gpu/drm/drm_atomic.c | 4 ++++ drivers/gpu/drm/drm_atomic_uapi.c | 3 +++ include/uapi/drm/drm_mode.h | 10 ++++++++++ 3 files changed, 17 insertions(+)
drivers/gpu/drm/drm_atomic.c +4 -0
@@ -800,6 +800,10 @@ static void drm_atomic_colorop_print_state(struct drm_printer *p, drm_get_colorop_lut1d_interpolation_name(colorop->lut1d_interpolation));drm_printf (p,"\tdata blob id=%d\n" , state->data ? state->data->base.id :0 );break ; +case DRM_COLOROP_1D_LUT_MULTSEG : +drm_printf (p,"\thw cap blob id=%d\n" , state->hw_caps ? state->hw_caps->base.id :0 ); +drm_printf (p,"\tdata blob id=%d\n" , state->data ? state->data->base.id :0 ); +break ;case DRM_COLOROP_CTM_3X3 :drm_printf (p,"\tdata blob id=%d\n" , state->data ? state->data->base.id :0 );break ;
drivers/gpu/drm/drm_atomic_uapi.c +3 -0
@@ -715,6 +715,9 @@ static int drm_atomic_color_set_data_property(struct drm_colorop *colorop, size = colorop->lut_size * colorop->lut_size * colorop->lut_size *sizeof (struct drm_color_lut );break ; +case DRM_COLOROP_1D_LUT_MULTSEG : + elem_size =sizeof (struct drm_color_lut_32 ); +break ;default :/* should never get here */ return -EINVAL ;
include/uapi/drm/drm_mode.h +10 -0
@@ -923,6 +923,16 @@ enum drm_colorop_type {*/ DRM_COLOROP_CTM_3X4 , +/** +* @DRM_COLOROP_1D_LUT_MULTSEG: +* +* A 1D LUT with multiple segments to cover the full color range with non-uniformly +* distributed &drm_color_lut entries, packed into a blob via the DATA property. +* The driver's expected LUT size and segmented capabilities are advertised via the +* HW_CAPS property. +*/ + DRM_COLOROP_1D_LUT_MULTSEG, +/** * @DRM_COLOROP_CTM_3X3: *
Signature · 1 line
2.42.0
PATCH v3 7/23 drm: Define helper to initialize segmented 1D LUT
In reply to Uma ShankarThis adds helper functions to create 1D multi-segmented Lut color block capabilities. It exposes the hardware block as segments which are converted to blob and passed in the property. This also adds helper to initialize 1D segmented LUT.
v2: Squashed the 1d lut helpers (Dmitry)
--- drivers/gpu/drm/drm_colorop.c | 68 +++++++++++++++++++++++++++++++++++ include/drm/drm_colorop.h | 4 +++ 2 files changed, 72 insertions(+)
drivers/gpu/drm/drm_colorop.c +68 -0
@@ -89,6 +89,48 @@ static const struct drm_prop_enum_list drm_colorop_lut3d_interpolation_list[] = };/* Init Helpers */ +static int drm_create_colorop_capability_prop (struct drm_device *dev, +struct drm_colorop *colorop, +struct drm_property_blob *blob) +{ +struct drm_property *prop =NULL ; + + prop =drm_property_create (dev,DRM_MODE_PROP_BLOB | +DRM_MODE_PROP_ATOMIC | +DRM_MODE_PROP_IMMUTABLE , +"HW_CAPS" ,1 ); +if (!prop) +return -ENOMEM ; + + colorop->hw_caps_property = prop; +drm_object_attach_property (&colorop->base, + colorop->hw_caps_property, + blob->base.id); + +return 0 ; +} + +static int drm_colorop_lutcaps_init (struct drm_colorop *colorop, +struct drm_plane *plane, +const struct drm_color_lut_range *ranges, +size_t length) +{ +struct drm_device *dev = plane->dev; +struct drm_property_blob *blob; + +/* Create Color Caps property for multi-segmented 1D LUT */ +if (colorop->type !=DRM_COLOROP_1D_LUT_MULTSEG ) +return -EINVAL ; + +if (WARN_ON (length ==0 || length %sizeof (ranges[0 ]) !=0 )) +return -EINVAL ; + + blob =drm_property_create_blob (plane->dev, length, ranges); +if (IS_ERR (blob)) +return PTR_ERR (blob); + +return drm_create_colorop_capability_prop (dev, colorop, blob); +} static int drm_colorop_init(struct drm_device *dev, struct drm_colorop *colorop, struct drm_plane *plane, enum drm_colorop_type type,
@@ -342,6 +384,32 @@ int drm_colorop_curve_1d_lut_init(struct drm_device *dev, struct drm_colorop *co }EXPORT_SYMBOL (drm_colorop_curve_1d_lut_init); +int drm_colorop_curve_1d_lut_multseg_init (struct drm_device *dev,struct drm_colorop *colorop, +struct drm_plane *plane, +const struct drm_color_lut_range *ranges, +size_t length,bool allow_bypass) +{ +int ret; + + ret =drm_colorop_init (dev, colorop, plane,DRM_COLOROP_1D_LUT_MULTSEG , allow_bypass); +if (ret) +return ret; + + ret =drm_colorop_lutcaps_init (colorop, plane, ranges, length); +if (ret) +return ret; + +/* data */ + ret =drm_colorop_create_data_prop (dev, colorop); +if (ret) +return ret; + +drm_colorop_reset (colorop); + +return 0 ; +} +EXPORT_SYMBOL (drm_colorop_curve_1d_lut_multseg_init); +int drm_colorop_ctm_3x4_init (struct drm_device *dev,struct drm_colorop *colorop,struct drm_plane *plane,bool allow_bypass) {
include/drm/drm_colorop.h +4 -0
@@ -403,6 +403,10 @@ int drm_colorop_curve_1d_lut_init(struct drm_device *dev, struct drm_colorop *co bool allow_bypass);int drm_colorop_ctm_3x3_init (struct drm_device *dev,struct drm_colorop *colorop,struct drm_plane *plane,bool allow_bypass); +int drm_colorop_curve_1d_lut_multseg_init (struct drm_device *dev,struct drm_colorop *colorop, +struct drm_plane *plane, +const struct drm_color_lut_range *ranges, +size_t length,bool allow_bypass);int drm_colorop_ctm_3x4_init (struct drm_device *dev,struct drm_colorop *colorop,struct drm_plane *plane,bool allow_bypass); int drm_colorop_mult_init(struct drm_device *dev, struct drm_colorop *colorop,
Signature · 1 line
2.42.0
PATCH v3 8/23 drm/i915: Add identifiers for intel color blocks
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Add macros to identify intel color blocks. It will help in mapping drm_color_ops to intel color HW blocks
--- drivers/gpu/drm/i915/display/intel_display_limits.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/i915/display/intel_display_limits.h +13 -0
@@ -138,4 +138,17 @@ enum hpd_pin {HPD_NUM_PINS }; +/* +* Intel Color Blocks +* +*/ + +enum intel_color_block { +CB_PLANE_PRE_CSC_LUT , +CB_PLANE_CSC , +CB_PLANE_POST_CSC_LUT , + +I915_MAX_CB +}; +#endif /* __INTEL_DISPLAY_LIMITS_H__ */
Signature · 1 line
2.42.0
PATCH v3 9/23 drm/i915: Add intel_color_op
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Add data structure to store intel specific details of colorop
--- .../drm/i915/display/intel_display_types.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/gpu/drm/i915/display/intel_display_types.h +19 -0
@@ -1527,6 +1527,10 @@ struct intel_plane {#define to_intel_framebuffer (fb) \ container_of_const((fb), struct intel_framebuffer, base) +#define intel_fb_obj (x) ((x) ? to_intel_bo((x)->obj[0]) : NULL) +#define to_intel_plane_colorop (x) container_of(x, struct intel_plane_colorop, base) +#define to_intel_colorop_state (x) container_of(x, struct intel_plane_colorop_state, uapi) +struct intel_hdmi {i915_reg_t hdmi_reg;struct {
@@ -1891,6 +1895,21 @@ struct intel_dp_mst_encoder {struct intel_connector *connector; }; +struct intel_plane_colorop { +struct drm_colorop base; +enum intel_color_block id; +}; + +struct intel_plane_colorop_state { +struct drm_colorop_state uapi; + +/* TODO: Add hw implementation */ +struct { +bool active, enable; +struct drm_property_blob *data; + } hw; +}; +static inline struct intel_encoder *intel_attached_encoder (struct intel_connector *connector) {
Signature · 1 line
2.42.0
PATCH v3 10/23 drm/i915/color: Add helper to create intel colorop
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Add intel colorop create helper
--- drivers/gpu/drm/i915/display/intel_color.c | 39 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_color.h | 3 ++ 2 files changed, 42 insertions(+)
drivers/gpu/drm/i915/display/intel_color.c +39 -0
@@ -3937,6 +3937,45 @@ static const struct intel_color_funcs ilk_color_funcs = { .get_config = ilk_get_config, }; +/* TODO: Move to another file */ +struct intel_plane_colorop *intel_colorop_alloc (void ) +{ +struct intel_plane_colorop *colorop; +struct intel_plane_colorop_state *colorop_state; + + colorop =kzalloc (sizeof (*colorop),GFP_KERNEL ); +if (!colorop) +return ERR_PTR (-ENOMEM ); + + colorop_state =kzalloc (sizeof (*colorop_state),GFP_KERNEL ); +if (!colorop_state) { +kfree (colorop); +return ERR_PTR (-ENOMEM ); + } + +/* TODO: Add color op reset +* intel_colorop_state_reset(plane_state, plane); +*/ + + colorop->base.state = &colorop_state->uapi; + +return colorop; +} + +struct intel_plane_colorop *intel_plane_colorop_create (enum intel_color_block id) +{ +struct intel_plane_colorop *colorop; + + colorop =intel_colorop_alloc (); + +if (IS_ERR (colorop)) +return colorop; + + colorop->id = id; + +return colorop; +} +void intel_color_crtc_init (struct intel_crtc *crtc) {struct intel_display *display =to_intel_display (crtc);
drivers/gpu/drm/i915/display/intel_color.h +3 -0
@@ -14,6 +14,7 @@ struct intel_crtc;struct intel_display ;struct intel_dsb ;struct drm_property_blob ; +enum intel_color_block ;void intel_color_init_hooks (struct intel_display *display);int intel_color_init (struct intel_display *display);
@@ -38,5 +39,7 @@ bool intel_color_lut_equal(const struct intel_crtc_state *crtc_state,const struct drm_property_blob *blob2, bool is_pre_csc_lut);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);#endif /* __INTEL_COLOR_H__ */
Signature · 1 line
2.42.0
PATCH v3 11/23 drm/i915/color: Create a transfer function color pipeline
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Add a color pipeline with three colorops in the sequence
1D LUT MULTSEG - CTM - 1D LUT MULTSEG
This pipeline can be used to do any color space conversion or HDR tone mapping
--- drivers/gpu/drm/i915/display/intel_color.c | 175 +++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_color.h | 3 + 2 files changed, 178 insertions(+)
drivers/gpu/drm/i915/display/intel_color.c +175 -0
@@ -30,6 +30,7 @@#include "intel_display_types.h" #include "intel_dsb.h" #include "intel_vrr.h" +#include "skl_universal_plane.h" struct intel_color_funcs { int (*color_check)(struct intel_atomic_state *state,
@@ -3937,6 +3938,139 @@ static const struct intel_color_funcs ilk_color_funcs = { .get_config = ilk_get_config, }; +static const struct drm_color_lut_range xelpd_degamma_hdr[] = { +/* segment 1 */ + { + .flags = (DRM_COLOROP_1D_LUT_MULTSEG_REFLECT_NEGATIVE | +DRM_COLOROP_1D_LUT_MULTSEG_INTERPOLATE | +DRM_COLOROP_1D_LUT_MULTSEG_SINGLE_CHANNEL | +DRM_COLOROP_1D_LUT_MULTSEG_NON_DECREASING ), + .count =128 , + .start =0 , .end = (1 <<24 ) -1 , + .norm_factor = (1 <<24 ), + .precision = { + .intp =0 , + .fracp =24 , + }, + }, +/* segment 2 */ + { + .flags = (DRM_COLOROP_1D_LUT_MULTSEG_REFLECT_NEGATIVE | +DRM_COLOROP_1D_LUT_MULTSEG_INTERPOLATE | +DRM_COLOROP_1D_LUT_MULTSEG_SINGLE_CHANNEL | +DRM_COLOROP_1D_LUT_MULTSEG_NON_DECREASING ), + .count =1 , + .start = (1 <<24 ), .end = (1 <<24 ), + .norm_factor = (1 <<24 ), + .precision = { + .intp =3 , + .fracp =24 , + }, + }, +/* Segment 3 */ + { + .flags = (DRM_COLOROP_1D_LUT_MULTSEG_REFLECT_NEGATIVE | +DRM_COLOROP_1D_LUT_MULTSEG_INTERPOLATE | +DRM_COLOROP_1D_LUT_MULTSEG_SINGLE_CHANNEL | +DRM_COLOROP_1D_LUT_MULTSEG_NON_DECREASING ), + .count =1 , + .start =3 * (1 <<24 ), .end =3 * (1 <<24 ), + .norm_factor = (1 <<24 ), + .precision = { + .intp =3 , + .fracp =24 , + }, + }, +/* Segment 4 */ + { + .flags = (DRM_COLOROP_1D_LUT_MULTSEG_REFLECT_NEGATIVE | +DRM_COLOROP_1D_LUT_MULTSEG_INTERPOLATE | +DRM_COLOROP_1D_LUT_MULTSEG_SINGLE_CHANNEL | +DRM_COLOROP_1D_LUT_MULTSEG_NON_DECREASING ), + .count =1 , + .start =7 * (1 <<24 ), .end =7 * (1 <<24 ), + .norm_factor = (1 <<24 ), + .precision = { + .intp =3 , + .fracp =24 , + }, + } +}; + +/* FIXME input bpc? */ +static const struct drm_color_lut_range xelpd_gamma_hdr[] = { +/* segment 1 */ + { + .flags = (DRM_COLOROP_1D_LUT_MULTSEG_REFLECT_NEGATIVE | +DRM_COLOROP_1D_LUT_MULTSEG_INTERPOLATE | +DRM_COLOROP_1D_LUT_MULTSEG_SINGLE_CHANNEL | +DRM_COLOROP_1D_LUT_MULTSEG_NON_DECREASING ), + .count =9 , + .start =0 , .end =8 , + .norm_factor =8 *32 , + .precision = { + .intp =0 , + .fracp =24 , + }, + }, +/* segment 2 */ + { + .flags = (DRM_COLOROP_1D_LUT_MULTSEG_REFLECT_NEGATIVE | +DRM_COLOROP_1D_LUT_MULTSEG_INTERPOLATE | +DRM_COLOROP_1D_LUT_MULTSEG_SINGLE_CHANNEL | +DRM_COLOROP_1D_LUT_MULTSEG_NON_DECREASING ), + .count =30 , + .start =8 *2 , .end =8 * (32 -1 ), + .norm_factor =8 *32 , + .precision = { + .intp =0 , + .fracp =24 , + }, + }, +/* segment 3 */ + { + .flags = (DRM_COLOROP_1D_LUT_MULTSEG_REFLECT_NEGATIVE | +DRM_COLOROP_1D_LUT_MULTSEG_INTERPOLATE | +DRM_COLOROP_1D_LUT_MULTSEG_SINGLE_CHANNEL | +DRM_COLOROP_1D_LUT_MULTSEG_NON_DECREASING ), + .count =1 , + .start =8 *32 , .end =8 *32 , + .norm_factor =8 *32 , + .precision = { + .intp =3 , + .fracp =24 , + }, + }, +/* segment 4 */ + { + .flags = (DRM_COLOROP_1D_LUT_MULTSEG_REFLECT_NEGATIVE | +DRM_COLOROP_1D_LUT_MULTSEG_INTERPOLATE | +DRM_COLOROP_1D_LUT_MULTSEG_SINGLE_CHANNEL | +DRM_COLOROP_1D_LUT_MULTSEG_NON_DECREASING ), + .count =1 , + .start =3 *8 *32 , .end =3 *8 *32 , + .norm_factor =8 *32 , + .precision = { + .intp =3 , + .fracp =24 , + }, + }, +/* segment 5 */ + { + .flags = (DRM_COLOROP_1D_LUT_MULTSEG_REFLECT_NEGATIVE | +DRM_COLOROP_1D_LUT_MULTSEG_INTERPOLATE | +DRM_COLOROP_1D_LUT_MULTSEG_SINGLE_CHANNEL | +DRM_COLOROP_1D_LUT_MULTSEG_NON_DECREASING ), + .count =1 , + .start =7 *8 *32 , .end =7 *8 *32 , + .norm_factor =8 *32 , + .precision = { + .intp =3 , + .fracp =24 , + }, + }, +}; +/* TODO: Move to another file */ struct intel_plane_colorop *intel_colorop_alloc (void ) {
@@ -3976,6 +4110,47 @@ struct intel_plane_colorop *intel_plane_colorop_create(enum intel_color_block idreturn colorop; } +int intel_plane_tf_pipeline_init (struct drm_plane *plane,struct drm_prop_enum_list *list) +{ +struct intel_plane_colorop *colorop; +struct drm_device *dev = plane->dev; +int ret; +struct drm_colorop *prev_op; + + colorop =intel_plane_colorop_create (CB_PLANE_PRE_CSC_LUT ); + + ret =drm_colorop_curve_1d_lut_multseg_init (dev, &colorop->base, + plane, xelpd_degamma_hdr, +sizeof (xelpd_degamma_hdr), true); +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 = &colorop->base; + + colorop =intel_plane_colorop_create (CB_PLANE_CSC ); + ret =drm_colorop_ctm_3x3_init (dev, &colorop->base, plane, true); +if (ret) +return ret; + +drm_colorop_set_next_property (prev_op, &colorop->base); + prev_op = &colorop->base; + + colorop =intel_plane_colorop_create (CB_PLANE_POST_CSC_LUT ); + ret =drm_colorop_curve_1d_lut_multseg_init (dev, &colorop->base, + plane, xelpd_gamma_hdr, +sizeof (xelpd_gamma_hdr), true); +if (ret) +return ret; + +drm_colorop_set_next_property (prev_op, &colorop->base); + +return 0 ; +} +void intel_color_crtc_init (struct intel_crtc *crtc) {struct intel_display *display =to_intel_display (crtc);
drivers/gpu/drm/i915/display/intel_color.h +3 -0
@@ -14,6 +14,8 @@ struct intel_crtc;struct intel_display ;struct intel_dsb ;struct drm_property_blob ; +struct drm_plane ; +struct drm_prop_enum_list ;enum intel_color_block ;void intel_color_init_hooks (struct intel_display *display);
@@ -41,5 +43,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__ */
Signature · 1 line
2.42.0
PATCH v3 12/23 drm/i915/color: Add and attach COLORPIPELINE plane property
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Add supported color pipelines and attach it to plane.
--- drivers/gpu/drm/i915/display/intel_color.c | 42 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_color.h | 3 ++ 2 files changed, 45 insertions(+)
drivers/gpu/drm/i915/display/intel_color.c +42 -0
@@ -4151,6 +4151,48 @@ int intel_plane_tf_pipeline_init(struct drm_plane *plane, struct drm_prop_enum_lreturn 0 ; } +int intel_plane_color_init (struct drm_plane *plane) +{ +struct drm_device *dev = plane->dev; +struct intel_display *display =to_intel_display (dev); +struct drm_property *prop; +struct drm_prop_enum_list pipelines[MAX_COLOR_PIPELINES ]; +int len =0 ; +int ret; + +/* Currently expose pipeline only for HDR planes*/ +if (!icl_is_hdr_plane (display,to_intel_plane (plane)->id)) +return 0 ; + +/* Add "Bypass" (i.e. NULL) pipeline */ + pipelines[len].type =0 ; + pipelines[len].name ="Bypass" ; + len++; + +/* Add pipeline consisting of transfer functions */ + ret =intel_plane_tf_pipeline_init (plane, &pipelines[len]); +if (ret) +return ret; + len++; + +/* Create COLOR_PIPELINE property and attach */ + prop =drm_property_create_enum (dev,DRM_MODE_PROP_ATOMIC , +"COLOR_PIPELINE" , + pipelines, len); +if (!prop) +return -ENOMEM ; + + plane->color_pipeline_property = prop; + +drm_object_attach_property (&plane->base, prop,0 ); + +/* TODO check if needed */ +if (plane->state) + plane->state->color_pipeline =NULL ; + +return 0 ; +} +void intel_color_crtc_init (struct intel_crtc *crtc) {struct intel_display *display =to_intel_display (crtc);
drivers/gpu/drm/i915/display/intel_color.h +3 -0
@@ -18,6 +18,8 @@ struct drm_plane;struct drm_prop_enum_list ;enum intel_color_block ; +#define MAX_COLOR_PIPELINES 5 +void intel_color_init_hooks (struct intel_display *display);int intel_color_init (struct intel_display *display);void intel_color_crtc_init (struct intel_crtc *crtc);
@@ -44,5 +46,6 @@ 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); +int intel_plane_color_init (struct drm_plane *plane);#endif /* __INTEL_COLOR_H__ */
Signature · 1 line
2.42.0
PATCH v3 13/23 drm/i915/color: Add framework to set colorop
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Add infrastructure to set colorop. We iterate through all the color ops in a selected COLOR PIPELINE and set them one by one.
--- drivers/gpu/drm/i915/display/intel_color.c | 31 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_color.h | 3 +++ 2 files changed, 34 insertions(+)
drivers/gpu/drm/i915/display/intel_color.c +31 -0
@@ -4110,6 +4110,37 @@ struct intel_plane_colorop *intel_plane_colorop_create(enum intel_color_block idreturn colorop; } +static void apply_colorop (const struct drm_plane_state *plane_state, +struct drm_colorop *colorop, +u32 *plane_color_ctl) +{ +} + +void intel_program_pipeline (const struct drm_plane_state *plane_state,u32 *plane_color_ctl) +{ +struct drm_colorop *colorop; + + colorop = plane_state->color_pipeline; + +while (colorop) { +struct drm_colorop_state *colorop_state; + +if (!colorop) +return ; + +/* TODO this is probably wrong */ + colorop_state = colorop->state; + +if (!colorop_state) +return ; + +if (!colorop_state->bypass) +apply_colorop (plane_state, colorop, plane_color_ctl); + + colorop = colorop->next; + } +} +int intel_plane_tf_pipeline_init (struct drm_plane *plane,struct drm_prop_enum_list *list) {struct intel_plane_colorop *colorop;
drivers/gpu/drm/i915/display/intel_color.h +3 -0
@@ -15,6 +15,7 @@ struct intel_display;struct intel_dsb ;struct drm_property_blob ;struct drm_plane ; +struct drm_plane_state ;struct drm_prop_enum_list ;enum intel_color_block ;
@@ -47,5 +48,7 @@ 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);int intel_plane_color_init (struct drm_plane *plane); +void intel_program_pipeline (const struct drm_plane_state *plane_state, +u32 *plane_color_ctl);#endif /* __INTEL_COLOR_H__ */
Signature · 1 line
2.42.0
PATCH v3 14/23 drm/i915/color: Add callbacks to set plane CTM
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Add callback to intel color functions for setting plane CTM.
--- drivers/gpu/drm/i915/display/intel_color.c | 23 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_color.h | 3 ++- 2 files changed, 25 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_color.c +23 -0
@@ -31,6 +31,7 @@#include "intel_dsb.h" #include "intel_vrr.h" #include "skl_universal_plane.h" +#include "skl_universal_plane_regs.h" struct intel_color_funcs { int (*color_check)(struct intel_atomic_state *state,
@@ -86,6 +87,10 @@ struct intel_color_funcs {* Read config other than LUTs and CSCs, before them. Optional. */ void (*get_config)(struct intel_crtc_state *crtc_state); + +/* Plane CSC*/ +void (*load_plane_csc_matrix)(const struct drm_plane_state *plane_state, +const struct drm_property_blob *blob); };#define CTM_COEFF_SIGN (1ULL << 63)
@@ -3811,6 +3816,15 @@ static void icl_read_luts(struct intel_crtc_state *crtc_state) } } +void intel_color_load_plane_csc_matrix (const struct drm_plane_state *plane_state, +const struct drm_property_blob *blob) +{ +struct drm_i915_private *i915 =to_i915 (plane_state->plane->dev); + +if (i915->display.funcs.color->load_plane_csc_matrix) + i915->display.funcs.color->load_plane_csc_matrix (plane_state, blob); +} +static const struct intel_color_funcs chv_color_funcs = { .color_check = chv_color_check, .color_commit_arm = i9xx_color_commit_arm,
@@ -4114,6 +4128,15 @@ static void apply_colorop(const struct drm_plane_state *plane_state,struct drm_colorop *colorop, u32 *plane_color_ctl) { + struct drm_colorop_state *state = colorop->state; +struct intel_plane_colorop *intel_colorop =to_intel_plane_colorop (colorop); + +if (colorop->type ==DRM_COLOROP_CTM_3X3 ) { +/* TODO: use intel_color_op state data */ + (*plane_color_ctl) |=PLANE_COLOR_PLANE_CSC_ENABLE ; +if (state->data && intel_colorop->id ==CB_PLANE_CSC ) +intel_color_load_plane_csc_matrix (plane_state, state->data); + } }void intel_program_pipeline (const struct drm_plane_state *plane_state,u32 *plane_color_ctl)
drivers/gpu/drm/i915/display/intel_color.h +2 -1
@@ -50,5 +50,6 @@ int intel_plane_tf_pipeline_init(struct drm_plane *plane, struct drm_prop_enum_lint intel_plane_color_init (struct drm_plane *plane);void intel_program_pipeline (const struct drm_plane_state *plane_state,u32 *plane_color_ctl); - +void intel_color_load_plane_csc_matrix (const struct drm_plane_state *plane_state, +const struct drm_property_blob *blob);#endif /* __INTEL_COLOR_H__ */
Signature · 1 line
2.42.0
PATCH v3 15/23 drm/i915/color: Add new color callbacks for Xelpd
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Since we intend to add plane color callbacks from Xelpd(D13 and beyond), create a different structure for it.
--- drivers/gpu/drm/i915/display/intel_color.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_color.c +14 -1
@@ -3874,6 +3874,17 @@ static const struct intel_color_funcs tgl_color_funcs = { .get_config = skl_get_config, }; +static const struct intel_color_funcs xelpd_color_funcs = { + .color_check = icl_color_check, + .color_commit_noarm = icl_color_commit_noarm, + .color_commit_arm = icl_color_commit_arm, + .load_luts = icl_load_luts, + .read_luts = icl_read_luts, + .lut_equal = icl_lut_equal, + .read_csc = icl_read_csc, + .get_config = skl_get_config, +}; +static const struct intel_color_funcs icl_color_funcs = { .color_check = icl_color_check, .color_commit_noarm = icl_color_commit_noarm,
@@ -4305,7 +4316,9 @@ void intel_color_init_hooks(struct intel_display *display)else display->funcs.color = &i9xx_color_funcs; }else { -if (DISPLAY_VER (display) >=12 ) +if (DISPLAY_VER (display) >=13 ) + display->funcs.color = &xelpd_color_funcs; +else if (DISPLAY_VER (display) ==12 ) display->funcs.color = &tgl_color_funcs;else if (DISPLAY_VER (display) ==11 ) display->funcs.color = &icl_color_funcs;
Signature · 1 line
2.42.0
PATCH v3 16/23 drm/i915/color: Add plane CTM callback for D13 and beyond
In reply to Uma ShankarAdd callback for setting CTM block in platforms D13 and beyond
--- drivers/gpu/drm/i915/display/intel_color.c | 79 ++++++++++++++++++++++ 1 file changed, 79 insertions(+)
drivers/gpu/drm/i915/display/intel_color.c +79 -0
@@ -3816,6 +3816,84 @@ static void icl_read_luts(struct intel_crtc_state *crtc_state) } } +static void xelpd_load_plane_csc_matrix (const struct drm_plane_state *state, +const struct drm_property_blob *blob) +{ +struct intel_display *display =to_intel_display (state->plane->dev); +enum pipe pipe =to_intel_plane (state->plane)->pipe; +enum plane_id plane =to_intel_plane (state->plane)->id; +struct drm_color_ctm *ctm; +const u64 *input; +u16 coeffs[9 ] = {}; +u16 postoff =0 ; +int i; + +if (!icl_is_hdr_plane (display, plane) || !blob) +return ; + + ctm = blob->data; + input = ctm->matrix; + +/* +* Convert fixed point S31.32 input to format supported by the +* hardware. +*/ +for (i =0 ; i <ARRAY_SIZE (coeffs); i++) { +u64 abs_coeff = ((1ULL <<63 ) -1 ) & input[i]; + +/* +* Clamp input value to min/max supported by +* hardware. +*/ + abs_coeff =clamp_val (abs_coeff,0 ,CTM_COEFF_4_0 -1 ); + +/* sign bit */ +if (CTM_COEFF_NEGATIVE (input[i])) + coeffs[i] |=1 <<15 ; + +if (abs_coeff <CTM_COEFF_0_125 ) + coeffs[i] |= (3 <<12 ) | +ILK_CSC_COEFF_FP (abs_coeff,12 ); +else if (abs_coeff <CTM_COEFF_0_25 ) + coeffs[i] |= (2 <<12 ) | +ILK_CSC_COEFF_FP (abs_coeff,11 ); +else if (abs_coeff <CTM_COEFF_0_5 ) + coeffs[i] |= (1 <<12 ) | +ILK_CSC_COEFF_FP (abs_coeff,10 ); +else if (abs_coeff <CTM_COEFF_1_0 ) + coeffs[i] |=ILK_CSC_COEFF_FP (abs_coeff,9 ); +else if (abs_coeff <CTM_COEFF_2_0 ) + coeffs[i] |= (7 <<12 ) | +ILK_CSC_COEFF_FP (abs_coeff,8 ); +else + coeffs[i] |= (6 <<12 ) | +ILK_CSC_COEFF_FP (abs_coeff,7 ); + } + +intel_de_write_fw (display,PLANE_CSC_COEFF (pipe, plane,0 ), + coeffs[0 ] <<16 | coeffs[1 ]); +intel_de_write_fw (display,PLANE_CSC_COEFF (pipe, plane,1 ), + coeffs[2 ] <<16 ); + +intel_de_write_fw (display,PLANE_CSC_COEFF (pipe, plane,2 ), + coeffs[3 ] <<16 | coeffs[4 ]); +intel_de_write_fw (display,PLANE_CSC_COEFF (pipe, plane,3 ), + coeffs[5 ] <<16 ); + +intel_de_write_fw (display,PLANE_CSC_COEFF (pipe, plane,4 ), + coeffs[6 ] <<16 | coeffs[7 ]); +intel_de_write_fw (display,PLANE_CSC_COEFF (pipe, plane,5 ), + coeffs[8 ] <<16 ); + +intel_de_write_fw (display,PLANE_CSC_PREOFF (pipe, plane,0 ),0 ); +intel_de_write_fw (display,PLANE_CSC_PREOFF (pipe, plane,1 ),0 ); +intel_de_write_fw (display,PLANE_CSC_PREOFF (pipe, plane,2 ),0 ); + +intel_de_write_fw (display,PLANE_CSC_POSTOFF (pipe, plane,0 ), postoff); +intel_de_write_fw (display,PLANE_CSC_POSTOFF (pipe, plane,1 ), postoff); +intel_de_write_fw (display,PLANE_CSC_POSTOFF (pipe, plane,2 ), postoff); +} +void intel_color_load_plane_csc_matrix (const struct drm_plane_state *plane_state,const struct drm_property_blob *blob) {
@@ -3883,6 +3961,7 @@ static const struct intel_color_funcs xelpd_color_funcs = { .lut_equal = icl_lut_equal, .read_csc = icl_read_csc, .get_config = skl_get_config, + .load_plane_csc_matrix = xelpd_load_plane_csc_matrix, };static const struct intel_color_funcs icl_color_funcs = {
Signature · 1 line
2.42.0
PATCH v3 17/23 drm/i915: Add register definitions for Plane Degamma
In reply to Uma ShankarAdd macros to define Plane Degamma registers
--- .../i915/display/skl_universal_plane_regs.h | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+)
drivers/gpu/drm/i915/display/skl_universal_plane_regs.h +53 -0
@@ -254,6 +254,7 @@#define PLANE_COLOR_PIPE_CSC_ENABLE REG_BIT(23)/* Pre-ICL */ #define PLANE_COLOR_PLANE_CSC_ENABLE REG_BIT(21)/* ICL+ */ #define PLANE_COLOR_INPUT_CSC_ENABLE REG_BIT(20)/* ICL+ */ +#define PLANE_COLOR_PRE_CSC_GAMMA_ENABLE REG_BIT(14)#define PLANE_COLOR_CSC_MODE_MASK REG_GENMASK(19, 17)#define PLANE_COLOR_CSC_MODE_BYPASS REG_FIELD_PREP(PLANE_COLOR_CSC_MODE_MASK, 0)#define PLANE_COLOR_CSC_MODE_YUV601_TO_RGB601 REG_FIELD_PREP(PLANE_COLOR_CSC_MODE_MASK, 1)
@@ -290,6 +291,58 @@ _PLANE_INPUT_CSC_POSTOFF_HI_1_A, _PLANE_INPUT_CSC_POSTOFF_HI_1_B, \ _PLANE_INPUT_CSC_POSTOFF_HI_2_A, _PLANE_INPUT_CSC_POSTOFF_HI_2_B) +#define _MMIO_PLANE_GAMC (plane, i, a, b) _MMIO(_PIPE(plane, a, b) + (i) * 4) + +/* Display13 Plane Degmma Reg */ +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_1_A 0x701d0 +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_1_B 0x711d0 +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_2_A 0x702d0 +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_2_B 0x712d0 +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_1 (pipe) _PIPE(pipe, _PLANE_PRE_CSC_GAMC_INDEX_ENH_1_A, \ + _PLANE_PRE_CSC_GAMC_INDEX_ENH_1_B) +#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_2 (pipe) _PIPE(pipe, _PLANE_PRE_CSC_GAMC_INDEX_ENH_2_A, \ + _PLANE_PRE_CSC_GAMC_INDEX_ENH_2_B) +#define PLANE_PRE_CSC_GAMC_INDEX_ENH (pipe, plane, i) \ + _MMIO_PLANE_GAMC(plane, i, _PLANE_PRE_CSC_GAMC_INDEX_ENH_1(pipe), \ + _PLANE_PRE_CSC_GAMC_INDEX_ENH_2(pipe)) +#define PLANE_PAL_PREC_AUTO_INCREMENT REG_BIT(10) + +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_1_A 0x701d4 +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_1_B 0x711d4 +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_2_A 0x702d4 +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_2_B 0x712d4 +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_1 (pipe) _PIPE(pipe, _PLANE_PRE_CSC_GAMC_DATA_ENH_1_A, \ + _PLANE_PRE_CSC_GAMC_DATA_ENH_1_B) +#define _PLANE_PRE_CSC_GAMC_DATA_ENH_2 (pipe) _PIPE(pipe, _PLANE_PRE_CSC_GAMC_DATA_ENH_2_A, \ + _PLANE_PRE_CSC_GAMC_DATA_ENH_2_B) +#define PLANE_PRE_CSC_GAMC_DATA_ENH (pipe, plane, i) \ + _MMIO_PLANE_GAMC(plane, i, _PLANE_PRE_CSC_GAMC_DATA_ENH_1(pipe), \ + _PLANE_PRE_CSC_GAMC_DATA_ENH_2(pipe)) + +#define _PLANE_PRE_CSC_GAMC_INDEX_1_A 0x704d0 +#define _PLANE_PRE_CSC_GAMC_INDEX_1_B 0x714d0 +#define _PLANE_PRE_CSC_GAMC_INDEX_2_A 0x705d0 +#define _PLANE_PRE_CSC_GAMC_INDEX_2_B 0x715d0 +#define _PLANE_PRE_CSC_GAMC_INDEX_1 (pipe) _PIPE(pipe, _PLANE_PRE_CSC_GAMC_INDEX_1_A, \ + _PLANE_PRE_CSC_GAMC_INDEX_1_B) +#define _PLANE_PRE_CSC_GAMC_INDEX_2 (pipe) _PIPE(pipe, _PLANE_PRE_CSC_GAMC_INDEX_2_A, \ + _PLANE_PRE_CSC_GAMC_INDEX_2_B) +#define PLANE_PRE_CSC_GAMC_INDEX (pipe, plane, i) \ + _MMIO_PLANE_GAMC(plane, i, _PLANE_PRE_CSC_GAMC_INDEX_1(pipe), \ + _PLANE_PRE_CSC_GAMC_INDEX_2(pipe)) + +#define _PLANE_PRE_CSC_GAMC_DATA_1_A 0x704d4 +#define _PLANE_PRE_CSC_GAMC_DATA_1_B 0x714d4 +#define _PLANE_PRE_CSC_GAMC_DATA_2_A 0x705d4 +#define _PLANE_PRE_CSC_GAMC_DATA_2_B 0x715d4 +#define _PLANE_PRE_CSC_GAMC_DATA_1 (pipe) _PIPE(pipe, _PLANE_PRE_CSC_GAMC_DATA_1_A, \ + _PLANE_PRE_CSC_GAMC_DATA_1_B) +#define _PLANE_PRE_CSC_GAMC_DATA_2 (pipe) _PIPE(pipe, _PLANE_PRE_CSC_GAMC_DATA_2_A, \ + _PLANE_PRE_CSC_GAMC_DATA_2_B) +#define PLANE_PRE_CSC_GAMC_DATA (pipe, plane, i) \ + _MMIO_PLANE_GAMC(plane, i, _PLANE_PRE_CSC_GAMC_DATA_1(pipe), \ + _PLANE_PRE_CSC_GAMC_DATA_2(pipe)) +#define _PLANE_CSC_RY_GY_1_A 0x70210#define _PLANE_CSC_RY_GY_2_A 0x70310#define _PLANE_CSC_RY_GY_1_B 0x71210
Signature · 1 line
2.42.0
PATCH v3 18/23 drm/i915/color: Add framework to program PRE/POST CSC LUT
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Add framework that will help in loading LUT to Pre/Post CSC color blocks.
--- drivers/gpu/drm/i915/display/intel_color.c | 27 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_color.h | 2 ++ 2 files changed, 29 insertions(+)
drivers/gpu/drm/i915/display/intel_color.c +27 -0
@@ -91,6 +91,10 @@ struct intel_color_funcs {/* Plane CSC*/ void (*load_plane_csc_matrix)(const struct drm_plane_state *plane_state,const struct drm_property_blob *blob); + +/* Plane Pre/Post CSC */ +void (*load_plane_luts)(const struct drm_plane_state *plane_state, +const struct drm_property_blob *blob,bool is_pre_csc); };#define CTM_COEFF_SIGN (1ULL << 63)
@@ -3903,6 +3907,20 @@ void intel_color_load_plane_csc_matrix(const struct drm_plane_state *plane_state i915->display.funcs.color->load_plane_csc_matrix (plane_state, blob); } +static void xelpd_plane_load_luts (const struct drm_plane_state *plane_state, +const struct drm_property_blob *blob,bool is_pre_csc) +{ +} + +void intel_color_load_plane_luts (const struct drm_plane_state *plane_state, +const struct drm_property_blob *blob,bool is_pre_csc) +{ +struct drm_i915_private *i915 =to_i915 (plane_state->plane->dev); + +if (i915->display.funcs.color->load_plane_luts) + i915->display.funcs.color->load_plane_luts (plane_state, blob, is_pre_csc); +} +static const struct intel_color_funcs chv_color_funcs = { .color_check = chv_color_check, .color_commit_arm = i9xx_color_commit_arm,
@@ -3962,6 +3980,7 @@ static const struct intel_color_funcs xelpd_color_funcs = { .read_csc = icl_read_csc, .get_config = skl_get_config, .load_plane_csc_matrix = xelpd_load_plane_csc_matrix, + .load_plane_luts = xelpd_plane_load_luts, };static const struct intel_color_funcs icl_color_funcs = {
@@ -4226,6 +4245,14 @@ static void apply_colorop(const struct drm_plane_state *plane_state, (*plane_color_ctl) |=PLANE_COLOR_PLANE_CSC_ENABLE ;if (state->data && intel_colorop->id ==CB_PLANE_CSC )intel_color_load_plane_csc_matrix (plane_state, state->data); + }else if (colorop->type ==DRM_COLOROP_1D_LUT_MULTSEG ) { +if (state->data && intel_colorop->id ==CB_PLANE_PRE_CSC_LUT ) { + (*plane_color_ctl) |=PLANE_COLOR_PRE_CSC_GAMMA_ENABLE ; +intel_color_load_plane_luts (plane_state, state->data, true); + }else if (state->data && intel_colorop->id ==CB_PLANE_POST_CSC_LUT ) { + (*plane_color_ctl) &= ~PLANE_COLOR_PLANE_GAMMA_DISABLE ; +intel_color_load_plane_luts (plane_state, state->data, false); + } } }
drivers/gpu/drm/i915/display/intel_color.h +2 -0
@@ -52,4 +52,6 @@ void intel_program_pipeline(const struct drm_plane_state *plane_state, u32 *plane_color_ctl);void intel_color_load_plane_csc_matrix (const struct drm_plane_state *plane_state,const struct drm_property_blob *blob); +void intel_color_load_plane_luts (const struct drm_plane_state *plane_state, +const struct drm_property_blob *blob,bool is_pre_csc);#endif /* __INTEL_COLOR_H__ */
Signature · 1 line
2.42.0
PATCH v3 19/23 drm/i915: Add register definitions for Plane Post CSC
In reply to Uma ShankarAdd macros to define Plane Post CSC registers
--- .../i915/display/skl_universal_plane_regs.h | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+)
drivers/gpu/drm/i915/display/skl_universal_plane_regs.h +73 -0
@@ -293,6 +293,79 @@#define _MMIO_PLANE_GAMC (plane, i, a, b) _MMIO(_PIPE(plane, a, b) + (i) * 4) +/* Display13 Plane Gamma Reg */ +#define _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_1_A 0x70160 +#define _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_1_B 0x71160 +#define _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_2_A 0x70260 +#define _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_2_B 0x71260 +#define _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_1 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_1_A, \ + _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_1_B) +#define _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_2 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_2_A, \ + _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_2_B) +#define PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH (pipe, plane, i) \ + _MMIO_PLANE_GAMC(plane, i, _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_1(pipe), \ + _PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH_2(pipe)) + +#define _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_1_A 0x70164 +#define _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_1_B 0x71164 +#define _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_2_A 0x70264 +#define _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_2_B 0x71264 +#define _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_1 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_1_A, \ + _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_1_B) +#define _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_2 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_2_A, \ + _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_2_B) +#define PLANE_POST_CSC_GAMC_SEG0_DATA_ENH (pipe, plane, i) \ + _MMIO_PLANE_GAMC(plane, i, _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_1(pipe), \ + _PLANE_POST_CSC_GAMC_SEG0_DATA_ENH_2(pipe)) + +#define _PLANE_POST_CSC_GAMC_INDEX_ENH_1_A 0x701d8 +#define _PLANE_POST_CSC_GAMC_INDEX_ENH_1_B 0x711d8 +#define _PLANE_POST_CSC_GAMC_INDEX_ENH_2_A 0x702d8 +#define _PLANE_POST_CSC_GAMC_INDEX_ENH_2_B 0x712d8 +#define _PLANE_POST_CSC_GAMC_INDEX_ENH_1 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_INDEX_ENH_1_A, \ + _PLANE_POST_CSC_GAMC_INDEX_ENH_1_B) +#define _PLANE_POST_CSC_GAMC_INDEX_ENH_2 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_INDEX_ENH_2_A, \ + _PLANE_POST_CSC_GAMC_INDEX_ENH_2_B) +#define PLANE_POST_CSC_GAMC_INDEX_ENH (pipe, plane, i) \ + _MMIO_PLANE_GAMC(plane, i, _PLANE_POST_CSC_GAMC_INDEX_ENH_1(pipe), \ + _PLANE_POST_CSC_GAMC_INDEX_ENH_2(pipe)) + +#define _PLANE_POST_CSC_GAMC_DATA_ENH_1_A 0x701dc +#define _PLANE_POST_CSC_GAMC_DATA_ENH_1_B 0x711dc +#define _PLANE_POST_CSC_GAMC_DATA_ENH_2_A 0x702dc +#define _PLANE_POST_CSC_GAMC_DATA_ENH_2_B 0x712dc +#define _PLANE_POST_CSC_GAMC_DATA_ENH_1 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_DATA_ENH_1_A, \ + _PLANE_POST_CSC_GAMC_DATA_ENH_1_B) +#define _PLANE_POST_CSC_GAMC_DATA_ENH_2 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_DATA_ENH_2_A, \ + _PLANE_POST_CSC_GAMC_DATA_ENH_2_B) +#define PLANE_POST_CSC_GAMC_DATA_ENH (pipe, plane, i) \ + _MMIO_PLANE_GAMC(plane, i, _PLANE_POST_CSC_GAMC_DATA_ENH_1(pipe), \ + _PLANE_POST_CSC_GAMC_DATA_ENH_2(pipe)) + +#define _PLANE_POST_CSC_GAMC_INDEX_1_A 0x704d8 +#define _PLANE_POST_CSC_GAMC_INDEX_1_B 0x714d8 +#define _PLANE_POST_CSC_GAMC_INDEX_2_A 0x705d8 +#define _PLANE_POST_CSC_GAMC_INDEX_2_B 0x715d8 +#define _PLANE_POST_CSC_GAMC_INDEX_1 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_INDEX_1_A, \ + _PLANE_POST_CSC_GAMC_INDEX_1_B) +#define _PLANE_POST_CSC_GAMC_INDEX_2 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_INDEX_2_A, \ + _PLANE_POST_CSC_GAMC_INDEX_2_B) +#define PLANE_POST_CSC_GAMC_INDEX (pipe, plane, i) \ + _MMIO_PLANE_GAMC(plane, i, _PLANE_POST_CSC_GAMC_INDEX_1(pipe), \ + _PLANE_POST_CSC_GAMC_INDEX_2(pipe)) + +#define _PLANE_POST_CSC_GAMC_DATA_1_A 0x704dc +#define _PLANE_POST_CSC_GAMC_DATA_1_B 0x714dc +#define _PLANE_POST_CSC_GAMC_DATA_2_A 0x705dc +#define _PLANE_POST_CSC_GAMC_DATA_2_B 0x715dc +#define _PLANE_POST_CSC_GAMC_DATA_1 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_DATA_1_A, \ + _PLANE_POST_CSC_GAMC_DATA_1_B) +#define _PLANE_POST_CSC_GAMC_DATA_2 (pipe) _PIPE(pipe, _PLANE_POST_CSC_GAMC_DATA_2_A, \ + _PLANE_POST_CSC_GAMC_DATA_2_B) +#define PLANE_POST_CSC_GAMC_DATA (pipe, plane, i) \ + _MMIO_PLANE_GAMC(plane, i, _PLANE_POST_CSC_GAMC_DATA_1(pipe), \ + _PLANE_POST_CSC_GAMC_DATA_2(pipe)) +/* Display13 Plane Degmma Reg */ #define _PLANE_PRE_CSC_GAMC_INDEX_ENH_1_A 0x701d0#define _PLANE_PRE_CSC_GAMC_INDEX_ENH_1_B 0x711d0
Signature · 1 line
2.42.0
PATCH v3 20/23 drm/i915/color: Program Pre-CSC registers
In reply to Uma ShankarAdd callback for programming Pre-CSC LUT for TGL and beyond
--- drivers/gpu/drm/i915/display/intel_color.c | 88 ++++++++++++++++++++++ 1 file changed, 88 insertions(+)
drivers/gpu/drm/i915/display/intel_color.c +88 -0
@@ -3907,9 +3907,97 @@ void intel_color_load_plane_csc_matrix(const struct drm_plane_state *plane_state i915->display.funcs.color->load_plane_csc_matrix (plane_state, blob); } +static void xelpd_program_plane_pre_csc_lut (const struct drm_plane_state *state, +const struct drm_color_lut_32 *pre_csc_lut, +u32 offset) +{ +struct intel_display *display =to_intel_display (state->plane->dev); +enum pipe pipe =to_intel_plane (state->plane)->pipe; +enum plane_id plane =to_intel_plane (state->plane)->id; +u32 i, lut_size; + +if (icl_is_hdr_plane (display, plane)) { + lut_size =128 ; + +intel_de_write_fw (display,PLANE_PRE_CSC_GAMC_INDEX_ENH (pipe, plane,0 ), + offset |PLANE_PAL_PREC_AUTO_INCREMENT ); + +if (pre_csc_lut) { +for (i =0 ; i < lut_size; i++) { +u32 lut_val = (pre_csc_lut[i].green &0xffffff ); + +intel_de_write_fw (display, +PLANE_PRE_CSC_GAMC_DATA_ENH (pipe, plane,0 ), + lut_val); + } + +/* Program the max register to clamp values > 1.0. */ +/* ToDo: Restrict to 0x7ffffff*/ +while (i <131 ) +intel_de_write_fw (display, +PLANE_PRE_CSC_GAMC_DATA_ENH (pipe, plane,0 ), + pre_csc_lut[i++].green); + }else { +for (i =0 ; i < lut_size; i++) { +u32 v = (i * ((1 <<24 ) -1 )) / (lut_size -1 ); + +intel_de_write_fw (display, +PLANE_PRE_CSC_GAMC_DATA_ENH (pipe, plane,0 ), v); + } + +do { +intel_de_write_fw (display, +PLANE_PRE_CSC_GAMC_DATA_ENH (pipe, plane,0 ), +1 <<24 ); + }while (i++ <130 ); + } + +intel_de_write_fw (display,PLANE_PRE_CSC_GAMC_INDEX_ENH (pipe, plane,0 ),0 ); + }else { + lut_size =32 ; + +/* +* First 3 planes are HDR, so reduce by 3 to get to the right +* SDR plane offset +*/ + plane = plane -3 ; + +intel_de_write_fw (display,PLANE_PRE_CSC_GAMC_INDEX (pipe, plane,0 ), + offset |PLANE_PAL_PREC_AUTO_INCREMENT ); + +if (pre_csc_lut) { +for (i =0 ; i < lut_size; i++) +intel_de_write_fw (display,PLANE_PRE_CSC_GAMC_DATA (pipe, plane,0 ), + pre_csc_lut[i].green); +/* Program the max register to clamp values > 1.0. */ +while (i <35 ) +intel_de_write_fw (display,PLANE_PRE_CSC_GAMC_DATA (pipe, plane,0 ), + pre_csc_lut[i++].green); + }else { +for (i =0 ; i < lut_size; i++) { +u32 v = (i * ((1 <<16 ) -1 )) / (lut_size -1 ); + +intel_de_write_fw (display, +PLANE_PRE_CSC_GAMC_DATA (pipe, plane,0 ), v); + } + +do { +intel_de_write_fw (display,PLANE_PRE_CSC_GAMC_DATA (pipe, plane,0 ), +1 <<16 ); + }while (i++ <34 ); + } + +intel_de_write_fw (display,PLANE_PRE_CSC_GAMC_INDEX (pipe, plane,0 ),0 ); + } +} +static void xelpd_plane_load_luts (const struct drm_plane_state *plane_state,const struct drm_property_blob *blob,bool is_pre_csc) { +struct drm_color_lut_32 *lut = blob->data; + +if (is_pre_csc) +xelpd_program_plane_pre_csc_lut (plane_state, lut,0 ); } void intel_color_load_plane_luts(const struct drm_plane_state *plane_state,
Signature · 1 line
2.42.0
PATCH v3 21/23 drm/i915/xelpd: Program Plane Post CSC Registers
In reply to Uma ShankarExtract the LUT and program plane post csc registers.
--- drivers/gpu/drm/i915/display/intel_color.c | 109 +++++++++++++++++++++ 1 file changed, 109 insertions(+)
drivers/gpu/drm/i915/display/intel_color.c +109 -0
@@ -3991,6 +3991,113 @@ static void xelpd_program_plane_pre_csc_lut(const struct drm_plane_state *state, } } +static void xelpd_program_plane_post_csc_lut (const struct drm_plane_state *state, +const struct drm_color_lut_32 *post_csc_lut, +u32 offset) +{ +struct intel_display *display =to_intel_display (state->plane->dev); +enum pipe pipe =to_intel_plane (state->plane)->pipe; +enum plane_id plane =to_intel_plane (state->plane)->id; +u32 i, lut_size, j; + +if (icl_is_hdr_plane (display, plane)) { +intel_de_write_fw (display,PLANE_POST_CSC_GAMC_INDEX_ENH (pipe, plane,0 ), + offset |PLANE_PAL_PREC_AUTO_INCREMENT ); +/* TODO: Add macro */ +intel_de_write_fw (display,PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH (pipe, plane,0 ), +PLANE_PAL_PREC_AUTO_INCREMENT ); +if (post_csc_lut) { +/* Segment 0 */ +for (i =0 , j =0 ; i <9 ; i++, j++) { +u32 lut_val = (post_csc_lut[j].green &0xffffff ); + +intel_de_write_fw (display, +PLANE_POST_CSC_GAMC_SEG0_DATA_ENH (pipe, plane,0 ), + lut_val); + } + +/* Segment 1 */ + lut_size =32 ; +for (i =0 ; i < lut_size; i++) { +u32 lut_val; + +if (i ==0 ) + lut_val = post_csc_lut[0 ].green &0xffffff ; +else if (i ==1 ) + lut_val = (post_csc_lut[8 ].green &0xffffff ); +else + lut_val = (post_csc_lut[j++].green &0xffffff ); + +intel_de_write_fw (display, +PLANE_POST_CSC_GAMC_DATA_ENH (pipe, plane,0 ), + lut_val); + } + +/* Segment 2 */ +do { +intel_de_write_fw (display, +PLANE_POST_CSC_GAMC_DATA_ENH (pipe, plane,0 ), + post_csc_lut[j++].green); + }while (j <42 ); + }else { +/*TODO: Add for segment 0 */ + lut_size =32 ; +for (i =0 ; i < lut_size; i++) { +u32 v = (i * ((1 <<24 ) -1 )) / (lut_size -1 ); + +intel_de_write_fw (display, +PLANE_POST_CSC_GAMC_DATA_ENH (pipe, plane,0 ), v); + } + +do { +intel_de_write_fw (display, +PLANE_POST_CSC_GAMC_DATA_ENH (pipe, plane,0 ), +1 <<24 ); + }while (i++ <34 ); + } + +intel_de_write_fw (display,PLANE_POST_CSC_GAMC_INDEX_ENH (pipe, plane,0 ),0 ); +intel_de_write_fw (display,PLANE_POST_CSC_GAMC_SEG0_INDEX_ENH (pipe, plane,0 ),0 ); + }else { + lut_size =32 ; +/* +* First 3 planes are HDR, so reduce by 3 to get to the right +* SDR plane offset +*/ + plane = plane -3 ; + +intel_de_write_fw (display,PLANE_POST_CSC_GAMC_INDEX (pipe, plane,0 ), + offset |PLANE_PAL_PREC_AUTO_INCREMENT ); + +if (post_csc_lut) { +for (i =0 ; i < lut_size; i++) +intel_de_write_fw (display, +PLANE_POST_CSC_GAMC_DATA (pipe, plane,0 ), + post_csc_lut[i].green &0xffff ); +/* Program the max register to clamp values > 1.0. */ +while (i <35 ) +intel_de_write_fw (display, +PLANE_POST_CSC_GAMC_DATA (pipe, plane,0 ), + post_csc_lut[i++].green &0x3ffff ); + }else { +for (i =0 ; i < lut_size; i++) { +u32 v = (i * ((1 <<16 ) -1 )) / (lut_size -1 ); + +intel_de_write_fw (display, +PLANE_POST_CSC_GAMC_DATA (pipe, plane,0 ), v); + } + +do { +intel_de_write_fw (display, +PLANE_POST_CSC_GAMC_DATA (pipe, plane,0 ), + (1 <<16 )); + }while (i++ <34 ); + } + +intel_de_write_fw (display,PLANE_POST_CSC_GAMC_INDEX (pipe, plane,0 ),0 ); + } +} +static void xelpd_plane_load_luts (const struct drm_plane_state *plane_state,const struct drm_property_blob *blob,bool is_pre_csc) {
@@ -3998,6 +4105,8 @@ static void xelpd_plane_load_luts(const struct drm_plane_state *plane_state,if (is_pre_csc)xelpd_program_plane_pre_csc_lut (plane_state, lut,0 ); +else +xelpd_program_plane_post_csc_lut (plane_state, lut,0 ); } void intel_color_load_plane_luts(const struct drm_plane_state *plane_state,
Signature · 1 line
2.42.0
PATCH v3 22/23 drm/i915/color: Enable Plane Color Pipelines
In reply to Uma ShankarFrom: Chaitanya Kumar Borah <[email protected]>
Expose color pipeline and add ability to program it.
--- drivers/gpu/drm/i915/display/skl_universal_plane.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/display/skl_universal_plane.c +5 -0
@@ -12,6 +12,7 @@#include "i915_reg.h" #include "intel_atomic_plane.h" #include "intel_bo.h" +#include "intel_color.h" #include "intel_de.h" #include "intel_display_irq.h" #include "intel_display_types.h"
@@ -1548,6 +1549,8 @@ icl_plane_update_noarm(struct intel_dsb *dsb, plane_color_ctl = plane_state->color_ctl |glk_plane_color_ctl_crtc (crtc_state); +intel_program_pipeline (&plane_state->uapi, &plane_color_ctl); +/* The scaler will handle the output position */ if (plane_state->scaler_id >=0 ) { crtc_x =0 ;
@@ -2952,6 +2955,8 @@ skl_universal_plane_create(struct intel_display *display,DRM_COLOR_YCBCR_BT709 , DRM_COLOR_YCBCR_LIMITED_RANGE); +intel_plane_color_init (&plane->base); +drm_plane_create_alpha_property (&plane->base); drm_plane_create_blend_mode_property(&plane->base, BIT(DRM_MODE_BLEND_PIXEL_NONE) |
Signature · 1 line
2.42.0
PATCH v3 23/23 drm/doc/rfc: Add documentation for multi-segmented 1D LUT
In reply to Uma ShankarAdd documentation to explain properties of the exposed hardware 1D LUT blocks, its identification and computation of the LUT samples based on the number of samples, their distribution and precison.
--- Documentation/gpu/rfc/color_pipeline.rst | 142 ++++++++++++++++++++++- 1 file changed, 141 insertions(+), 1 deletion(-)
Documentation/gpu/rfc/color_pipeline.rst +141 -1
@@ -279,6 +279,125 @@ pipeline might look like this:: ├─ "CURVE_1D_TYPE": enum {sRGB EOTF, PQ EOTF} = sRGB EOTF └─ "NEXT" (immutable) = 0 +Discover capabilities of 1D LUT HW block +---------------------------------------- + +The driver exposes a blob property(HW_CAPS) which allows user-space to +parse and extract the hardware capabilities of 1D LUT. These include +number of LUT segments, number of LUT samples per segment, start and end +point of respective segments and the precision of the LUT sample along +with the normalization factor. This is how the capability structure look like + + struct drm_color_lut_range { + __u32 flags; + __u16 count; + __s32 start, end; + __u32 norm_factor; + + struct { + __u16 intp; + __u16 fracp; + } precision; + }; + +If a hardware has multiple segments in 1D LUT, each segment will be represented +by one instance of the above structure and the whole 1D LUT block will be represented +by an array of drm_color_lut_range. + +Here, + +flags : This indicates LUT characteristics like linearly increasing, negative + reflect or any other property of the LUT. + +count : Number of samples in the respective segments. + +start, end : It indicates the starting point and ending point of the segment respectively. + This represent a point in 0 to 1.0 color space curve and the value depends on + the normalization factor chosen. + +norm_factor : This factor helps define a scale to represent LUT sample with the smallest step size + in case of uniform or non-uniform LUT sample distribution. + +precision: It indicates the fixed point precision of HW LUT including integer and fractional component. + +To explain the usage with some real life example +------------------------------------------------ + +1. Conventional 1D LUT with just one segment + + |---|---|------------------------------------| + 0 1 2 1024 + + + - Hardware Description: A color block with a LUT linearly interpolating and + covering range from 0 to 1.0 + - Number of segments - 1 + - Number of samples in LUT 1024 + - Precision of LUT samples in HW 0.10 + - Normalization Factor - Max value to represent 1.0 + in terms of smallest step size which is 1024. + + In this case, it will be represented by the following structure. + + struct drm_color_lut_range lut_1024[] = { + .start = 0 .end = (1 << 10); + .normalization_factor = 1024; + .count = 1024; + .precision { + .int_comp = 0; + .fractional_comp = 10; + } + } + +2. Piece Wise Linear 1D LUT2. Piece Wise Linear 1D LUT + + |---|---|------------------------------------| + 0 1 2 32 + | \ + | \ + | \ + | \ + | \ + 0 \ + |---|---|--...-------| + 0 1 2 8 + + - Hardware Description: A color block with a LUT linearly interpolating and + covering range from 0 to 1.0 + - Number of segments 2 + - Number of samples + - segment 1 - 9 (covers range from 0 to 1/32) + - segment 2 - 30 (covers range from 2/32 to 1.0) + - Precision of LUT samples in HW 0.24 + - Normalization Factor - Max value to represent 1.0 + in terms of smallest step size which is 8*32. + + struct drm_color_lut_range lut_pwl[] = { + /* segment 1 */ + { + .count = 9, + .start = 0, .end = 8, + .norm_factor = 8*32, + .precision = { + .intp = 0, + .fracp = 24, + }, + }, + /* segment 2 */ + { + .count = 30, + .start = 8*2, .end = 8*32, + .norm_factor = 8*32, + .precision = { + .intp = 0, + .fracp = 24, + }, + }, + } + +Note: In case HW supports overlapping LUTs expectation from uAPI is that the respective HW vendor +driver expose it as linearly increasing LUT and it will internally handle the programming of the +overlapping sections. Color Pipeline Programming ==========================
@@ -320,6 +439,27 @@ property values:: ├─ "CURVE_1D_TYPE" = PQ EOTF └─ "BYPASS" = false +Programming 1d LUT HW block +--------------------------- + +In order to compute the LUT samples, userspace will parse the drm_color_lut_range structure to +get the LUT distribution of the underlying HW block. + +It needs to compute the normalized value of the LUT sample using the normalization factor provided +by the driver. The normalized value can then be scaled to the LUT precision of the HW. The computed +LUT samples will be packed in a blob and passed to the driver to be programmed in HW. + +The pseudo code of calculating the LUT samples for a linear LUT is described below. + + for (i = 0; i < sample_count; i++) { + start end - start + normalized_value = ---------------------- + ----------------------------------------- * i + normalization_factor (sample_count - 1) * normalization_factor + + lut[i] = normalized_value * lut_precision /* (1 << precision.fracp) */ + } + +Note: The same logic can be extended for any color space transfer function implementation. Driver Implementer's Guide ==========================
@@ -375,4 +515,4 @@ for user space. In this case a new pipeline should be defined. References ========== -1. https://lore.kernel.org/dri-devel/QMers3awXvNCQlyhWdTtsPwkp5ie9bze_hD5nAccFW7a_RXlWjYB7MoUW_8CKLT2bSQwIXVi5H6VULYIxCdgvryZoAoJnC5lZgyK1QWn488=@emersion.fr/ +1. https://lore.kernel.org/dri-devel/QMers3awXvNCQlyhWdTtsPwkp5ie9bze_hD5nAccFW7a_RXlWjYB7MoUW_8CKLT2bSQwIXVi5H6VULYIxCdgvryZoAoJnC5lZgyK1QWn488=@emersion.fr/
Signature · 1 line
2.42.0
Patchwork
CI✗ Fi.CI.BUILD: failure for Plane Color Pipeline support for Intel platforms (rev3)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Plane Color Pipeline support for Intel platforms (rev3)
URL : https://patchwork.freedesktop.org/series/129811/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/129811/revisions/3/mbox/ not applied
Applying: drm: color pipeline base work
Using index info to reconstruct a base tree...
M Documentation/gpu/rfc/index.rst
M drivers/gpu/drm/Makefile
M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
M drivers/gpu/drm/vkms/Kconfig
M drivers/gpu/drm/vkms/Makefile
M drivers/gpu/drm/vkms/vkms_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/vkms/vkms_drv.h
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/vkms/tests/Makefile Auto-merging drivers/gpu/drm/vkms/tests/Makefile
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/vkms/tests/.kunitconfig Auto-merging drivers/gpu/drm/vkms/tests/.kunitconfig
Auto-merging drivers/gpu/drm/vkms/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/vkms/Makefile
Auto-merging drivers/gpu/drm/vkms/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/vkms/Kconfig
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging drivers/gpu/drm/Makefile
Auto-merging Documentation/gpu/rfc/index.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm: color pipeline base work
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced
Patchwork
CI✗ CI.Patch_applied: failure for Plane Color Pipeline support for Intel platforms (rev2)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Plane Color Pipeline support for Intel platforms (rev2)
URL : https://patchwork.freedesktop.org/series/141788/
State : failure
== Summary ==
=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 0457c65354c6 drm-tip: 2025y-03m-10d-09h-55m-22s UTC integration manifest === git am output follows ===
error: patch failed: drivers/gpu/drm/vkms/Kconfig:14
error: drivers/gpu/drm/vkms/Kconfig: patch does not apply
error: patch failed: drivers/gpu/drm/vkms/Makefile:6
error: drivers/gpu/drm/vkms/Makefile: patch does not apply
error: drivers/gpu/drm/vkms/tests/.kunitconfig: already exists in index
error: drivers/gpu/drm/vkms/tests/Makefile: already exists in index
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: drm: color pipeline base work
Patch failed at 0001 drm: color pipeline base work
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".