From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Lankhorst, Maarten" Subject: Re: [Intel-gfx] [RFC v4 3/8] drm: Add Plane CTM property Date: Wed, 22 Aug 2018 12:51:47 +0000 Message-ID: <1534942305.7782.3.camel@intel.com> References: <1534515531-20599-1-git-send-email-uma.shankar@intel.com> <1534515531-20599-4-git-send-email-uma.shankar@intel.com> <1534927216.5152.6.camel@intel.com> <20180822095358.GX5565@intel.com> <20180822111141.GA29527@e107564-lin.cambridge.arm.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2036755707==" Return-path: In-Reply-To: <20180822111141.GA29527@e107564-lin.cambridge.arm.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: "ville.syrjala@linux.intel.com" , "brian.starkey@arm.com" Cc: "dcastagna@chromium.org" , "intel-gfx@lists.freedesktop.org" , "dri-devel@lists.freedesktop.org" , "Shankar, Uma" , "seanpaul@chromium.org" , "Syrjala, Ville" List-Id: intel-gfx@lists.freedesktop.org --===============2036755707== Content-Language: en-US Content-Type: multipart/signed; micalg=sha-1; protocol="application/x-pkcs7-signature"; boundary="=-deUg+hZHISqw4kqCrwP8" --=-deUg+hZHISqw4kqCrwP8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable ons 2018-08-22 klockan 12:11 +0100 skrev Brian Starkey: > Hi, >=20 > On Wed, Aug 22, 2018 at 12:53:58PM +0300, Ville Syrj=C3=A4l=C3=A4 wrote: > > On Wed, Aug 22, 2018 at 08:40:19AM +0000, Lankhorst, Maarten wrote: > > > fre 2018-08-17 klockan 19:48 +0530 skrev Uma Shankar: > > > > Add a blob property for plane CSC usage. > > > >=20 > > > > v2: Rebase > > > >=20 > > > > v3: Fixed Sean, Paul's review comments. Moved the property from > > > > mode_config to drm_plane. Created a helper function to > > > > instantiate > > > > these properties and removed from > > > > drm_mode_create_standard_properties > > > > Added property documentation as suggested by Daniel, Vetter. > > > >=20 > > > > v4: Rebase > > > >=20 > > > > Signed-off-by: Uma Shankar > > > > --- > > > > Documentation/gpu/drm-kms.rst | 3 +++ > > > > drivers/gpu/drm/drm_atomic.c | 10 ++++++++++ > > > > drivers/gpu/drm/drm_atomic_helper.c | 4 ++++ > > > > drivers/gpu/drm/drm_plane.c | 12 ++++++++++++ > > > > include/drm/drm_plane.h | 15 +++++++++++++++ > > > > 5 files changed, 44 insertions(+) > > > >=20 > > > > diff --git a/Documentation/gpu/drm-kms.rst > > > > b/Documentation/gpu/drm- > > > > kms.rst > > > > index 8b10b12..16d6d8d 100644 > > > > --- a/Documentation/gpu/drm-kms.rst > > > > +++ b/Documentation/gpu/drm-kms.rst > > > > @@ -560,6 +560,9 @@ Plane Color Management Properties > > > > .. kernel-doc:: drivers/gpu/drm/drm_plane.c > > > > :doc: degamma_lut_size_property > > > >=20 > > > > +.. kernel-doc:: drivers/gpu/drm/drm_plane.c > > > > + :doc: ctm_property > > > > + > > > > Tile Group Property > > > > ------------------- > > > >=20 > > > > diff --git a/drivers/gpu/drm/drm_atomic.c > > > > b/drivers/gpu/drm/drm_atomic.c > > > > index f8cad9b..ddda935 100644 > > > > --- a/drivers/gpu/drm/drm_atomic.c > > > > +++ b/drivers/gpu/drm/drm_atomic.c > > > > @@ -917,6 +917,14 @@ static int > > > > drm_atomic_plane_set_property(struct > > > > drm_plane *plane, > > > > &replaced); > > > > state->color_mgmt_changed |=3D replaced; > > > > return ret; > > > > + } else if (property =3D=3D plane->ctm_property) { > > > > + ret =3D > > > > drm_atomic_replace_property_blob_from_id(dev, > > > > + &state->ctm, > > > > + val, > > > > + sizeof(struct > > > > drm_color_ctm), -1, > > > > + &replaced); > > > > + state->color_mgmt_changed |=3D replaced; > > > > + return ret; > > > > } else if (plane->funcs->atomic_set_property) { > > > > return plane->funcs- > > > > >atomic_set_property(plane, > > > > state, > > > > property, val); > > > > @@ -988,6 +996,8 @@ static int > > > > drm_atomic_plane_set_property(struct > > > > drm_plane *plane, > > > > } else if (property =3D=3D plane->degamma_lut_property) { > > > > *val =3D (state->degamma_lut) ? > > > > state->degamma_lut->base.id : 0; > > > > + } else if (property =3D=3D plane->ctm_property) { > > > > + *val =3D (state->ctm) ? state->ctm->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 67c5b51..866181f 100644 > > > > --- a/drivers/gpu/drm/drm_atomic_helper.c > > > > +++ b/drivers/gpu/drm/drm_atomic_helper.c > > > > @@ -3616,6 +3616,9 @@ void > > > > __drm_atomic_helper_plane_duplicate_state(struct drm_plane > > > > *plane, > > > >=20 > > > > if (state->degamma_lut) > > > > drm_property_blob_get(state->degamma_lut); > > > > + if (state->ctm) > > > > + drm_property_blob_get(state->ctm); > > > > + > > > > state->color_mgmt_changed =3D false; > > > > } > > > > EXPORT_SYMBOL(__drm_atomic_helper_plane_duplicate_state); > > > > @@ -3663,6 +3666,7 @@ void > > > > __drm_atomic_helper_plane_destroy_state(struct drm_plane_state > > > > *state) > > > > drm_crtc_commit_put(state->commit); > > > >=20 > > > > drm_property_blob_put(state->degamma_lut); > > > > + drm_property_blob_put(state->ctm); > > > > } > > > > EXPORT_SYMBOL(__drm_atomic_helper_plane_destroy_state); > > > >=20 > > > > diff --git a/drivers/gpu/drm/drm_plane.c > > > > b/drivers/gpu/drm/drm_plane.c > > > > index 03e0560..97520b1 100644 > > > > --- a/drivers/gpu/drm/drm_plane.c > > > > +++ b/drivers/gpu/drm/drm_plane.c > > > > @@ -489,6 +489,11 @@ int drm_mode_plane_set_obj_prop(struct > > > > drm_plane > > > > *plane, > > > > * > > > > * degamma_lut_size_property: > > > > * Range Property to indicate size of the plane degamma > > > > LUT. > > > > + * > > > > + * ctm_property: > > > > + * Blob property which allows a userspace to provide > > > > CTM > > > > coefficients > > > > + * to do color space conversion or any other > > > > enhancement by > > > > doing a > > > > + * matrix multiplication using the h/w CTM processing > > > > engine > > > > */ > > > > int drm_plane_color_create_prop(struct drm_device *dev, > > > > struct drm_plane *plane) > > > > @@ -509,6 +514,13 @@ int drm_plane_color_create_prop(struct > > > > drm_device *dev, > > > > return -ENOMEM; > > > > plane->degamma_lut_size_property =3D prop; > > > >=20 > > > > + prop =3D drm_property_create(dev, > > > > + DRM_MODE_PROP_BLOB, > > > > + "PLANE_CTM", 0); > > > > + if (!prop) > > > > + return -ENOMEM; > > > > + plane->ctm_property =3D prop; > > > > + > > > > return 0; > > > > } > > > > EXPORT_SYMBOL(drm_plane_color_create_prop); > > > > diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h > > > > index 28357ac..5143277 100644 > > > > --- a/include/drm/drm_plane.h > > > > +++ b/include/drm/drm_plane.h > > > > @@ -183,6 +183,14 @@ struct drm_plane_state { > > > > struct drm_property_blob *degamma_lut; > > > >=20 > > > > /** > > > > + * @ctm: > > > > + * > > > > + * Color transformation matrix. See > > > > drm_plane_enable_color_mgmt(). The > > > > + * blob (if not NULL) is a &struct drm_color_ctm. > > > > + */ > > > > + struct drm_property_blob *ctm; > > > > + > > > > + /** > > > > * @commit: Tracks the pending commit to prevent use- > > > > after- > > > > free conditions, > > > > * and for async plane updates. > > > > * > > > > @@ -698,6 +706,13 @@ struct drm_plane { > > > > * size of the degamma LUT as supported by the driver > > > > (read- > > > > only). > > > > */ > > > > struct drm_property *degamma_lut_size_property; > > > > + > > > > + /** > > > > + * @plane_ctm_property: Optional Plane property to set > > > > the > > > > + * matrix used to convert colors after the lookup in > > > > the > > > > + * degamma LUT. > > > > + */ > > > > + struct drm_property *ctm_property; > > > >=20 > > >=20 > > > I'm assuming degamma is done before converting with CTM. > > >=20 > > > But how does this interact with YUV formats? I'm not sure this is > > > explicitly defined. I'm assuming R->Cr G -> Y, B =3D Cb for degamma > > > tables. > >=20 > > The pipeline is (or at least should be IMO): > > ycbcr->rgb -> degamma -> ctm -> gamma > >=20 >=20 > That's what I'm expecting too. >=20 > > We should document the full pipeline (including the crtc portions) > > in > > some docs. >=20 > I fully agree with Ville here, we've been around this loop a few > times, so the full pipeline and expectations need to be captured > in docs (IMO before the properties can be decided). >=20 > It's slightly unfortunate that the merged ycbcr->rgb properties only > describe the format of the incoming buffer, without any specification > of what the driver is meant to do with that information (what > conversion is meant to be performed?). Without that, this new CTM > property is somewhat useless, because generic userspace can't tell > what the input data to the matrix is in YUV cases - so we need to > decide and document that too (or change/enhance the API). As long as it's documented I'm fine with it. :-) Also curious on how it interacts with CRTC pipeline. ~Maarten --=-deUg+hZHISqw4kqCrwP8 Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Disposition: attachment; filename="smime.p7s" Content-Transfer-Encoding: base64 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 F2TV2+XSKn8UG1zPdFC7JTlLhsVFYM3NY6pi0lWk7rwsMgtYBGgv6zh8iLunLP0xuM+MQonT9KEo 9kkCAwEAAaOCAjkwggI1MB0GA1UdDgQWBBQzvZm2BWwDAD408y8HzIxxsewayTAfBgNVHSMEGDAW gBQeaSq03Cj+RxhOIQs/vKwRL/CY9TBlBgNVHR8EXjBcMFqgWKBWhlRodHRwOi8vd3d3LmludGVs LmNvbS9yZXBvc2l0b3J5L0NSTC9JbnRlbCUyMEV4dGVybmFsJTIwQmFzaWMlMjBJc3N1aW5nJTIw Q0ElMjA0QS5jcmwwgZ8GCCsGAQUFBwEBBIGSMIGPMGkGCCsGAQUFBzAChl1odHRwOi8vd3d3Lmlu dGVsLmNvbS9yZXBvc2l0b3J5L2NlcnRpZmljYXRlcy9JbnRlbCUyMEV4dGVybmFsJTIwQmFzaWMl MjBJc3N1aW5nJTIwQ0ElMjA0QS5jcnQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLmludGVsLmNv bS8wCwYDVR0PBAQDAgeAMDwGCSsGAQQBgjcVBwQvMC0GJSsGAQQBgjcVCIbDjHWEmeVRg/2BKIWO n1OCkcAJZ4HevTmV8EMCAWQCAQkwHwYDVR0lBBgwFgYIKwYBBQUHAwQGCisGAQQBgjcKAwwwKQYJ KwYBBAGCNxUKBBwwGjAKBggrBgEFBQcDBDAMBgorBgEEAYI3CgMMMFMGA1UdEQRMMEqgKwYKKwYB BAGCNxQCA6AdDBttYWFydGVuLmxhbmtob3JzdEBpbnRlbC5jb22BG21hYXJ0ZW4ubGFua2hvcnN0 QGludGVsLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAJfZIpZQN1A6IaAcFZHe1oPyJW27+Jjg//4v4 E0ElHzO9OgQqqmZjngWwurgHmFpViwKkNeSN1xYHFt4+apmLzI6x7F3s3abJr5BpBv1vHqhL6cuS dFtsU8D24AhYoaWaYe3EhoDO8dG3VmO/vMarERoHokvqmSLVzZ+jeSRM/re/y+qkOfZNF62PRpvJ iAO71ed8USzrGowddFOshoXRnjvTPRIBzBHEVqJ/Ju0C5Vb2AwvRlXxzlcRw8BnwjFOJOig6x65o c18EGXYWYydy+h95Lq0DcqnLEvdRWFCLsKhG0lXa32Lb9CrcfDrXF/xnOb9dNXpJDGEhCPKvKDNm NjGCAhcwggITAgEBMIGQMHkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2Fu dGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSswKQYDVQQDEyJJbnRlbCBFeHRl cm5hbCBCYXNpYyBJc3N1aW5nIENBIDRBAhMzAACsv9xtWzvNSJlXAAAAAKy/MAkGBSsOAwIaBQCg XTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xODA4MjIxMjUxNDVa MCMGCSqGSIb3DQEJBDEWBBTLawQsWaVqwwyEYzNdgUYB04z4CjANBgkqhkiG9w0BAQEFAASCAQCK 6ne8m26qHrmy4zHOgOSLUuKy/elI3n0Ek0Jxws7ymg0imdLFxPFFiRdZpuGX7M37KNNenXRST6Rs X5V341fQv4x8KdM3tn9WFkcxm61L0HsE1RGMAsJQ9fIBdH8buhY0NaDl6H6zi3Waq4mYxQdb3p0P LAY86oJrMuvDR9UMPUqJ3ybnOyy1moJgUfex+I8VEQtXOoMm3qkA4gIm7Afi5Jz12vvBfETN2ywr CxSq2eYZ9phijq1ZNxQkf+IuuhdUt+OYDeO2CF3LnTGoN+dg8vjn1Ejkp0/DR6/bhshxm4OYtKRa TbTnxJ4IMyG4DT1oG5k6U79ZUITKNZpS9RzaAAAAAAAA --=-deUg+hZHISqw4kqCrwP8-- --===============2036755707== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============2036755707==--