From patchwork Thu May 4 07:14:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jyri Sarha X-Patchwork-Id: 9710843 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5124A60235 for ; Thu, 4 May 2017 07:14:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4394328601 for ; Thu, 4 May 2017 07:14:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3852A28673; Thu, 4 May 2017 07:14:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8A9E928601 for ; Thu, 4 May 2017 07:14:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B48566E407; Thu, 4 May 2017 07:14:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fllnx210.ext.ti.com (fllnx210.ext.ti.com [198.47.19.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8566A6E407 for ; Thu, 4 May 2017 07:14:47 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id v447EcVl004201; Thu, 4 May 2017 02:14:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1493882078; bh=56rZ2CZ3gF3do3mUlOV1eeRMtNn0MXA5KNIoDOgPf4M=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=qDtl6mTp6ER/GD2H92790FWtY8txDvVBlM9pwHcHLoe6S17pavJ82hvZGnSjvktvO Y9sQPauyVSIY7+O1HW85I+5Ky+6SVi6k2cnUzqmmss1i/IqJjKwXLgvRjvp6Zp6Nqv VoUnL6myN0jHF/RSCd5HP84isFhEp4TFnNRS5TM4= Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v447Ecer027475; Thu, 4 May 2017 02:14:38 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.294.0; Thu, 4 May 2017 02:14:37 -0500 Received: from jadmar.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v447EUU0019975; Thu, 4 May 2017 02:14:35 -0500 From: Jyri Sarha To: Subject: [PATCH RFC v2 2/2] drm: Add YCBCR_DECODE_CSC and YCBCR_CSC_PREOFFSET properties to drm_plane Date: Thu, 4 May 2017 10:14:26 +0300 Message-ID: <24ec5f778bf658c11561d36b416523ac2b978f7c.1493881618.git.jsarha@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: MIME-Version: 1.0 Cc: Liviu.Dudau@arm.com, Jyri Sarha , tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add standard optinal property blobs for YCbCr to RGB conversion CSC matrix and YCbCr preoffset vector in DRM planes. New enums are defined to YCBCR_ENCODING property to activate the CSC and preoffset properties. For simplicity the new properties are stored in the drm_plane object, because the YCBCR_ENCODING is already there. The blob contents are defined in the uapi/drm/drm_mode.h header. Signed-off-by: Jyri Sarha --- drivers/gpu/drm/drm_atomic.c | 19 +++++++++++++ drivers/gpu/drm/drm_atomic_helper.c | 9 ++++++ drivers/gpu/drm/drm_color_mgmt.c | 55 +++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/drm_plane.c | 6 ++++ include/drm/drm_color_mgmt.h | 3 ++ include/drm/drm_plane.h | 4 +++ include/uapi/drm/drm_mode.h | 12 ++++++++ 7 files changed, 106 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index bcef93d..87a2d55 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -733,6 +733,7 @@ int drm_atomic_plane_set_property(struct drm_plane *plane, struct drm_device *dev = plane->dev; struct drm_mode_config *config = &dev->mode_config; int ret; + bool dummy; if (property == config->prop_fb_id) { struct drm_framebuffer *fb = drm_framebuffer_lookup(dev, val); @@ -777,6 +778,18 @@ int drm_atomic_plane_set_property(struct drm_plane *plane, state->zpos = val; } else if (property == plane->ycbcr_encoding_property) { state->ycbcr_encoding = val; + } else if (property == plane->ycbcr_decode_csc_property) { + ret = drm_atomic_replace_property_blob_from_id(dev, + &state->ycbcr_decode_csc, val, + sizeof(struct drm_ycbcr_decode_csc), + &dummy); + return ret; + } else if (property == plane->ycbcr_csc_preoffset_property) { + ret = drm_atomic_replace_property_blob_from_id(dev, + &state->ycbcr_csc_preoffset, val, + sizeof(struct drm_ycbcr_csc_preoffset), + &dummy); + return ret; } else if (plane->funcs->atomic_set_property) { return plane->funcs->atomic_set_property(plane, state, property, val); @@ -839,6 +852,12 @@ int drm_atomic_plane_set_property(struct drm_plane *plane, *val = state->zpos; } else if (property == plane->ycbcr_encoding_property) { *val = state->ycbcr_encoding; + } else if (property == plane->ycbcr_decode_csc_property) { + *val = state->ycbcr_decode_csc ? + state->ycbcr_decode_csc->base.id : 0; + } else if (property == plane->ycbcr_csc_preoffset_property) { + *val = state->ycbcr_csc_preoffset ? + state->ycbcr_csc_preoffset->base.id : 0; } else if (plane->funcs->atomic_get_property) { return plane->funcs->atomic_get_property(plane, state, property, val); } else { diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 8be9719..6ecc32f 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3238,6 +3238,12 @@ void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane, { memcpy(state, plane->state, sizeof(*state)); + if (state->ycbcr_decode_csc) + drm_property_blob_get(state->ycbcr_decode_csc); + + if (state->ycbcr_csc_preoffset) + drm_property_blob_get(state->ycbcr_csc_preoffset); + if (state->fb) drm_framebuffer_get(state->fb); @@ -3278,6 +3284,9 @@ struct drm_plane_state * */ void __drm_atomic_helper_plane_destroy_state(struct drm_plane_state *state) { + drm_property_blob_put(state->ycbcr_decode_csc); + drm_property_blob_put(state->ycbcr_csc_preoffset); + if (state->fb) drm_framebuffer_put(state->fb); diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c index 245b14a..319ed46 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -95,8 +95,23 @@ * * "YCBCR_ENCODING" * Optional plane enum property to control YCbCr to RGB - * conversion. The driver provides a subset of standard - * enum values supported by the DRM plane. + * conversion. The driver provides a subset of standard enum + * values supported by the DRM plane. The possible encodings + * include the standard conversions and a possibility to select a + * custom conversion matrix and preoffset vector. + * + * "YCBCR_DECODE_CSC" + * Optional plane property blob to set YCbCr to RGB conversion + * matrix. The blob contains struct drm_ycbcr_to_rgb_csc which is + * defined in uapi/drm/drm_mode.h. Whether this property is + * used depends on the value of YCBCR_ENCODING property. + * + * "YCBCR_CSC_PREOFFSET" + * Optional plane property blob to configure YCbCr offset before + * YCbCr to RGB CSC is applied. The blob contains struct + * drm_ycbcr_csc_preoffset which is defined in + * uapi/drm/drm_mode.h. Whether this property is used depends on + * the value of YCBCR_ENCODING property. */ /** @@ -351,6 +366,9 @@ int drm_mode_gamma_get_ioctl(struct drm_device *dev, [DRM_PLANE_YCBCR_BT601_LIMITED_RANGE] = "BT.601 limited range", [DRM_PLANE_YCBCR_BT709_LIMITED_RANGE] = "BT.709 limited range", [DRM_PLANE_YCBCR_BT2020_LIMITED_RANGE] = "BT.2020 limited range", + [DRM_PLANE_YCBCR_CSC_FULL_RANGE] = "YCbCr CSC full range", + [DRM_PLANE_YCBCR_CSC_LIMITED_RANGE] = "YCbCr CSC limited range", + [DRM_PLANE_YCBCR_CSC_PREOFFSET] = "YCbCr CSC and preoffset vector", }; /** @@ -363,6 +381,8 @@ int drm_mode_gamma_get_ioctl(struct drm_device *dev, * drm_plane object. The supported encodings should be provided in the * enum_list parameter. The enum_list parameter should not contain the * enum names, because the standard names are added by this function. + * YCBCR_DECODE_CSC and YCBCR_CSC_PREOFFSET properties are created + * based on the provided enum_list. */ int drm_plane_create_ycbcr_properties(struct drm_plane *plane, struct drm_prop_enum_list *enum_list, @@ -371,6 +391,8 @@ int drm_plane_create_ycbcr_properties(struct drm_plane *plane, { struct drm_device *dev = plane->dev; struct drm_property *prop; + bool ycbcr_decode_csc_create = false; + bool ycbcr_csc_preoffset_create = false; unsigned int i; if (WARN_ON(plane->ycbcr_encoding_property != NULL)) @@ -380,6 +402,15 @@ int drm_plane_create_ycbcr_properties(struct drm_plane *plane, enum drm_plane_ycbcr_encoding encoding = enum_list[i].type; enum_list[i].name = ycbcr_encoding_name[encoding]; + + if (encoding == DRM_PLANE_YCBCR_CSC_FULL_RANGE || + encoding == DRM_PLANE_YCBCR_CSC_LIMITED_RANGE) + ycbcr_decode_csc_create = true; + + if (encoding == DRM_PLANE_YCBCR_CSC_PREOFFSET) { + ycbcr_decode_csc_create = true; + ycbcr_csc_preoffset_create = true; + } } prop = drm_property_create_enum(dev, DRM_MODE_PROP_ATOMIC, @@ -390,5 +421,25 @@ int drm_plane_create_ycbcr_properties(struct drm_plane *plane, plane->ycbcr_encoding_property = prop; drm_object_attach_property(&plane->base, prop, default_mode); + if (ycbcr_decode_csc_create) { + prop = drm_property_create(dev, DRM_MODE_PROP_ATOMIC | + DRM_MODE_PROP_BLOB, + "YCBCR_DECODE_CSC", 0); + if (!prop) + return -ENOMEM; + plane->ycbcr_decode_csc_property = prop; + drm_object_attach_property(&plane->base, prop, 0); + } + + if (ycbcr_csc_preoffset_create) { + prop = drm_property_create(dev, DRM_MODE_PROP_ATOMIC | + DRM_MODE_PROP_BLOB, + "YCBCR_CSC_PREOFFSET", 0); + if (!prop) + return -ENOMEM; + plane->ycbcr_csc_preoffset_property = prop; + drm_object_attach_property(&plane->base, prop, 0); + } + return 0; } diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 007c4d7..d10c942 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -247,6 +247,12 @@ void drm_plane_cleanup(struct drm_plane *plane) if (plane->ycbcr_encoding_property) drm_property_destroy(dev, plane->ycbcr_encoding_property); + if (plane->ycbcr_decode_csc_property) + drm_property_destroy(dev, plane->ycbcr_decode_csc_property); + + if (plane->ycbcr_csc_preoffset_property) + drm_property_destroy(dev, plane->ycbcr_csc_preoffset_property); + memset(plane, 0, sizeof(*plane)); } EXPORT_SYMBOL(drm_plane_cleanup); diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h index 1771394..bdfd37e 100644 --- a/include/drm/drm_color_mgmt.h +++ b/include/drm/drm_color_mgmt.h @@ -44,6 +44,9 @@ enum drm_plane_ycbcr_encoding { DRM_PLANE_YCBCR_BT601_LIMITED_RANGE, DRM_PLANE_YCBCR_BT709_LIMITED_RANGE, DRM_PLANE_YCBCR_BT2020_LIMITED_RANGE, + DRM_PLANE_YCBCR_CSC_FULL_RANGE, + DRM_PLANE_YCBCR_CSC_LIMITED_RANGE, + DRM_PLANE_YCBCR_CSC_PREOFFSET, }; int drm_plane_create_ycbcr_properties(struct drm_plane *plane, diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index 4d0510f..63b1e0c 100644 --- a/include/drm/drm_plane.h +++ b/include/drm/drm_plane.h @@ -115,6 +115,8 @@ struct drm_plane_state { /* YCbCr to RGB conversion */ enum drm_plane_ycbcr_encoding ycbcr_encoding; + struct drm_property_blob *ycbcr_decode_csc; + struct drm_property_blob *ycbcr_csc_preoffset; /* Clipped coordinates */ struct drm_rect src, dst; @@ -529,6 +531,8 @@ struct drm_plane { struct drm_property *rotation_property; struct drm_property *ycbcr_encoding_property; + struct drm_property *ycbcr_decode_csc_property; + struct drm_property *ycbcr_csc_preoffset_property; }; #define obj_to_plane(x) container_of(x, struct drm_plane, base) diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 8c67fc0..8c9568d 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -543,6 +543,18 @@ struct drm_color_lut { __u16 reserved; }; +struct drm_ycbcr_decode_csc { + /* Conversion matrix in 2-complement s32.32 format. */ + __s64 ry, rcb, rcr; + __s64 gy, gcb, gcr; + __s64 by, bcb, bcr; +}; + +struct drm_ycbcr_csc_preoffset { + /* Offset vector in 2-complement s.32 format. */ + __s32 y, cb, cr; +}; + #define DRM_MODE_PAGE_FLIP_EVENT 0x01 #define DRM_MODE_PAGE_FLIP_ASYNC 0x02 #define DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE 0x4