From patchwork Tue Jan 31 17:43:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brian Starkey X-Patchwork-Id: 9547903 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 B76B560415 for ; Tue, 31 Jan 2017 17:43:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A951F26E8A for ; Tue, 31 Jan 2017 17:43:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DEEE281E1; Tue, 31 Jan 2017 17:43:58 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 2B18426E8A for ; Tue, 31 Jan 2017 17:43:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F1B86E208; Tue, 31 Jan 2017 17:43:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by gabe.freedesktop.org (Postfix) with ESMTP id 983D16E208 for ; Tue, 31 Jan 2017 17:43:55 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7BDC5AD7; Tue, 31 Jan 2017 09:43:55 -0800 (PST) Received: from e106950-lin.cambridge.arm.com (e106950-lin.cambridge.arm.com [10.2.133.193]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1764D3F24D; Tue, 31 Jan 2017 09:43:53 -0800 (PST) From: Brian Starkey To: dri-devel@lists.freedesktop.org Subject: =?UTF-8?q?=5BPATCH=20v4=5D=20drm/color=3A=20Document=20CTM=20eqations?= Date: Tue, 31 Jan 2017 17:43:48 +0000 Message-Id: <1485884628-4838-1-git-send-email-brian.starkey@arm.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Cc: Daniel Vetter , linux-kernel@vger.kernel.org, mihail.atanassov@arm.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 Explicitly state the expected CTM equations in the kerneldoc for the CTM property, and the form of the matrix on struct drm_color_ctm. Cc: Ville Syrjälä Cc: Lionel Landwerlin Cc: Daniel Vetter Signed-off-by: Brian Starkey --- drivers/gpu/drm/drm_color_mgmt.c | 13 +++++++++++++ include/uapi/drm/drm_mode.h | 14 +++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c index 789b4c65cd69..307f7b0545b6 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -62,6 +62,19 @@ * unit/pass-thru matrix should be used. This is generally the driver * boot-up state too. * + * The output vector is related to the input vector as below:: + * + * out[0] = matrix[0] * in[0] + matrix[1] * in[1] + matrix[2] * in[2]; + * out[1] = matrix[3] * in[0] + matrix[4] * in[1] + matrix[5] * in[2]; + * out[2] = matrix[6] * in[0] + matrix[7] * in[1] + matrix[8] * in[2]; + * + * The component order in the input/output vectors is assumed to be + * { R, G, B }. + * + * The color-space of the input vector must not be confused with the + * color-space implied by a framebuffer pixel format, which may be the same + * or different. + * * “GAMMA_LUT”: * Blob property to set the gamma lookup table (LUT) mapping pixel data * after the transformation matrix to data sent to the connector. The diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index ce7efe2e8a5e..3f179b8867e5 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -525,7 +525,19 @@ struct drm_mode_crtc_lut { }; struct drm_color_ctm { - /* Conversion matrix in S31.32 format. */ + /* + * Conversion matrix in row-major form: + * + * | matrix[0] matrix[1] matrix[2] | + * | matrix[3] matrix[4] matrix[5] | + * | matrix[6] matrix[7] matrix[8] | + * + * Each element is in a sign + magnitude format: S31.32, with the sign + * in bit 63, and the magnitude represented as fixed-point 31.32. + * + * i.e. +1.25 = 0x00000001.40000000 + * -1.25 = 0x80000001.40000000 + */ __s64 matrix[9]; };