mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-10 15:58:13 -04:00
drm/amd/display: add driver-specific property for plane degamma LUT
Hook up driver-specific atomic operations for managing AMD color properties. Create AMD driver-specific color management properties and attach them according to HW capabilities defined by `struct dc_color_caps`. First add plane degamma LUT properties that means user-blob and its size. We will add more plane color properties in the next patches. In addition, we define AMD_PRIVATE_COLOR to guard these driver-specific plane properties. Plane degamma can be used to linearize input space for arithmetical operations that are more accurate when applied in linear color. v2: - update degamma LUT prop description - move private color operations from amdgpu_display to amdgpu_dm_color v5: - get degamma blob correctly (Joshua) Reviewed-by: Harry Wentland <harry.wentland@amd.com> Co-developed-by: Joshua Ashton <joshua@froggi.es> Signed-off-by: Joshua Ashton <joshua@froggi.es> Signed-off-by: Melissa Wen <mwen@igalia.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
committed by
Alex Deucher
parent
24013b9301
commit
9342a9ae54
@@ -343,6 +343,18 @@ struct amdgpu_mode_info {
|
||||
int disp_priority;
|
||||
const struct amdgpu_display_funcs *funcs;
|
||||
const enum drm_plane_type *plane_type;
|
||||
|
||||
/* Driver-private color mgmt props */
|
||||
|
||||
/* @plane_degamma_lut_property: Plane property to set a degamma LUT to
|
||||
* convert encoded values to light linear values before sampling or
|
||||
* blending.
|
||||
*/
|
||||
struct drm_property *plane_degamma_lut_property;
|
||||
/* @plane_degamma_lut_size_property: Plane property to define the max
|
||||
* size of degamma LUT as supported by the driver (read-only).
|
||||
*/
|
||||
struct drm_property *plane_degamma_lut_size_property;
|
||||
};
|
||||
|
||||
#define AMDGPU_MAX_BL_LEVEL 0xFF
|
||||
|
||||
@@ -4067,6 +4067,11 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev)
|
||||
return r;
|
||||
}
|
||||
|
||||
#ifdef AMD_PRIVATE_COLOR
|
||||
if (amdgpu_dm_create_color_properties(adev))
|
||||
return -ENOMEM;
|
||||
#endif
|
||||
|
||||
r = amdgpu_dm_audio_init(adev);
|
||||
if (r) {
|
||||
dc_release_state(state->context);
|
||||
|
||||
@@ -727,6 +727,16 @@ extern const struct amdgpu_ip_block_version dm_ip_block;
|
||||
struct dm_plane_state {
|
||||
struct drm_plane_state base;
|
||||
struct dc_plane_state *dc_state;
|
||||
|
||||
/* Plane color mgmt */
|
||||
/**
|
||||
* @degamma_lut:
|
||||
*
|
||||
* 1D LUT for mapping framebuffer/plane pixel data before sampling or
|
||||
* blending operations. It's usually applied to linearize input space.
|
||||
* The blob (if not NULL) is an array of &struct drm_color_lut.
|
||||
*/
|
||||
struct drm_property_blob *degamma_lut;
|
||||
};
|
||||
|
||||
struct dm_crtc_state {
|
||||
@@ -817,6 +827,7 @@ void amdgpu_dm_trigger_timing_sync(struct drm_device *dev);
|
||||
#define MAX_COLOR_LEGACY_LUT_ENTRIES 256
|
||||
|
||||
void amdgpu_dm_init_color_mod(void);
|
||||
int amdgpu_dm_create_color_properties(struct amdgpu_device *adev);
|
||||
int amdgpu_dm_verify_lut_sizes(const struct drm_crtc_state *crtc_state);
|
||||
int amdgpu_dm_update_crtc_color_mgmt(struct dm_crtc_state *crtc);
|
||||
int amdgpu_dm_update_plane_color_mgmt(struct dm_crtc_state *crtc,
|
||||
|
||||
@@ -84,6 +84,31 @@ void amdgpu_dm_init_color_mod(void)
|
||||
setup_x_points_distribution();
|
||||
}
|
||||
|
||||
#ifdef AMD_PRIVATE_COLOR
|
||||
int
|
||||
amdgpu_dm_create_color_properties(struct amdgpu_device *adev)
|
||||
{
|
||||
struct drm_property *prop;
|
||||
|
||||
prop = drm_property_create(adev_to_drm(adev),
|
||||
DRM_MODE_PROP_BLOB,
|
||||
"AMD_PLANE_DEGAMMA_LUT", 0);
|
||||
if (!prop)
|
||||
return -ENOMEM;
|
||||
adev->mode_info.plane_degamma_lut_property = prop;
|
||||
|
||||
prop = drm_property_create_range(adev_to_drm(adev),
|
||||
DRM_MODE_PROP_IMMUTABLE,
|
||||
"AMD_PLANE_DEGAMMA_LUT_SIZE",
|
||||
0, UINT_MAX);
|
||||
if (!prop)
|
||||
return -ENOMEM;
|
||||
adev->mode_info.plane_degamma_lut_size_property = prop;
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* __extract_blob_lut - Extracts the DRM lut and lut size from a blob.
|
||||
* @blob: DRM color mgmt property blob
|
||||
|
||||
@@ -1357,6 +1357,10 @@ static struct drm_plane_state *amdgpu_dm_plane_drm_plane_duplicate_state(struct
|
||||
dc_plane_state_retain(dm_plane_state->dc_state);
|
||||
}
|
||||
|
||||
if (old_dm_plane_state->degamma_lut)
|
||||
dm_plane_state->degamma_lut =
|
||||
drm_property_blob_get(old_dm_plane_state->degamma_lut);
|
||||
|
||||
return &dm_plane_state->base;
|
||||
}
|
||||
|
||||
@@ -1424,12 +1428,86 @@ static void amdgpu_dm_plane_drm_plane_destroy_state(struct drm_plane *plane,
|
||||
{
|
||||
struct dm_plane_state *dm_plane_state = to_dm_plane_state(state);
|
||||
|
||||
if (dm_plane_state->degamma_lut)
|
||||
drm_property_blob_put(dm_plane_state->degamma_lut);
|
||||
|
||||
if (dm_plane_state->dc_state)
|
||||
dc_plane_state_release(dm_plane_state->dc_state);
|
||||
|
||||
drm_atomic_helper_plane_destroy_state(plane, state);
|
||||
}
|
||||
|
||||
#ifdef AMD_PRIVATE_COLOR
|
||||
static void
|
||||
dm_atomic_plane_attach_color_mgmt_properties(struct amdgpu_display_manager *dm,
|
||||
struct drm_plane *plane)
|
||||
{
|
||||
struct amdgpu_mode_info mode_info = dm->adev->mode_info;
|
||||
struct dpp_color_caps dpp_color_caps = dm->dc->caps.color.dpp;
|
||||
|
||||
/* Check HW color pipeline capabilities on DPP block (pre-blending)
|
||||
* before exposing related properties.
|
||||
*/
|
||||
if (dpp_color_caps.dgam_ram || dpp_color_caps.gamma_corr) {
|
||||
drm_object_attach_property(&plane->base,
|
||||
mode_info.plane_degamma_lut_property,
|
||||
0);
|
||||
drm_object_attach_property(&plane->base,
|
||||
mode_info.plane_degamma_lut_size_property,
|
||||
MAX_COLOR_LUT_ENTRIES);
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
dm_atomic_plane_set_property(struct drm_plane *plane,
|
||||
struct drm_plane_state *state,
|
||||
struct drm_property *property,
|
||||
uint64_t val)
|
||||
{
|
||||
struct dm_plane_state *dm_plane_state = to_dm_plane_state(state);
|
||||
struct amdgpu_device *adev = drm_to_adev(plane->dev);
|
||||
bool replaced = false;
|
||||
int ret;
|
||||
|
||||
if (property == adev->mode_info.plane_degamma_lut_property) {
|
||||
ret = drm_property_replace_blob_from_id(plane->dev,
|
||||
&dm_plane_state->degamma_lut,
|
||||
val, -1,
|
||||
sizeof(struct drm_color_lut),
|
||||
&replaced);
|
||||
dm_plane_state->base.color_mgmt_changed |= replaced;
|
||||
return ret;
|
||||
} else {
|
||||
drm_dbg_atomic(plane->dev,
|
||||
"[PLANE:%d:%s] unknown property [PROP:%d:%s]]\n",
|
||||
plane->base.id, plane->name,
|
||||
property->base.id, property->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
dm_atomic_plane_get_property(struct drm_plane *plane,
|
||||
const struct drm_plane_state *state,
|
||||
struct drm_property *property,
|
||||
uint64_t *val)
|
||||
{
|
||||
struct dm_plane_state *dm_plane_state = to_dm_plane_state(state);
|
||||
struct amdgpu_device *adev = drm_to_adev(plane->dev);
|
||||
|
||||
if (property == adev->mode_info.plane_degamma_lut_property) {
|
||||
*val = (dm_plane_state->degamma_lut) ?
|
||||
dm_plane_state->degamma_lut->base.id : 0;
|
||||
} else {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static const struct drm_plane_funcs dm_plane_funcs = {
|
||||
.update_plane = drm_atomic_helper_update_plane,
|
||||
.disable_plane = drm_atomic_helper_disable_plane,
|
||||
@@ -1438,6 +1516,10 @@ static const struct drm_plane_funcs dm_plane_funcs = {
|
||||
.atomic_duplicate_state = amdgpu_dm_plane_drm_plane_duplicate_state,
|
||||
.atomic_destroy_state = amdgpu_dm_plane_drm_plane_destroy_state,
|
||||
.format_mod_supported = amdgpu_dm_plane_format_mod_supported,
|
||||
#ifdef AMD_PRIVATE_COLOR
|
||||
.atomic_set_property = dm_atomic_plane_set_property,
|
||||
.atomic_get_property = dm_atomic_plane_get_property,
|
||||
#endif
|
||||
};
|
||||
|
||||
int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
|
||||
@@ -1517,6 +1599,9 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
|
||||
|
||||
drm_plane_helper_add(plane, &dm_plane_helper_funcs);
|
||||
|
||||
#ifdef AMD_PRIVATE_COLOR
|
||||
dm_atomic_plane_attach_color_mgmt_properties(dm, plane);
|
||||
#endif
|
||||
/* Create (reset) the plane state */
|
||||
if (plane->funcs->reset)
|
||||
plane->funcs->reset(plane);
|
||||
|
||||
Reference in New Issue
Block a user