From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933907AbdDGSdT (ORCPT ); Fri, 7 Apr 2017 14:33:19 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:35528 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754895AbdDGSdL (ORCPT ); Fri, 7 Apr 2017 14:33:11 -0400 Date: Fri, 7 Apr 2017 20:33:07 +0200 From: Daniel Vetter To: Romain Perier Cc: Archit Taneja , David Airlie , linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm: dw-hdmi: Implement the mode_fixup drm helper Message-ID: <20170407183307.etouyzkwr6yzchan@phenom.ffwll.local> Mail-Followup-To: Romain Perier , Archit Taneja , David Airlie , linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20170407121743.4142-1-romain.perier@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170407121743.4142-1-romain.perier@collabora.com> X-Operating-System: Linux phenom 4.9.0-2-amd64 User-Agent: NeoMutt/20170306 (1.8.0) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Apr 07, 2017 at 02:17:43PM +0200, Romain Perier wrote: > This helper is supposed to validate or reject the modeline before it > applied by the mode setting. Currently this function has been dropped, > it was previously set to a dummy function that always returned true. For > both cases, this means that userspace can ask for a bad modeline that > will be always accepted. > > On some platforms, like Rockchip, the drm dw_hdmi-rockchip variant driver > already implements the atomic_check drm helper, so mode_fixup cannot be > handled and implemented there (as drm_atomic_helper relies on either > atomic_check or mode_fixup). > > This commit implements this helper. It only checks that this mode is > correct from the connector point of view > > Signed-off-by: Romain Perier Yup this is how it's supposed to be done, check bridge limits in the bridge's mode_fixup hook. Acked-by: Daniel Vetter > --- > drivers/gpu/drm/bridge/dw-hdmi.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c > index 22211ff..3bd0807 100644 > --- a/drivers/gpu/drm/bridge/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/dw-hdmi.c > @@ -1740,6 +1740,21 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge) > return 0; > } > > + > +static bool dw_hdmi_bridge_mode_fixup(struct drm_bridge *bridge, > + const struct drm_display_mode *orig_mode, > + struct drm_display_mode *mode) > +{ > + struct dw_hdmi *hdmi = bridge->driver_private; > + struct drm_connector *connector = &hdmi->connector; > + enum drm_mode_status status; > + > + status = dw_hdmi_connector_mode_valid(connector, mode); > + if (status != MODE_OK) > + return false; > + return true; > +} > + > static void dw_hdmi_bridge_mode_set(struct drm_bridge *bridge, > struct drm_display_mode *orig_mode, > struct drm_display_mode *mode) > @@ -1781,6 +1796,7 @@ static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = { > .enable = dw_hdmi_bridge_enable, > .disable = dw_hdmi_bridge_disable, > .mode_set = dw_hdmi_bridge_mode_set, > + .mode_fixup = dw_hdmi_bridge_mode_fixup, > }; > > static irqreturn_t dw_hdmi_i2c_irq(struct dw_hdmi *hdmi) > -- > 2.9.3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm: dw-hdmi: Implement the mode_fixup drm helper Date: Fri, 7 Apr 2017 20:33:07 +0200 Message-ID: <20170407183307.etouyzkwr6yzchan@phenom.ffwll.local> References: <20170407121743.4142-1-romain.perier@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20170407121743.4142-1-romain.perier@collabora.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Romain Perier Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org T24gRnJpLCBBcHIgMDcsIDIwMTcgYXQgMDI6MTc6NDNQTSArMDIwMCwgUm9tYWluIFBlcmllciB3 cm90ZToKPiBUaGlzIGhlbHBlciBpcyBzdXBwb3NlZCB0byB2YWxpZGF0ZSBvciByZWplY3QgdGhl IG1vZGVsaW5lIGJlZm9yZSBpdAo+IGFwcGxpZWQgYnkgdGhlIG1vZGUgc2V0dGluZy4gQ3VycmVu dGx5IHRoaXMgZnVuY3Rpb24gaGFzIGJlZW4gZHJvcHBlZCwKPiBpdCB3YXMgcHJldmlvdXNseSBz ZXQgdG8gYSBkdW1teSBmdW5jdGlvbiB0aGF0IGFsd2F5cyByZXR1cm5lZCB0cnVlLiBGb3IKPiBi b3RoIGNhc2VzLCB0aGlzIG1lYW5zIHRoYXQgdXNlcnNwYWNlIGNhbiBhc2sgZm9yIGEgYmFkIG1v ZGVsaW5lIHRoYXQKPiB3aWxsIGJlIGFsd2F5cyBhY2NlcHRlZC4KPiAKPiBPbiBzb21lIHBsYXRm b3JtcywgbGlrZSBSb2NrY2hpcCwgdGhlIGRybSBkd19oZG1pLXJvY2tjaGlwIHZhcmlhbnQgZHJp dmVyCj4gYWxyZWFkeSBpbXBsZW1lbnRzIHRoZSBhdG9taWNfY2hlY2sgZHJtIGhlbHBlciwgc28g bW9kZV9maXh1cCBjYW5ub3QgYmUKPiBoYW5kbGVkIGFuZCBpbXBsZW1lbnRlZCB0aGVyZSAoYXMg ZHJtX2F0b21pY19oZWxwZXIgcmVsaWVzIG9uIGVpdGhlcgo+IGF0b21pY19jaGVjayBvciBtb2Rl X2ZpeHVwKS4KPiAKPiBUaGlzIGNvbW1pdCBpbXBsZW1lbnRzIHRoaXMgaGVscGVyLiBJdCBvbmx5 IGNoZWNrcyB0aGF0IHRoaXMgbW9kZSBpcwo+IGNvcnJlY3QgZnJvbSB0aGUgY29ubmVjdG9yIHBv aW50IG9mIHZpZXcKPiAKPiBTaWduZWQtb2ZmLWJ5OiBSb21haW4gUGVyaWVyIDxyb21haW4ucGVy aWVyQGNvbGxhYm9yYS5jb20+CgpZdXAgdGhpcyBpcyBob3cgaXQncyBzdXBwb3NlZCB0byBiZSBk b25lLCBjaGVjayBicmlkZ2UgbGltaXRzIGluIHRoZQpicmlkZ2UncyBtb2RlX2ZpeHVwIGhvb2su CgpBY2tlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KPiAtLS0K PiAgZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9kdy1oZG1pLmMgfCAxNiArKysrKysrKysrKysrKysr Cj4gIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9icmlkZ2UvZHctaGRtaS5jIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9k dy1oZG1pLmMKPiBpbmRleCAyMjIxMWZmLi4zYmQwODA3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9icmlkZ2UvZHctaGRtaS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9k dy1oZG1pLmMKPiBAQCAtMTc0MCw2ICsxNzQwLDIxIEBAIHN0YXRpYyBpbnQgZHdfaGRtaV9icmlk Z2VfYXR0YWNoKHN0cnVjdCBkcm1fYnJpZGdlICpicmlkZ2UpCj4gIAlyZXR1cm4gMDsKPiAgfQo+ ICAKPiArCj4gK3N0YXRpYyBib29sIGR3X2hkbWlfYnJpZGdlX21vZGVfZml4dXAoc3RydWN0IGRy bV9icmlkZ2UgKmJyaWRnZSwKPiArCQkJCSAgICAgIGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9t b2RlICpvcmlnX21vZGUsCj4gKwkJCQkgICAgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9k ZSkKPiArewo+ICsJc3RydWN0IGR3X2hkbWkgKmhkbWkgPSBicmlkZ2UtPmRyaXZlcl9wcml2YXRl Owo+ICsJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciA9ICZoZG1pLT5jb25uZWN0b3I7 Cj4gKwllbnVtIGRybV9tb2RlX3N0YXR1cyBzdGF0dXM7Cj4gKwo+ICsJc3RhdHVzID0gZHdfaGRt aV9jb25uZWN0b3JfbW9kZV92YWxpZChjb25uZWN0b3IsIG1vZGUpOwo+ICsJaWYgKHN0YXR1cyAh PSBNT0RFX09LKQo+ICsJCXJldHVybiBmYWxzZTsKPiArCXJldHVybiB0cnVlOwo+ICt9Cj4gKwo+ ICBzdGF0aWMgdm9pZCBkd19oZG1pX2JyaWRnZV9tb2RlX3NldChzdHJ1Y3QgZHJtX2JyaWRnZSAq YnJpZGdlLAo+ICAJCQkJICAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpvcmlnX21vZGUsCj4g IAkJCQkgICAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCj4gQEAgLTE3ODEsNiArMTc5 Niw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2JyaWRnZV9mdW5jcyBkd19oZG1pX2JyaWRn ZV9mdW5jcyA9IHsKPiAgCS5lbmFibGUgPSBkd19oZG1pX2JyaWRnZV9lbmFibGUsCj4gIAkuZGlz YWJsZSA9IGR3X2hkbWlfYnJpZGdlX2Rpc2FibGUsCj4gIAkubW9kZV9zZXQgPSBkd19oZG1pX2Jy aWRnZV9tb2RlX3NldCwKPiArCS5tb2RlX2ZpeHVwID0gZHdfaGRtaV9icmlkZ2VfbW9kZV9maXh1 cCwKPiAgfTsKPiAgCj4gIHN0YXRpYyBpcnFyZXR1cm5fdCBkd19oZG1pX2kyY19pcnEoc3RydWN0 IGR3X2hkbWkgKmhkbWkpCj4gLS0gCj4gMi45LjMKPiAKPiBfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJl IEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGlu ZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniel@ffwll.ch (Daniel Vetter) Date: Fri, 7 Apr 2017 20:33:07 +0200 Subject: [PATCH] drm: dw-hdmi: Implement the mode_fixup drm helper In-Reply-To: <20170407121743.4142-1-romain.perier@collabora.com> References: <20170407121743.4142-1-romain.perier@collabora.com> Message-ID: <20170407183307.etouyzkwr6yzchan@phenom.ffwll.local> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Apr 07, 2017 at 02:17:43PM +0200, Romain Perier wrote: > This helper is supposed to validate or reject the modeline before it > applied by the mode setting. Currently this function has been dropped, > it was previously set to a dummy function that always returned true. For > both cases, this means that userspace can ask for a bad modeline that > will be always accepted. > > On some platforms, like Rockchip, the drm dw_hdmi-rockchip variant driver > already implements the atomic_check drm helper, so mode_fixup cannot be > handled and implemented there (as drm_atomic_helper relies on either > atomic_check or mode_fixup). > > This commit implements this helper. It only checks that this mode is > correct from the connector point of view > > Signed-off-by: Romain Perier Yup this is how it's supposed to be done, check bridge limits in the bridge's mode_fixup hook. Acked-by: Daniel Vetter > --- > drivers/gpu/drm/bridge/dw-hdmi.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c > index 22211ff..3bd0807 100644 > --- a/drivers/gpu/drm/bridge/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/dw-hdmi.c > @@ -1740,6 +1740,21 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge) > return 0; > } > > + > +static bool dw_hdmi_bridge_mode_fixup(struct drm_bridge *bridge, > + const struct drm_display_mode *orig_mode, > + struct drm_display_mode *mode) > +{ > + struct dw_hdmi *hdmi = bridge->driver_private; > + struct drm_connector *connector = &hdmi->connector; > + enum drm_mode_status status; > + > + status = dw_hdmi_connector_mode_valid(connector, mode); > + if (status != MODE_OK) > + return false; > + return true; > +} > + > static void dw_hdmi_bridge_mode_set(struct drm_bridge *bridge, > struct drm_display_mode *orig_mode, > struct drm_display_mode *mode) > @@ -1781,6 +1796,7 @@ static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = { > .enable = dw_hdmi_bridge_enable, > .disable = dw_hdmi_bridge_disable, > .mode_set = dw_hdmi_bridge_mode_set, > + .mode_fixup = dw_hdmi_bridge_mode_fixup, > }; > > static irqreturn_t dw_hdmi_i2c_irq(struct dw_hdmi *hdmi) > -- > 2.9.3 > > _______________________________________________ > dri-devel mailing list > dri-devel at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch