From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Zhong Subject: Re: [PATCH v3 3/5] drm/rockchip/dsi: remove mode_valid function Date: Tue, 24 Jan 2017 10:27:27 +0800 Message-ID: <5886BB8F.6040707@rock-chips.com> References: <1484907051-7159-1-git-send-email-zyw@rock-chips.com> <1484907051-7159-4-git-send-email-zyw@rock-chips.com> <20170123174841.GB25789@trickycodes.roam.corp.google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170123174841.GB25789@trickycodes.roam.corp.google.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sean Paul Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, pawel.moll@arm.com, yzq@rock-chips.com, linux-kernel@vger.kernel.org, dianders@chromium.org, dri-devel@lists.freedesktop.org, tfiga@chromium.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, galak@codeaurora.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org SGkgU2VhbgoKT24gMDEvMjQvMjAxNyAwMTo0OCBBTSwgU2VhbiBQYXVsIHdyb3RlOgo+IE9uIEZy aSwgSmFuIDIwLCAyMDE3IGF0IDA2OjEwOjQ5UE0gKzA4MDAsIENocmlzIFpob25nIHdyb3RlOgo+ PiBUaGUgTUlQSSBEU0kgZG8gbm90IG5lZWQgY2hlY2sgdGhlIHZhbGlkaXR5IG9mIHJlc29sdXRp b24sIHRoZSBtYXgKPj4gcmVzb2x1dGlvbiBzaG91bGQgZGVwZW5kIFZPUC4gSGVuY2UsIHJlbW92 ZSByazMyODhfbWlwaV9kc2lfbW9kZV92YWxpZAo+PiBoZXJlLgo+IERvZXMgdm9wIGFjdHVhbGx5 IGVuZm9yY2UgdGhpcywgdGhvdWdoPyBJIHNlZSB0aGF0IG1vZGVfY29uZmlnLm1heF93aWR0aCBp cwo+IDQwOTYsIGJ1dCB0aGVyZSBpcyBubyBib3VuZHMgY2hlY2tpbmcgaW4gbW9kZV9maXh1cCgp Lgo+Cj4gVGhlIGNvbm5lY3RvciBpcyBjdXJyZW50bHkgcmVqZWN0aW5nIGV2ZXJ5dGhpbmcgZ3Jl YXRlciB0aGFuIDIwNDcuIFNvIEkgdGhpbmsKPiB5b3UncmUgZ29pbmcgdG8gcmVncmVzcyBiZWhh dmlvciBoZXJlLgo+Cj4gU2VhbgpUaGUgbWlwaSBjb250cm9sbGVyIGhhcyBub3QgdGhpcyB3aWR0 aCBsaW1pdCwgaXQgZGVwZW5kIHRoZSBWT1AsIHN1Y2ggYXMgClJLMzM5OSwgVk9QX0xJVCBvbmx5 IHN1cHBvcnQgMjU2MCwKYnV0IFZPUF9CSUcgc3VwcG9ydCA0Sy4gU28gdGhpcyBkcml2ZXIgc2hv dWxkIGNoZWNrIHRoZSB3aWR0aCBoZXJlLgoKPgo+Cj4+IFNpZ25lZC1vZmYtYnk6IENocmlzIFpo b25nIDx6eXdAcm9jay1jaGlwcy5jb20+Cj4+IC0tLQo+Pgo+PiBDaGFuZ2VzIGluIHYzOiBOb25l Cj4+Cj4+ICAgZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMgfCAzOSAtLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4+ICAgMSBmaWxlIGNoYW5nZWQsIDM5IGRl bGV0aW9ucygtKQo+Pgo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3 LW1pcGktZHNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYwo+PiBp bmRleCBhOTNjZTk3Li42ZjBlMjUyIDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9j a2NoaXAvZHctbWlwaS1kc2kuYwo+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHct bWlwaS1kc2kuYwo+PiBAQCAtMjc4LDggKzI3OCw2IEBAIHN0cnVjdCBkd19taXBpX2RzaV9wbGF0 X2RhdGEgewo+PiAgIAl1MzIgZ3JmX2RzaTBfbW9kZTsKPj4gICAJdTMyIGdyZl9kc2kwX21vZGVf cmVnOwo+PiAgIAl1bnNpZ25lZCBpbnQgbWF4X2RhdGFfbGFuZXM7Cj4+IC0JZW51bSBkcm1fbW9k ZV9zdGF0dXMgKCptb2RlX3ZhbGlkKShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAo+ PiAtCQkJCQkgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSk7Cj4+ICAgfTsKPj4gICAK Pj4gICBzdHJ1Y3QgZHdfbWlwaV9kc2kgewo+PiBAQCAtMTA4MSwyMyArMTA3OSw4IEBAIHN0YXRp YyBpbnQgZHdfbWlwaV9kc2lfY29ubmVjdG9yX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3Rv ciAqY29ubmVjdG9yKQo+PiAgIAlyZXR1cm4gZHJtX3BhbmVsX2dldF9tb2Rlcyhkc2ktPnBhbmVs KTsKPj4gICB9Cj4+ICAgCj4+IC1zdGF0aWMgZW51bSBkcm1fbW9kZV9zdGF0dXMgZHdfbWlwaV9k c2lfbW9kZV92YWxpZCgKPj4gLQkJCQkJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwK Pj4gLQkJCQkJc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCj4+IC17Cj4+IC0Jc3RydWN0 IGR3X21pcGlfZHNpICpkc2kgPSBjb25fdG9fZHNpKGNvbm5lY3Rvcik7Cj4+IC0KPj4gLQllbnVt IGRybV9tb2RlX3N0YXR1cyBtb2RlX3N0YXR1cyA9IE1PREVfT0s7Cj4+IC0KPj4gLQlpZiAoZHNp LT5wZGF0YS0+bW9kZV92YWxpZCkKPj4gLQkJbW9kZV9zdGF0dXMgPSBkc2ktPnBkYXRhLT5tb2Rl X3ZhbGlkKGNvbm5lY3RvciwgbW9kZSk7Cj4+IC0KPj4gLQlyZXR1cm4gbW9kZV9zdGF0dXM7Cj4+ IC19Cj4+IC0KPj4gICBzdGF0aWMgc3RydWN0IGRybV9jb25uZWN0b3JfaGVscGVyX2Z1bmNzIGR3 X21pcGlfZHNpX2Nvbm5lY3Rvcl9oZWxwZXJfZnVuY3MgPSB7Cj4+ICAgCS5nZXRfbW9kZXMgPSBk d19taXBpX2RzaV9jb25uZWN0b3JfZ2V0X21vZGVzLAo+PiAtCS5tb2RlX3ZhbGlkID0gZHdfbWlw aV9kc2lfbW9kZV92YWxpZCwKPj4gICB9Owo+PiAgIAo+PiAgIHN0YXRpYyB2b2lkIGR3X21pcGlf ZHNpX2RybV9jb25uZWN0b3JfZGVzdHJveShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y KQo+PiBAQCAtMTE2OCwzMyArMTE1MSwxMSBAQCBzdGF0aWMgaW50IHJvY2tjaGlwX21pcGlfcGFy c2VfZHQoc3RydWN0IGR3X21pcGlfZHNpICpkc2kpCj4+ICAgCXJldHVybiAwOwo+PiAgIH0KPj4g ICAKPj4gLXN0YXRpYyBlbnVtIGRybV9tb2RlX3N0YXR1cyByazMyODhfbWlwaV9kc2lfbW9kZV92 YWxpZCgKPj4gLQkJCQkJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKPj4gLQkJCQkJ c3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCj4+IC17Cj4+IC0JLyoKPj4gLQkgKiBUaGUg VklEX1BLVF9TSVpFIGZpZWxkIGluIHRoZSBEU0lfVklEX1BLVF9DRkcKPj4gLQkgKiByZWdpc3Rl ciBpcyAxMS1iaXQuCj4+IC0JICovCj4+IC0JaWYgKG1vZGUtPmhkaXNwbGF5ID4gMHg3ZmYpCj4+ IC0JCXJldHVybiBNT0RFX0JBRF9IVkFMVUU7Cj4+IC0KPj4gLQkvKgo+PiAtCSAqIFRoZSBWX0FD VElWRV9MSU5FUyBmaWVsZCBpbiB0aGUgRFNJX1ZUSU1JTkdfQ0ZHCj4+IC0JICogcmVnaXN0ZXIg aXMgMTEtYml0Lgo+PiAtCSAqLwo+PiAtCWlmIChtb2RlLT52ZGlzcGxheSA+IDB4N2ZmKQo+PiAt CQlyZXR1cm4gTU9ERV9CQURfVlZBTFVFOwo+PiAtCj4+IC0JcmV0dXJuIE1PREVfT0s7Cj4+IC19 Cj4+IC0KPj4gICBzdGF0aWMgc3RydWN0IGR3X21pcGlfZHNpX3BsYXRfZGF0YSByazMyODhfbWlw aV9kc2lfZHJ2X2RhdGEgPSB7Cj4+ICAgCS5kc2kwX2VuX2JpdCA9IFJLMzI4OF9EU0kwX1NFTF9W T1BfTElULAo+PiAgIAkuZHNpMV9lbl9iaXQgPSBSSzMyODhfRFNJMV9TRUxfVk9QX0xJVCwKPj4g ICAJLmdyZl9zd2l0Y2hfcmVnID0gUkszMjg4X0dSRl9TT0NfQ09ONiwKPj4gICAJLm1heF9kYXRh X2xhbmVzID0gNCwKPj4gLQkubW9kZV92YWxpZCA9IHJrMzI4OF9taXBpX2RzaV9tb2RlX3ZhbGlk LAo+PiAgIH07Cj4+ICAgCj4+ICAgc3RhdGljIHN0cnVjdCBkd19taXBpX2RzaV9wbGF0X2RhdGEg cmszMzk5X21pcGlfZHNpX2Rydl9kYXRhID0gewo+PiAtLSAKPj4gMi42LjMKPj4KPj4gX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPj4gZHJpLWRldmVsIG1h aWxpbmcgbGlzdAo+PiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4+IGh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: zyw@rock-chips.com (Chris Zhong) Date: Tue, 24 Jan 2017 10:27:27 +0800 Subject: [PATCH v3 3/5] drm/rockchip/dsi: remove mode_valid function In-Reply-To: <20170123174841.GB25789@trickycodes.roam.corp.google.com> References: <1484907051-7159-1-git-send-email-zyw@rock-chips.com> <1484907051-7159-4-git-send-email-zyw@rock-chips.com> <20170123174841.GB25789@trickycodes.roam.corp.google.com> Message-ID: <5886BB8F.6040707@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Sean On 01/24/2017 01:48 AM, Sean Paul wrote: > On Fri, Jan 20, 2017 at 06:10:49PM +0800, Chris Zhong wrote: >> The MIPI DSI do not need check the validity of resolution, the max >> resolution should depend VOP. Hence, remove rk3288_mipi_dsi_mode_valid >> here. > Does vop actually enforce this, though? I see that mode_config.max_width is > 4096, but there is no bounds checking in mode_fixup(). > > The connector is currently rejecting everything greater than 2047. So I think > you're going to regress behavior here. > > Sean The mipi controller has not this width limit, it depend the VOP, such as RK3399, VOP_LIT only support 2560, but VOP_BIG support 4K. So this driver should check the width here. > > >> Signed-off-by: Chris Zhong >> --- >> >> Changes in v3: None >> >> drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 39 ---------------------------------- >> 1 file changed, 39 deletions(-) >> >> diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c >> index a93ce97..6f0e252 100644 >> --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c >> +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c >> @@ -278,8 +278,6 @@ struct dw_mipi_dsi_plat_data { >> u32 grf_dsi0_mode; >> u32 grf_dsi0_mode_reg; >> unsigned int max_data_lanes; >> - enum drm_mode_status (*mode_valid)(struct drm_connector *connector, >> - struct drm_display_mode *mode); >> }; >> >> struct dw_mipi_dsi { >> @@ -1081,23 +1079,8 @@ static int dw_mipi_dsi_connector_get_modes(struct drm_connector *connector) >> return drm_panel_get_modes(dsi->panel); >> } >> >> -static enum drm_mode_status dw_mipi_dsi_mode_valid( >> - struct drm_connector *connector, >> - struct drm_display_mode *mode) >> -{ >> - struct dw_mipi_dsi *dsi = con_to_dsi(connector); >> - >> - enum drm_mode_status mode_status = MODE_OK; >> - >> - if (dsi->pdata->mode_valid) >> - mode_status = dsi->pdata->mode_valid(connector, mode); >> - >> - return mode_status; >> -} >> - >> static struct drm_connector_helper_funcs dw_mipi_dsi_connector_helper_funcs = { >> .get_modes = dw_mipi_dsi_connector_get_modes, >> - .mode_valid = dw_mipi_dsi_mode_valid, >> }; >> >> static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector) >> @@ -1168,33 +1151,11 @@ static int rockchip_mipi_parse_dt(struct dw_mipi_dsi *dsi) >> return 0; >> } >> >> -static enum drm_mode_status rk3288_mipi_dsi_mode_valid( >> - struct drm_connector *connector, >> - struct drm_display_mode *mode) >> -{ >> - /* >> - * The VID_PKT_SIZE field in the DSI_VID_PKT_CFG >> - * register is 11-bit. >> - */ >> - if (mode->hdisplay > 0x7ff) >> - return MODE_BAD_HVALUE; >> - >> - /* >> - * The V_ACTIVE_LINES field in the DSI_VTIMING_CFG >> - * register is 11-bit. >> - */ >> - if (mode->vdisplay > 0x7ff) >> - return MODE_BAD_VVALUE; >> - >> - return MODE_OK; >> -} >> - >> static struct dw_mipi_dsi_plat_data rk3288_mipi_dsi_drv_data = { >> .dsi0_en_bit = RK3288_DSI0_SEL_VOP_LIT, >> .dsi1_en_bit = RK3288_DSI1_SEL_VOP_LIT, >> .grf_switch_reg = RK3288_GRF_SOC_CON6, >> .max_data_lanes = 4, >> - .mode_valid = rk3288_mipi_dsi_mode_valid, >> }; >> >> static struct dw_mipi_dsi_plat_data rk3399_mipi_dsi_drv_data = { >> -- >> 2.6.3 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel at lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751778AbdAXC2C (ORCPT ); Mon, 23 Jan 2017 21:28:02 -0500 Received: from regular1.263xmail.com ([211.150.99.136]:34285 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750873AbdAXC2A (ORCPT ); Mon, 23 Jan 2017 21:28:00 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: zyw@rock-chips.com X-FST-TO: linux-arm-kernel@lists.infradead.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: zyw@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH v3 3/5] drm/rockchip/dsi: remove mode_valid function To: Sean Paul References: <1484907051-7159-1-git-send-email-zyw@rock-chips.com> <1484907051-7159-4-git-send-email-zyw@rock-chips.com> <20170123174841.GB25789@trickycodes.roam.corp.google.com> Cc: dianders@chromium.org, tfiga@chromium.org, heiko@sntech.de, yzq@rock-chips.com, mark.rutland@arm.com, devicetree@vger.kernel.org, robh+dt@kernel.org, galak@codeaurora.org, pawel.moll@arm.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org From: Chris Zhong Message-ID: <5886BB8F.6040707@rock-chips.com> Date: Tue, 24 Jan 2017 10:27:27 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <20170123174841.GB25789@trickycodes.roam.corp.google.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sean On 01/24/2017 01:48 AM, Sean Paul wrote: > On Fri, Jan 20, 2017 at 06:10:49PM +0800, Chris Zhong wrote: >> The MIPI DSI do not need check the validity of resolution, the max >> resolution should depend VOP. Hence, remove rk3288_mipi_dsi_mode_valid >> here. > Does vop actually enforce this, though? I see that mode_config.max_width is > 4096, but there is no bounds checking in mode_fixup(). > > The connector is currently rejecting everything greater than 2047. So I think > you're going to regress behavior here. > > Sean The mipi controller has not this width limit, it depend the VOP, such as RK3399, VOP_LIT only support 2560, but VOP_BIG support 4K. So this driver should check the width here. > > >> Signed-off-by: Chris Zhong >> --- >> >> Changes in v3: None >> >> drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 39 ---------------------------------- >> 1 file changed, 39 deletions(-) >> >> diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c >> index a93ce97..6f0e252 100644 >> --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c >> +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c >> @@ -278,8 +278,6 @@ struct dw_mipi_dsi_plat_data { >> u32 grf_dsi0_mode; >> u32 grf_dsi0_mode_reg; >> unsigned int max_data_lanes; >> - enum drm_mode_status (*mode_valid)(struct drm_connector *connector, >> - struct drm_display_mode *mode); >> }; >> >> struct dw_mipi_dsi { >> @@ -1081,23 +1079,8 @@ static int dw_mipi_dsi_connector_get_modes(struct drm_connector *connector) >> return drm_panel_get_modes(dsi->panel); >> } >> >> -static enum drm_mode_status dw_mipi_dsi_mode_valid( >> - struct drm_connector *connector, >> - struct drm_display_mode *mode) >> -{ >> - struct dw_mipi_dsi *dsi = con_to_dsi(connector); >> - >> - enum drm_mode_status mode_status = MODE_OK; >> - >> - if (dsi->pdata->mode_valid) >> - mode_status = dsi->pdata->mode_valid(connector, mode); >> - >> - return mode_status; >> -} >> - >> static struct drm_connector_helper_funcs dw_mipi_dsi_connector_helper_funcs = { >> .get_modes = dw_mipi_dsi_connector_get_modes, >> - .mode_valid = dw_mipi_dsi_mode_valid, >> }; >> >> static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector) >> @@ -1168,33 +1151,11 @@ static int rockchip_mipi_parse_dt(struct dw_mipi_dsi *dsi) >> return 0; >> } >> >> -static enum drm_mode_status rk3288_mipi_dsi_mode_valid( >> - struct drm_connector *connector, >> - struct drm_display_mode *mode) >> -{ >> - /* >> - * The VID_PKT_SIZE field in the DSI_VID_PKT_CFG >> - * register is 11-bit. >> - */ >> - if (mode->hdisplay > 0x7ff) >> - return MODE_BAD_HVALUE; >> - >> - /* >> - * The V_ACTIVE_LINES field in the DSI_VTIMING_CFG >> - * register is 11-bit. >> - */ >> - if (mode->vdisplay > 0x7ff) >> - return MODE_BAD_VVALUE; >> - >> - return MODE_OK; >> -} >> - >> static struct dw_mipi_dsi_plat_data rk3288_mipi_dsi_drv_data = { >> .dsi0_en_bit = RK3288_DSI0_SEL_VOP_LIT, >> .dsi1_en_bit = RK3288_DSI1_SEL_VOP_LIT, >> .grf_switch_reg = RK3288_GRF_SOC_CON6, >> .max_data_lanes = 4, >> - .mode_valid = rk3288_mipi_dsi_mode_valid, >> }; >> >> static struct dw_mipi_dsi_plat_data rk3399_mipi_dsi_drv_data = { >> -- >> 2.6.3 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel