[PATCH 03/22] drm: Add color correction blobs in CRTC state
Thanks for the review comments, Emil.
Regards
Shashank
On 10/10/2015 3:53 AM, Emil Velikov wrote:
> Hi Shashank,
>
> On 9 October 2015 at 20:28, Shashank Sharma
> wrote:
>> This patch adds new variables in CRTC state, to hold respective color
>> correction blobs. These blobs will be required during the atomic commit
>> for writing the color correction values in correction registers.
>>
>> Signed-off-by: Shashank Sharma
>> Signed-off-by: Kausal Malladi
>> ---
>> drivers/gpu/drm/drm_atomic_helper.c | 12
>> include/drm/drm_crtc.h | 7 ++-
>> 2 files changed, 18 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/drm_atomic_helper.c
>> b/drivers/gpu/drm/drm_atomic_helper.c
>> index 87a2a44..d73ca9b9 100644
>> --- a/drivers/gpu/drm/drm_atomic_helper.c
>> +++ b/drivers/gpu/drm/drm_atomic_helper.c
>> @@ -2193,6 +2193,12 @@ void __drm_atomic_helper_crtc_duplicate_state(struct
>> drm_crtc *crtc,
>>
>> if (state->mode_blob)
>> drm_property_reference_blob(state->mode_blob);
>> + if (state->ctm_blob)
>> + drm_property_reference_blob(state->ctm_blob);
>> + if (state->palette_after_ctm_blob)
>> + drm_property_reference_blob(state->palette_after_ctm_blob);
>> + if (state->palette_before_ctm_blob)
>> + drm_property_reference_blob(state->palette_before_ctm_blob);
>> state->mode_changed = false;
>> state->active_changed = false;
>> state->planes_changed = false;
>> @@ -2238,6 +2244,12 @@ void __drm_atomic_helper_crtc_destroy_state(struct
>> drm_crtc *crtc,
>> {
>> if (state->mode_blob)
>> drm_property_unreference_blob(state->mode_blob);
>> + if (state->ctm_blob)
>> + drm_property_unreference_blob(state->ctm_blob);
>> + if (state->palette_after_ctm_blob)
>> + drm_property_unreference_blob(state->palette_after_ctm_blob);
>> + if (state->palette_before_ctm_blob)
>> +
>> drm_property_unreference_blob(state->palette_before_ctm_blob);
>> }
>> EXPORT_SYMBOL(__drm_atomic_helper_crtc_destroy_state);
>>
>> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
>> index 6e0f177..9cd4123 100644
>> --- a/include/drm/drm_crtc.h
>> +++ b/include/drm/drm_crtc.h
>> @@ -302,6 +302,11 @@ struct drm_crtc_state {
>> /* blob property to expose current mode to atomic userspace */
>> struct drm_property_blob *mode_blob;
>>
>> + /* blob properties to hold the color properties' blobs */
>> + struct drm_property_blob *palette_before_ctm_blob;
>> + struct drm_property_blob *palette_after_ctm_blob;
>> + struct drm_property_blob *ctm_blob;
>> +
>> struct drm_pending_vblank_event *event;
>>
>> struct drm_atomic_state *state;
>> @@ -1151,7 +1156,7 @@ struct drm_mode_config {
>> struct drm_property *cm_palette_after_ctm_property;
>> struct drm_property *cm_ctm_property;
>>
>> - /* Coor management capabilities query */
>> + /* Color management capabilities query */
> This should be part of the previous patch.
>
Agree, will do it.
> Regards,
> Emil
>
[Intel-gfx] [PATCH 03/22] drm: Add color correction blobs in CRTC state
Hi Shashank, [auto build test WARNING on next-20151009 -- if it's inappropriate base, please ignore] reproduce: make htmldocs All warnings (new ones prefixed by >>): drivers/gpu/drm/i915/i915_irq.c:2582: warning: No description found for parameter 'wedged' drivers/gpu/drm/i915/i915_irq.c:2582: warning: No description found for parameter 'fmt' include/drm/drm_crtc.h:315: warning: No description found for parameter 'mode_blob' >> include/drm/drm_crtc.h:315: warning: No description found for parameter >> 'palette_before_ctm_blob' >> include/drm/drm_crtc.h:315: warning: No description found for parameter >> 'palette_after_ctm_blob' >> include/drm/drm_crtc.h:315: warning: No description found for parameter >> 'ctm_blob' include/drm/drm_crtc.h:747: warning: No description found for parameter 'tile_blob_ptr' include/drm/drm_crtc.h:786: warning: No description found for parameter 'rotation' include/drm/drm_crtc.h:882: warning: No description found for parameter 'mutex' include/drm/drm_crtc.h:882: warning: No description found for parameter 'helper_private' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tile_idr' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'delayed_event' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'edid_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'dpms_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'path_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tile_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'plane_type_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'rotation_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_src_x' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_src_y' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_src_w' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_src_h' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_crtc_x' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_crtc_y' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_crtc_w' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_crtc_h' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_fb_id' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_crtc_id' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_active' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'prop_mode_id' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'dvi_i_subconnector_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'dvi_i_select_subconnector_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_subconnector_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_select_subconnector_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_mode_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_left_margin_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_right_margin_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_top_margin_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_bottom_margin_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_brightness_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_contrast_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_flicker_reduction_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_overscan_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_saturation_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'tv_hue_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'scaling_mode_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'aspect_ratio_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'dirty_info_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'suggested_x_property' include/drm/drm_crtc.h:1176: warning: No description found for parameter 'suggested_y_property'
[PATCH 03/22] drm: Add color correction blobs in CRTC state
This patch adds new variables in CRTC state, to hold respective color
correction blobs. These blobs will be required during the atomic commit
for writing the color correction values in correction registers.
Signed-off-by: Shashank Sharma
Signed-off-by: Kausal Malladi
---
drivers/gpu/drm/drm_atomic_helper.c | 12
include/drm/drm_crtc.h | 7 ++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c
b/drivers/gpu/drm/drm_atomic_helper.c
index 87a2a44..d73ca9b9 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -2193,6 +2193,12 @@ void __drm_atomic_helper_crtc_duplicate_state(struct
drm_crtc *crtc,
if (state->mode_blob)
drm_property_reference_blob(state->mode_blob);
+ if (state->ctm_blob)
+ drm_property_reference_blob(state->ctm_blob);
+ if (state->palette_after_ctm_blob)
+ drm_property_reference_blob(state->palette_after_ctm_blob);
+ if (state->palette_before_ctm_blob)
+ drm_property_reference_blob(state->palette_before_ctm_blob);
state->mode_changed = false;
state->active_changed = false;
state->planes_changed = false;
@@ -2238,6 +2244,12 @@ void __drm_atomic_helper_crtc_destroy_state(struct
drm_crtc *crtc,
{
if (state->mode_blob)
drm_property_unreference_blob(state->mode_blob);
+ if (state->ctm_blob)
+ drm_property_unreference_blob(state->ctm_blob);
+ if (state->palette_after_ctm_blob)
+ drm_property_unreference_blob(state->palette_after_ctm_blob);
+ if (state->palette_before_ctm_blob)
+ drm_property_unreference_blob(state->palette_before_ctm_blob);
}
EXPORT_SYMBOL(__drm_atomic_helper_crtc_destroy_state);
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 6e0f177..9cd4123 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -302,6 +302,11 @@ struct drm_crtc_state {
/* blob property to expose current mode to atomic userspace */
struct drm_property_blob *mode_blob;
+ /* blob properties to hold the color properties' blobs */
+ struct drm_property_blob *palette_before_ctm_blob;
+ struct drm_property_blob *palette_after_ctm_blob;
+ struct drm_property_blob *ctm_blob;
+
struct drm_pending_vblank_event *event;
struct drm_atomic_state *state;
@@ -1151,7 +1156,7 @@ struct drm_mode_config {
struct drm_property *cm_palette_after_ctm_property;
struct drm_property *cm_ctm_property;
- /* Coor management capabilities query */
+ /* Color management capabilities query */
struct drm_property *cm_coeff_before_ctm_property;
struct drm_property *cm_coeff_after_ctm_property;
--
1.9.1
[PATCH 03/22] drm: Add color correction blobs in CRTC state
Hi Shashank,
On 9 October 2015 at 20:28, Shashank Sharma
wrote:
> This patch adds new variables in CRTC state, to hold respective color
> correction blobs. These blobs will be required during the atomic commit
> for writing the color correction values in correction registers.
>
> Signed-off-by: Shashank Sharma
> Signed-off-by: Kausal Malladi
> ---
> drivers/gpu/drm/drm_atomic_helper.c | 12
> include/drm/drm_crtc.h | 7 ++-
> 2 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c
> b/drivers/gpu/drm/drm_atomic_helper.c
> index 87a2a44..d73ca9b9 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -2193,6 +2193,12 @@ void __drm_atomic_helper_crtc_duplicate_state(struct
> drm_crtc *crtc,
>
> if (state->mode_blob)
> drm_property_reference_blob(state->mode_blob);
> + if (state->ctm_blob)
> + drm_property_reference_blob(state->ctm_blob);
> + if (state->palette_after_ctm_blob)
> + drm_property_reference_blob(state->palette_after_ctm_blob);
> + if (state->palette_before_ctm_blob)
> + drm_property_reference_blob(state->palette_before_ctm_blob);
> state->mode_changed = false;
> state->active_changed = false;
> state->planes_changed = false;
> @@ -2238,6 +2244,12 @@ void __drm_atomic_helper_crtc_destroy_state(struct
> drm_crtc *crtc,
> {
> if (state->mode_blob)
> drm_property_unreference_blob(state->mode_blob);
> + if (state->ctm_blob)
> + drm_property_unreference_blob(state->ctm_blob);
> + if (state->palette_after_ctm_blob)
> + drm_property_unreference_blob(state->palette_after_ctm_blob);
> + if (state->palette_before_ctm_blob)
> + drm_property_unreference_blob(state->palette_before_ctm_blob);
> }
> EXPORT_SYMBOL(__drm_atomic_helper_crtc_destroy_state);
>
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index 6e0f177..9cd4123 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -302,6 +302,11 @@ struct drm_crtc_state {
> /* blob property to expose current mode to atomic userspace */
> struct drm_property_blob *mode_blob;
>
> + /* blob properties to hold the color properties' blobs */
> + struct drm_property_blob *palette_before_ctm_blob;
> + struct drm_property_blob *palette_after_ctm_blob;
> + struct drm_property_blob *ctm_blob;
> +
> struct drm_pending_vblank_event *event;
>
> struct drm_atomic_state *state;
> @@ -1151,7 +1156,7 @@ struct drm_mode_config {
> struct drm_property *cm_palette_after_ctm_property;
> struct drm_property *cm_ctm_property;
>
> - /* Coor management capabilities query */
> + /* Color management capabilities query */
This should be part of the previous patch.
Regards,
Emil
