From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 1/3] drm: Trust format_mod_supported() when it OKs a plane modifier. Date: Tue, 22 May 2018 19:31:27 +0300 Message-ID: <20180522163127.GH23723@intel.com> References: <20180316220435.31416-1-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 878106E30D for ; Tue, 22 May 2018 16:31:37 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20180316220435.31416-1-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Eric Anholt Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBNYXIgMTYsIDIwMTggYXQgMDM6MDQ6MzNQTSAtMDcwMCwgRXJpYyBBbmhvbHQgd3Jv dGU6Cj4gRm9yIHBhcmFtZXRlcml6ZWQgbW9kaWZpZXJzIChCcm9hZGNvbSdzIFNBTkQgYW5kIFVJ RiksIHdlIG5lZWQgdG8KPiBhbGxvdyB0aGUgcGFyYW1ldGVyIGZpZWxkcyB0byBiZSBmaWxsZWQg aW4sIHdoaWxlIGV4cG9zaW5nIG9ubHkgdGhlCj4gdmFyaWFudCBvZiB0aGUgbW9kaWZpZXIgd2l0 aCB0aGUgcGFyYW1ldGVyIHVuZmlsbGVkIGluIHRoZSBpbnRlcm5hbAo+IGFycmF5cyBhbmQgdGhl IGZvcm1hdCBibG9iLgo+IAo+IFNpZ25lZC1vZmYtYnk6IEVyaWMgQW5ob2x0IDxlcmljQGFuaG9s dC5uZXQ+Cj4gQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j b20+CgpXaXRoIGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9zZXJpZXMvNDAyMDcv IHRoaXMgc2hvdWxkIGJlCnNhZmUgZm9yIGk5MTUsIHNvCgpSZXZpZXdlZC1ieTogVmlsbGUgU3ly asOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCj4gLS0tCj4gIGRyaXZlcnMv Z3B1L2RybS9kcm1fcGxhbmUuYyB8IDIzICsrKysrKysrKysrKy0tLS0tLS0tLS0tCj4gIGluY2x1 ZGUvZHJtL2RybV9wbGFuZS5oICAgICB8ICA1ICsrKystCj4gIDIgZmlsZXMgY2hhbmdlZCwgMTYg aW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYwo+IGluZGV4 IDQ2ZmJkMDE5YTMzNy4uNWJiNTAxZjFhYWU4IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fcGxhbmUuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYwo+IEBAIC01 NjEsMTkgKzU2MSwyMCBAQCBpbnQgZHJtX3BsYW5lX2NoZWNrX3BpeGVsX2Zvcm1hdChzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKPiAgCWlmIChpID09IHBsYW5lLT5mb3JtYXRfY291bnQpCj4gIAkJ cmV0dXJuIC1FSU5WQUw7Cj4gIAo+IC0JaWYgKCFwbGFuZS0+bW9kaWZpZXJfY291bnQpCj4gLQkJ cmV0dXJuIDA7Cj4gKwlpZiAocGxhbmUtPmZ1bmNzLT5mb3JtYXRfbW9kX3N1cHBvcnRlZCkgewo+ ICsJCWlmICghcGxhbmUtPmZ1bmNzLT5mb3JtYXRfbW9kX3N1cHBvcnRlZChwbGFuZSwgZm9ybWF0 LCBtb2RpZmllcikpCj4gKwkJCXJldHVybiAtRUlOVkFMOwo+ICsJfSBlbHNlIHsKPiArCQlpZiAo IXBsYW5lLT5tb2RpZmllcl9jb3VudCkKPiArCQkJcmV0dXJuIDA7Cj4gIAo+IC0JZm9yIChpID0g MDsgaSA8IHBsYW5lLT5tb2RpZmllcl9jb3VudDsgaSsrKSB7Cj4gLQkJaWYgKG1vZGlmaWVyID09 IHBsYW5lLT5tb2RpZmllcnNbaV0pCj4gLQkJCWJyZWFrOwo+ICsJCWZvciAoaSA9IDA7IGkgPCBw bGFuZS0+bW9kaWZpZXJfY291bnQ7IGkrKykgewo+ICsJCQlpZiAobW9kaWZpZXIgPT0gcGxhbmUt Pm1vZGlmaWVyc1tpXSkKPiArCQkJCWJyZWFrOwo+ICsJCX0KPiArCQlpZiAoaSA9PSBwbGFuZS0+ bW9kaWZpZXJfY291bnQpCj4gKwkJCXJldHVybiAtRUlOVkFMOwo+ICAJfQo+IC0JaWYgKGkgPT0g cGxhbmUtPm1vZGlmaWVyX2NvdW50KQo+IC0JCXJldHVybiAtRUlOVkFMOwo+IC0KPiAtCWlmIChw bGFuZS0+ZnVuY3MtPmZvcm1hdF9tb2Rfc3VwcG9ydGVkICYmCj4gLQkgICAgIXBsYW5lLT5mdW5j cy0+Zm9ybWF0X21vZF9zdXBwb3J0ZWQocGxhbmUsIGZvcm1hdCwgbW9kaWZpZXIpKQo+IC0JCXJl dHVybiAtRUlOVkFMOwo+ICAKPiAgCXJldHVybiAwOwo+ICB9Cj4gZGlmZiAtLWdpdCBhL2luY2x1 ZGUvZHJtL2RybV9wbGFuZS5oIGIvaW5jbHVkZS9kcm0vZHJtX3BsYW5lLmgKPiBpbmRleCBmN2Jm NGE0OGIxYzMuLjZiMWI1MTY0NWY3NSAxMDA2NDQKPiAtLS0gYS9pbmNsdWRlL2RybS9kcm1fcGxh bmUuaAo+ICsrKyBiL2luY2x1ZGUvZHJtL2RybV9wbGFuZS5oCj4gQEAgLTQyMCw3ICs0MjAsMTAg QEAgc3RydWN0IGRybV9wbGFuZV9mdW5jcyB7Cj4gIAkgKiBUaGlzIG9wdGlvbmFsIGhvb2sgaXMg dXNlZCBmb3IgdGhlIERSTSB0byBkZXRlcm1pbmUgaWYgdGhlIGdpdmVuCj4gIAkgKiBmb3JtYXQv bW9kaWZpZXIgY29tYmluYXRpb24gaXMgdmFsaWQgZm9yIHRoZSBwbGFuZS4gVGhpcyBhbGxvd3Mg dGhlCj4gIAkgKiBEUk0gdG8gZ2VuZXJhdGUgdGhlIGNvcnJlY3QgZm9ybWF0IGJpdG1hc2sgKHdo aWNoIGZvcm1hdHMgYXBwbHkgdG8KPiAtCSAqIHdoaWNoIG1vZGlmaWVyKS4KPiArCSAqIHdoaWNo IG1vZGlmaWVyKSwgYW5kIHRvIHZhbGRpYXRlIG1vZGlmaWVycyBhdCBhdG9taWNfY2hlY2sgdGlt ZS4KPiArCSAqCj4gKwkgKiBJZiBub3QgcHJlc2VudCwgdGhlbiBhbnkgbW9kaWZpZXIgaW4gdGhl IHBsYW5lJ3MgbW9kaWZpZXIKPiArCSAqIGxpc3QgaXMgYWxsb3dlZCB3aXRoIGFueSBvZiB0aGUg cGxhbmUncyBmb3JtYXRzLgo+ICAJICoKPiAgCSAqIFJldHVybnM6Cj4gIAkgKgo+IC0tIAo+IDIu MTYuMgoKLS0gClZpbGxlIFN5cmrDpGzDpApJbnRlbApfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752358AbeEVQcM (ORCPT ); Tue, 22 May 2018 12:32:12 -0400 Received: from mga07.intel.com ([134.134.136.100]:7038 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752102AbeEVQbh (ORCPT ); Tue, 22 May 2018 12:31:37 -0400 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,430,1520924400"; d="scan'208";a="57510965" Date: Tue, 22 May 2018 19:31:27 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Eric Anholt Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/3] drm: Trust format_mod_supported() when it OKs a plane modifier. Message-ID: <20180522163127.GH23723@intel.com> References: <20180316220435.31416-1-eric@anholt.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180316220435.31416-1-eric@anholt.net> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 16, 2018 at 03:04:33PM -0700, Eric Anholt wrote: > For parameterized modifiers (Broadcom's SAND and UIF), we need to > allow the parameter fields to be filled in, while exposing only the > variant of the modifier with the parameter unfilled in the internal > arrays and the format blob. > > Signed-off-by: Eric Anholt > Cc: Ville Syrjälä With https://patchwork.freedesktop.org/series/40207/ this should be safe for i915, so Reviewed-by: Ville Syrjälä > --- > drivers/gpu/drm/drm_plane.c | 23 ++++++++++++----------- > include/drm/drm_plane.h | 5 ++++- > 2 files changed, 16 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c > index 46fbd019a337..5bb501f1aae8 100644 > --- a/drivers/gpu/drm/drm_plane.c > +++ b/drivers/gpu/drm/drm_plane.c > @@ -561,19 +561,20 @@ int drm_plane_check_pixel_format(struct drm_plane *plane, > if (i == plane->format_count) > return -EINVAL; > > - if (!plane->modifier_count) > - return 0; > + if (plane->funcs->format_mod_supported) { > + if (!plane->funcs->format_mod_supported(plane, format, modifier)) > + return -EINVAL; > + } else { > + if (!plane->modifier_count) > + return 0; > > - for (i = 0; i < plane->modifier_count; i++) { > - if (modifier == plane->modifiers[i]) > - break; > + for (i = 0; i < plane->modifier_count; i++) { > + if (modifier == plane->modifiers[i]) > + break; > + } > + if (i == plane->modifier_count) > + return -EINVAL; > } > - if (i == plane->modifier_count) > - return -EINVAL; > - > - if (plane->funcs->format_mod_supported && > - !plane->funcs->format_mod_supported(plane, format, modifier)) > - return -EINVAL; > > return 0; > } > diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h > index f7bf4a48b1c3..6b1b51645f75 100644 > --- a/include/drm/drm_plane.h > +++ b/include/drm/drm_plane.h > @@ -420,7 +420,10 @@ struct drm_plane_funcs { > * This optional hook is used for the DRM to determine if the given > * format/modifier combination is valid for the plane. This allows the > * DRM to generate the correct format bitmask (which formats apply to > - * which modifier). > + * which modifier), and to valdiate modifiers at atomic_check time. > + * > + * If not present, then any modifier in the plane's modifier > + * list is allowed with any of the plane's formats. > * > * Returns: > * > -- > 2.16.2 -- Ville Syrjälä Intel