From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2] drm/color: Document CTM eqations Date: Tue, 31 Jan 2017 17:18:28 +0200 Message-ID: <20170131151828.GU31595@intel.com> References: <1485859714-26619-1-git-send-email-brian.starkey@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE6026E695 for ; Tue, 31 Jan 2017 15:18:32 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1485859714-26619-1-git-send-email-brian.starkey@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Brian Starkey Cc: Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBKYW4gMzEsIDIwMTcgYXQgMTA6NDg6MzRBTSArMDAwMCwgQnJpYW4gU3RhcmtleSB3 cm90ZToKPiBFeHBsaWNpdGx5IHN0YXRlIHRoZSBleHBlY3RlZCBDVE0gZXF1YXRpb25zIGluIHRo ZSBrZXJuZWxkb2MgZm9yIHRoZSBDVE0KPiBwcm9wZXJ0eSwgYW5kIHRoZSBmb3JtIG9mIHRoZSBt YXRyaXggb24gc3RydWN0IGRybV9jb2xvcl9jdG0uCj4gCj4gQ2M6IFZpbGxlIFN5cmrDpGzDpCA8 dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gQ2M6IExpb25lbCBMYW5kd2VybGluIDxs aW9uZWwuZy5sYW5kd2VybGluQGludGVsLmNvbT4KPiBDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVs LnZldHRlckBmZndsbC5jaD4KPiBTaWduZWQtb2ZmLWJ5OiBCcmlhbiBTdGFya2V5IDxicmlhbi5z dGFya2V5QGFybS5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fY29sb3JfbWdtdC5j IHwgICAxMyArKysrKysrKysrKysrCj4gIGluY2x1ZGUvdWFwaS9kcm0vZHJtX21vZGUuaCAgICAg IHwgICAgOCArKysrKysrLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDEg ZGVsZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9jb2xvcl9t Z210LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NvbG9yX21nbXQuYwo+IGluZGV4IDc4OWI0YzY1 Y2Q2OS4uNzU3M2NhNGI2ZWE2IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29s b3JfbWdtdC5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9jb2xvcl9tZ210LmMKPiBAQCAt NjIsNiArNjIsMTkgQEAKPiAgICoJdW5pdC9wYXNzLXRocnUgbWF0cml4IHNob3VsZCBiZSB1c2Vk LiBUaGlzIGlzIGdlbmVyYWxseSB0aGUgZHJpdmVyCj4gICAqCWJvb3QtdXAgc3RhdGUgdG9vLgo+ ICAgKgo+ICsgKglUaGUgb3V0cHV0IHZlY3RvciBpcyByZWxhdGVkIHRvIHRoZSBpbnB1dCB2ZWN0 b3IgYXMgYmVsb3c6Cj4gKyAqCj4gKyAqCXwgYGBvdXRbMF0gPSBtYXRyaXhbMF0gKiBpblswXSAr IG1hdHJpeFsxXSAqIGluWzFdICsgbWF0cml4WzJdICogaW5bMl07YGAKPiArICoJfCBgYG91dFsx XSA9IG1hdHJpeFszXSAqIGluWzBdICsgbWF0cml4WzRdICogaW5bMV0gKyBtYXRyaXhbNV0gKiBp blsyXTtgYAo+ICsgKgl8IGBgb3V0WzJdID0gbWF0cml4WzZdICogaW5bMF0gKyBtYXRyaXhbN10g KiBpblsxXSArIG1hdHJpeFs4XSAqIGluWzJdO2BgCj4gKyAqCj4gKyAqCVRoZSBjb21wb25lbnQg b3JkZXIgaW4gdGhlIGlucHV0L291dHB1dCB2ZWN0b3JzIGlzIGFzc3VtZWQgdG8gYmUKPiArICoJ eyBSLCBHLCBCIH0uCj4gKyAqCj4gKyAqCVRoZSBjb2xvci1zcGFjZSBvZiB0aGUgaW5wdXQgdmVj dG9yIG11c3Qgbm90IGJlIGNvbmZ1c2VkIHdpdGggdGhlCj4gKyAqCWNvbG9yLXNwYWNlIGltcGxp ZWQgYnkgYSBmcmFtZWJ1ZmZlciBwaXhlbCBmb3JtYXQsIHdoaWNoIG1heSBiZSB0aGUgc2FtZQo+ ICsgKglvciBkaWZmZXJlbnQuCj4gKyAqCj4gICAqIOKAnEdBTU1BX0xVVOKAnToKPiAgICoJQmxv YiBwcm9wZXJ0eSB0byBzZXQgdGhlIGdhbW1hIGxvb2t1cCB0YWJsZSAoTFVUKSBtYXBwaW5nIHBp eGVsIGRhdGEKPiAgICoJYWZ0ZXIgdGhlIHRyYW5zZm9ybWF0aW9uIG1hdHJpeCB0byBkYXRhIHNl bnQgdG8gdGhlIGNvbm5lY3Rvci4gVGhlCj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9kcm0v ZHJtX21vZGUuaCBiL2luY2x1ZGUvdWFwaS9kcm0vZHJtX21vZGUuaAo+IGluZGV4IGNlN2VmZTJl OGE1ZS4uMzQwMTYzN2NhZjhlIDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvdWFwaS9kcm0vZHJtX21v ZGUuaAo+ICsrKyBiL2luY2x1ZGUvdWFwaS9kcm0vZHJtX21vZGUuaAo+IEBAIC01MjUsNyArNTI1 LDEzIEBAIHN0cnVjdCBkcm1fbW9kZV9jcnRjX2x1dCB7Cj4gIH07Cj4gIAo+ICBzdHJ1Y3QgZHJt X2NvbG9yX2N0bSB7Cj4gLQkvKiBDb252ZXJzaW9uIG1hdHJpeCBpbiBTMzEuMzIgZm9ybWF0LiAq Lwo+ICsJLyoKPiArCSAqIENvbnZlcnNpb24gbWF0cml4IGluIFMzMS4zMiBmb3JtYXQsIGluIHJv dy1tYWpvciBmb3JtOgoKczMyLjMyIGlzIGhvdyBJJ2Qgc3RhdGUgdGhhdCAodG8gbWF0Y2ggdGhl IHJlZ3VsYXIgczMyIGFuZCB3aGF0bm90CnR5cGVzKS4KCj4gKwkgKgo+ICsJICogfCBtYXRyaXhb MF0gbWF0cml4WzFdIG1hdHJpeFsyXSB8Cj4gKwkgKiB8IG1hdHJpeFszXSBtYXRyaXhbNF0gbWF0 cml4WzVdIHwKPiArCSAqIHwgbWF0cml4WzZdIG1hdHJpeFs3XSBtYXRyaXhbOF0gfAo+ICsJICov Cj4gIAlfX3M2NCBtYXRyaXhbOV07Cj4gIH07Cj4gIAo+IC0tIAo+IDEuNy45LjUKCi0tIApWaWxs ZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751145AbdAaPSo (ORCPT ); Tue, 31 Jan 2017 10:18:44 -0500 Received: from mga05.intel.com ([192.55.52.43]:51232 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750740AbdAaPSi (ORCPT ); Tue, 31 Jan 2017 10:18:38 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,315,1477983600"; d="scan'208";a="1101185407" Date: Tue, 31 Jan 2017 17:18:28 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Brian Starkey Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jani Nikula , Sean Paul , Lionel Landwerlin , Daniel Vetter Subject: Re: [PATCH v2] drm/color: Document CTM eqations Message-ID: <20170131151828.GU31595@intel.com> References: <1485859714-26619-1-git-send-email-brian.starkey@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1485859714-26619-1-git-send-email-brian.starkey@arm.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jan 31, 2017 at 10:48:34AM +0000, Brian Starkey wrote: > 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 | 8 +++++++- > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c > index 789b4c65cd69..7573ca4b6ea6 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..3401637caf8e 100644 > --- a/include/uapi/drm/drm_mode.h > +++ b/include/uapi/drm/drm_mode.h > @@ -525,7 +525,13 @@ struct drm_mode_crtc_lut { > }; > > struct drm_color_ctm { > - /* Conversion matrix in S31.32 format. */ > + /* > + * Conversion matrix in S31.32 format, in row-major form: s32.32 is how I'd state that (to match the regular s32 and whatnot types). > + * > + * | matrix[0] matrix[1] matrix[2] | > + * | matrix[3] matrix[4] matrix[5] | > + * | matrix[6] matrix[7] matrix[8] | > + */ > __s64 matrix[9]; > }; > > -- > 1.7.9.5 -- Ville Syrjälä Intel OTC