From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH v2] drm/color: Document CTM eqations Date: Tue, 31 Jan 2017 13:30:41 +0200 Message-ID: <87efzj31r2.fsf@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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id D53E26E251 for ; Tue, 31 Jan 2017 11:30:44 +0000 (UTC) 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 , dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAzMSBKYW4gMjAxNywgQnJpYW4gU3RhcmtleSA8YnJpYW4uc3RhcmtleUBhcm0uY29t PiB3cm90ZToKPiBFeHBsaWNpdGx5IHN0YXRlIHRoZSBleHBlY3RlZCBDVE0gZXF1YXRpb25zIGlu IHRoZSBrZXJuZWxkb2MgZm9yIHRoZSBDVE0KPiBwcm9wZXJ0eSwgYW5kIHRoZSBmb3JtIG9mIHRo ZSBtYXRyaXggb24gc3RydWN0IGRybV9jb2xvcl9jdG0uCj4KPiBDYzogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiBDYzogTGlvbmVsIExhbmR3ZXJsaW4g PGxpb25lbC5nLmxhbmR3ZXJsaW5AaW50ZWwuY29tPgo+IENjOiBEYW5pZWwgVmV0dGVyIDxkYW5p ZWwudmV0dGVyQGZmd2xsLmNoPgo+IFNpZ25lZC1vZmYtYnk6IEJyaWFuIFN0YXJrZXkgPGJyaWFu LnN0YXJrZXlAYXJtLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV9jb2xvcl9tZ210 LmMgfCAgIDEzICsrKysrKysrKysrKysKPiAgaW5jbHVkZS91YXBpL2RybS9kcm1fbW9kZS5oICAg ICAgfCAgICA4ICsrKysrKystCj4gIDIgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwg MSBkZWxldGlvbigtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29sb3Jf bWdtdC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9jb2xvcl9tZ210LmMKPiBpbmRleCA3ODliNGM2 NWNkNjkuLjc1NzNjYTRiNmVhNiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nv bG9yX21nbXQuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29sb3JfbWdtdC5jCj4gQEAg LTYyLDYgKzYyLDE5IEBACj4gICAqCXVuaXQvcGFzcy10aHJ1IG1hdHJpeCBzaG91bGQgYmUgdXNl ZC4gVGhpcyBpcyBnZW5lcmFsbHkgdGhlIGRyaXZlcgo+ICAgKglib290LXVwIHN0YXRlIHRvby4K PiAgICoKPiArICoJVGhlIG91dHB1dCB2ZWN0b3IgaXMgcmVsYXRlZCB0byB0aGUgaW5wdXQgdmVj dG9yIGFzIGJlbG93Ogo+ICsgKgo+ICsgKgl8IGBgb3V0WzBdID0gbWF0cml4WzBdICogaW5bMF0g KyBtYXRyaXhbMV0gKiBpblsxXSArIG1hdHJpeFsyXSAqIGluWzJdO2BgCj4gKyAqCXwgYGBvdXRb MV0gPSBtYXRyaXhbM10gKiBpblswXSArIG1hdHJpeFs0XSAqIGluWzFdICsgbWF0cml4WzVdICog aW5bMl07YGAKPiArICoJfCBgYG91dFsyXSA9IG1hdHJpeFs2XSAqIGluWzBdICsgbWF0cml4Wzdd ICogaW5bMV0gKyBtYXRyaXhbOF0gKiBpblsyXTtgYAoKV291bGQgdGhhdCBub3Qgd29yayBiZXR0 ZXIgd2l0aCBhIHByZWZvcm1hdHRlZCBibG9jaz8gUmVwbGFjZSB0aGUgY29sb24KaW4gdGhlIHBy ZWNlZGluZyBwYXJhZ3JhcGggd2l0aCB0aGUgZG91YmxlIGNvbG9uIDo6LCBhbmQgaW5kZW50IHRo ZQpibG9jay4KCj4gKyAqCj4gKyAqCVRoZSBjb21wb25lbnQgb3JkZXIgaW4gdGhlIGlucHV0L291 dHB1dCB2ZWN0b3JzIGlzIGFzc3VtZWQgdG8gYmUKPiArICoJeyBSLCBHLCBCIH0uCj4gKyAqCj4g KyAqCVRoZSBjb2xvci1zcGFjZSBvZiB0aGUgaW5wdXQgdmVjdG9yIG11c3Qgbm90IGJlIGNvbmZ1 c2VkIHdpdGggdGhlCj4gKyAqCWNvbG9yLXNwYWNlIGltcGxpZWQgYnkgYSBmcmFtZWJ1ZmZlciBw aXhlbCBmb3JtYXQsIHdoaWNoIG1heSBiZSB0aGUgc2FtZQo+ICsgKglvciBkaWZmZXJlbnQuCj4g KyAqCj4gICAqIOKAnEdBTU1BX0xVVOKAnToKPiAgICoJQmxvYiBwcm9wZXJ0eSB0byBzZXQgdGhl IGdhbW1hIGxvb2t1cCB0YWJsZSAoTFVUKSBtYXBwaW5nIHBpeGVsIGRhdGEKPiAgICoJYWZ0ZXIg dGhlIHRyYW5zZm9ybWF0aW9uIG1hdHJpeCB0byBkYXRhIHNlbnQgdG8gdGhlIGNvbm5lY3Rvci4g VGhlCj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9kcm0vZHJtX21vZGUuaCBiL2luY2x1ZGUv dWFwaS9kcm0vZHJtX21vZGUuaAo+IGluZGV4IGNlN2VmZTJlOGE1ZS4uMzQwMTYzN2NhZjhlIDEw MDY0NAo+IC0tLSBhL2luY2x1ZGUvdWFwaS9kcm0vZHJtX21vZGUuaAo+ICsrKyBiL2luY2x1ZGUv dWFwaS9kcm0vZHJtX21vZGUuaAo+IEBAIC01MjUsNyArNTI1LDEzIEBAIHN0cnVjdCBkcm1fbW9k ZV9jcnRjX2x1dCB7Cj4gIH07Cj4gIAo+ICBzdHJ1Y3QgZHJtX2NvbG9yX2N0bSB7Cj4gLQkvKiBD b252ZXJzaW9uIG1hdHJpeCBpbiBTMzEuMzIgZm9ybWF0LiAqLwo+ICsJLyoKPiArCSAqIENvbnZl cnNpb24gbWF0cml4IGluIFMzMS4zMiBmb3JtYXQsIGluIHJvdy1tYWpvciBmb3JtOgo+ICsJICoK PiArCSAqIHwgbWF0cml4WzBdIG1hdHJpeFsxXSBtYXRyaXhbMl0gfAo+ICsJICogfCBtYXRyaXhb M10gbWF0cml4WzRdIG1hdHJpeFs1XSB8Cj4gKwkgKiB8IG1hdHJpeFs2XSBtYXRyaXhbN10gbWF0 cml4WzhdIHwKPiArCSAqLwoKU2FtZSBoZXJlLgoKPiAgCV9fczY0IG1hdHJpeFs5XTsKPiAgfTsK Ci0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751908AbdAaLeU convert rfc822-to-8bit (ORCPT ); Tue, 31 Jan 2017 06:34:20 -0500 Received: from mga14.intel.com ([192.55.52.115]:49650 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751723AbdAaLeI (ORCPT ); Tue, 31 Jan 2017 06:34:08 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,314,1477983600"; d="scan'208";a="815385525" From: Jani Nikula To: Brian Starkey , dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Sean Paul , Ville =?utf-8?B?U3lyasOkbMOk?= , Lionel Landwerlin , Daniel Vetter Subject: Re: [PATCH v2] drm/color: Document CTM eqations In-Reply-To: <1485859714-26619-1-git-send-email-brian.starkey@arm.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1485859714-26619-1-git-send-email-brian.starkey@arm.com> Date: Tue, 31 Jan 2017 13:30:41 +0200 Message-ID: <87efzj31r2.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 31 Jan 2017, 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];`` Would that not work better with a preformatted block? Replace the colon in the preceding paragraph with the double colon ::, and indent the block. > + * > + * 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: > + * > + * | matrix[0] matrix[1] matrix[2] | > + * | matrix[3] matrix[4] matrix[5] | > + * | matrix[6] matrix[7] matrix[8] | > + */ Same here. > __s64 matrix[9]; > }; -- Jani Nikula, Intel Open Source Technology Center