From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751906AbdBEDnS (ORCPT ); Sat, 4 Feb 2017 22:43:18 -0500 Received: from regular1.263xmail.com ([211.150.99.132]:44287 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751386AbdBEDnQ (ORCPT ); Sat, 4 Feb 2017 22:43:16 -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> <5886BB8F.6040707@rock-chips.com> <20170201181218.GA8595@art_vandelay> 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 From: Chris Zhong Message-ID: <58969F32.9010003@rock-chips.com> Date: Sun, 5 Feb 2017 11:42:42 +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: <20170201181218.GA8595@art_vandelay> 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 On 02/02/2017 02:12 AM, Sean Paul wrote: > On Tue, Jan 24, 2017 at 10:27:27AM +0800, Chris Zhong wrote: >> 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. > I don't see anything in the vop driver that rejects large modes for little vop. > So, while I agree the check shouldn't be here, you should move it to where it > should be instead of removing it entirely. > > Sean drm_mode_validate_size will check the dev->mode_config.max_width and dev->mode_config.max_height, these 2 value come from rockchip_drm_mode_config_init, currently, they are both 4096. So you are right, drm driver does not distinguish between vop lit and big. I think Mark Yao already have a local solution, and he will post it soon. > >>> >>>> 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 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel 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: Sun, 5 Feb 2017 11:42:42 +0800 Message-ID: <58969F32.9010003@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> <5886BB8F.6040707@rock-chips.com> <20170201181218.GA8595@art_vandelay> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170201181218.GA8595@art_vandelay> 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, dianders@chromium.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, galak@codeaurora.org, tfiga@chromium.org, linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org CgpPbiAwMi8wMi8yMDE3IDAyOjEyIEFNLCBTZWFuIFBhdWwgd3JvdGU6Cj4gT24gVHVlLCBKYW4g MjQsIDIwMTcgYXQgMTA6Mjc6MjdBTSArMDgwMCwgQ2hyaXMgWmhvbmcgd3JvdGU6Cj4+IEhpIFNl YW4KPj4KPj4gT24gMDEvMjQvMjAxNyAwMTo0OCBBTSwgU2VhbiBQYXVsIHdyb3RlOgo+Pj4gT24g RnJpLCBKYW4gMjAsIDIwMTcgYXQgMDY6MTA6NDlQTSArMDgwMCwgQ2hyaXMgWmhvbmcgd3JvdGU6 Cj4+Pj4gVGhlIE1JUEkgRFNJIGRvIG5vdCBuZWVkIGNoZWNrIHRoZSB2YWxpZGl0eSBvZiByZXNv bHV0aW9uLCB0aGUgbWF4Cj4+Pj4gcmVzb2x1dGlvbiBzaG91bGQgZGVwZW5kIFZPUC4gSGVuY2Us IHJlbW92ZSByazMyODhfbWlwaV9kc2lfbW9kZV92YWxpZAo+Pj4+IGhlcmUuCj4+PiBEb2VzIHZv cCBhY3R1YWxseSBlbmZvcmNlIHRoaXMsIHRob3VnaD8gSSBzZWUgdGhhdCBtb2RlX2NvbmZpZy5t YXhfd2lkdGggaXMKPj4+IDQwOTYsIGJ1dCB0aGVyZSBpcyBubyBib3VuZHMgY2hlY2tpbmcgaW4g bW9kZV9maXh1cCgpLgo+Pj4KPj4+IFRoZSBjb25uZWN0b3IgaXMgY3VycmVudGx5IHJlamVjdGlu ZyBldmVyeXRoaW5nIGdyZWF0ZXIgdGhhbiAyMDQ3LiBTbyBJIHRoaW5rCj4+PiB5b3UncmUgZ29p bmcgdG8gcmVncmVzcyBiZWhhdmlvciBoZXJlLgo+Pj4KPj4+IFNlYW4KPj4gVGhlIG1pcGkgY29u dHJvbGxlciBoYXMgbm90IHRoaXMgd2lkdGggbGltaXQsIGl0IGRlcGVuZCB0aGUgVk9QLAo+PiBz dWNoIGFzIFJLMzM5OSwgVk9QX0xJVCBvbmx5IHN1cHBvcnQgMjU2MCwKPj4gYnV0IFZPUF9CSUcg c3VwcG9ydCA0Sy4gU28gdGhpcyBkcml2ZXIgc2hvdWxkIGNoZWNrIHRoZSB3aWR0aCBoZXJlLgo+ IEkgZG9uJ3Qgc2VlIGFueXRoaW5nIGluIHRoZSB2b3AgZHJpdmVyIHRoYXQgcmVqZWN0cyBsYXJn ZSBtb2RlcyBmb3IgbGl0dGxlIHZvcC4KPiBTbywgd2hpbGUgSSBhZ3JlZSB0aGUgY2hlY2sgc2hv dWxkbid0IGJlIGhlcmUsIHlvdSBzaG91bGQgbW92ZSBpdCB0byB3aGVyZSBpdAo+IHNob3VsZCBi ZSBpbnN0ZWFkIG9mIHJlbW92aW5nIGl0IGVudGlyZWx5Lgo+Cj4gU2VhbgoKZHJtX21vZGVfdmFs aWRhdGVfc2l6ZSB3aWxsIGNoZWNrIHRoZSBkZXYtPm1vZGVfY29uZmlnLm1heF93aWR0aCBhbmQK ZGV2LT5tb2RlX2NvbmZpZy5tYXhfaGVpZ2h0LCB0aGVzZSAyIHZhbHVlIGNvbWUgZnJvbSAKcm9j a2NoaXBfZHJtX21vZGVfY29uZmlnX2luaXQsCmN1cnJlbnRseSwgdGhleSBhcmUgYm90aCA0MDk2 LiBTbyB5b3UgYXJlIHJpZ2h0LCBkcm0gZHJpdmVyIGRvZXMgbm90IApkaXN0aW5ndWlzaApiZXR3 ZWVuIHZvcCBsaXQgYW5kIGJpZy4KCkkgdGhpbmsgTWFyayBZYW8gYWxyZWFkeSBoYXZlIGEgbG9j YWwgc29sdXRpb24sIGFuZCBoZSB3aWxsIHBvc3QgaXQgc29vbi4KCj4KPj4+Cj4+Pj4gU2lnbmVk LW9mZi1ieTogQ2hyaXMgWmhvbmcgPHp5d0Byb2NrLWNoaXBzLmNvbT4KPj4+PiAtLS0KPj4+Pgo+ Pj4+IENoYW5nZXMgaW4gdjM6IE5vbmUKPj4+Pgo+Pj4+ICAgZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL2R3LW1pcGktZHNpLmMgfCAzOSAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t Cj4+Pj4gICAxIGZpbGUgY2hhbmdlZCwgMzkgZGVsZXRpb25zKC0pCj4+Pj4KPj4+PiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMgYi9kcml2ZXJzL2dw dS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYwo+Pj4+IGluZGV4IGE5M2NlOTcuLjZmMGUyNTIg MTAwNjQ0Cj4+Pj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMK Pj4+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYwo+Pj4+IEBA IC0yNzgsOCArMjc4LDYgQEAgc3RydWN0IGR3X21pcGlfZHNpX3BsYXRfZGF0YSB7Cj4+Pj4gICAJ dTMyIGdyZl9kc2kwX21vZGU7Cj4+Pj4gICAJdTMyIGdyZl9kc2kwX21vZGVfcmVnOwo+Pj4+ICAg CXVuc2lnbmVkIGludCBtYXhfZGF0YV9sYW5lczsKPj4+PiAtCWVudW0gZHJtX21vZGVfc3RhdHVz ICgqbW9kZV92YWxpZCkoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKPj4+PiAtCQkJ CQkgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSk7Cj4+Pj4gICB9Owo+Pj4+ICAgc3Ry dWN0IGR3X21pcGlfZHNpIHsKPj4+PiBAQCAtMTA4MSwyMyArMTA3OSw4IEBAIHN0YXRpYyBpbnQg ZHdfbWlwaV9kc2lfY29ubmVjdG9yX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yKQo+Pj4+ICAgCXJldHVybiBkcm1fcGFuZWxfZ2V0X21vZGVzKGRzaS0+cGFuZWwpOwo+ Pj4+ICAgfQo+Pj4+IC1zdGF0aWMgZW51bSBkcm1fbW9kZV9zdGF0dXMgZHdfbWlwaV9kc2lfbW9k ZV92YWxpZCgKPj4+PiAtCQkJCQlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAo+Pj4+ IC0JCQkJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlKQo+Pj4+IC17Cj4+Pj4gLQlzdHJ1 Y3QgZHdfbWlwaV9kc2kgKmRzaSA9IGNvbl90b19kc2koY29ubmVjdG9yKTsKPj4+PiAtCj4+Pj4g LQllbnVtIGRybV9tb2RlX3N0YXR1cyBtb2RlX3N0YXR1cyA9IE1PREVfT0s7Cj4+Pj4gLQo+Pj4+ IC0JaWYgKGRzaS0+cGRhdGEtPm1vZGVfdmFsaWQpCj4+Pj4gLQkJbW9kZV9zdGF0dXMgPSBkc2kt PnBkYXRhLT5tb2RlX3ZhbGlkKGNvbm5lY3RvciwgbW9kZSk7Cj4+Pj4gLQo+Pj4+IC0JcmV0dXJu IG1vZGVfc3RhdHVzOwo+Pj4+IC19Cj4+Pj4gLQo+Pj4+ICAgc3RhdGljIHN0cnVjdCBkcm1fY29u bmVjdG9yX2hlbHBlcl9mdW5jcyBkd19taXBpX2RzaV9jb25uZWN0b3JfaGVscGVyX2Z1bmNzID0g ewo+Pj4+ICAgCS5nZXRfbW9kZXMgPSBkd19taXBpX2RzaV9jb25uZWN0b3JfZ2V0X21vZGVzLAo+ Pj4+IC0JLm1vZGVfdmFsaWQgPSBkd19taXBpX2RzaV9tb2RlX3ZhbGlkLAo+Pj4+ICAgfTsKPj4+ PiAgIHN0YXRpYyB2b2lkIGR3X21pcGlfZHNpX2RybV9jb25uZWN0b3JfZGVzdHJveShzdHJ1Y3Qg ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQo+Pj4+IEBAIC0xMTY4LDMzICsxMTUxLDExIEBAIHN0 YXRpYyBpbnQgcm9ja2NoaXBfbWlwaV9wYXJzZV9kdChzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSkK Pj4+PiAgIAlyZXR1cm4gMDsKPj4+PiAgIH0KPj4+PiAtc3RhdGljIGVudW0gZHJtX21vZGVfc3Rh dHVzIHJrMzI4OF9taXBpX2RzaV9tb2RlX3ZhbGlkKAo+Pj4+IC0JCQkJCXN0cnVjdCBkcm1fY29u bmVjdG9yICpjb25uZWN0b3IsCj4+Pj4gLQkJCQkJc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1v ZGUpCj4+Pj4gLXsKPj4+PiAtCS8qCj4+Pj4gLQkgKiBUaGUgVklEX1BLVF9TSVpFIGZpZWxkIGlu IHRoZSBEU0lfVklEX1BLVF9DRkcKPj4+PiAtCSAqIHJlZ2lzdGVyIGlzIDExLWJpdC4KPj4+PiAt CSAqLwo+Pj4+IC0JaWYgKG1vZGUtPmhkaXNwbGF5ID4gMHg3ZmYpCj4+Pj4gLQkJcmV0dXJuIE1P REVfQkFEX0hWQUxVRTsKPj4+PiAtCj4+Pj4gLQkvKgo+Pj4+IC0JICogVGhlIFZfQUNUSVZFX0xJ TkVTIGZpZWxkIGluIHRoZSBEU0lfVlRJTUlOR19DRkcKPj4+PiAtCSAqIHJlZ2lzdGVyIGlzIDEx LWJpdC4KPj4+PiAtCSAqLwo+Pj4+IC0JaWYgKG1vZGUtPnZkaXNwbGF5ID4gMHg3ZmYpCj4+Pj4g LQkJcmV0dXJuIE1PREVfQkFEX1ZWQUxVRTsKPj4+PiAtCj4+Pj4gLQlyZXR1cm4gTU9ERV9PSzsK Pj4+PiAtfQo+Pj4+IC0KPj4+PiAgIHN0YXRpYyBzdHJ1Y3QgZHdfbWlwaV9kc2lfcGxhdF9kYXRh IHJrMzI4OF9taXBpX2RzaV9kcnZfZGF0YSA9IHsKPj4+PiAgIAkuZHNpMF9lbl9iaXQgPSBSSzMy ODhfRFNJMF9TRUxfVk9QX0xJVCwKPj4+PiAgIAkuZHNpMV9lbl9iaXQgPSBSSzMyODhfRFNJMV9T RUxfVk9QX0xJVCwKPj4+PiAgIAkuZ3JmX3N3aXRjaF9yZWcgPSBSSzMyODhfR1JGX1NPQ19DT042 LAo+Pj4+ICAgCS5tYXhfZGF0YV9sYW5lcyA9IDQsCj4+Pj4gLQkubW9kZV92YWxpZCA9IHJrMzI4 OF9taXBpX2RzaV9tb2RlX3ZhbGlkLAo+Pj4+ICAgfTsKPj4+PiAgIHN0YXRpYyBzdHJ1Y3QgZHdf bWlwaV9kc2lfcGxhdF9kYXRhIHJrMzM5OV9taXBpX2RzaV9kcnZfZGF0YSA9IHsKPj4+PiAtLSAK Pj4+PiAyLjYuMwo+Pj4+Cj4+Pj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KPj4+PiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4+Pj4gZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwo+Pj4+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCj4+Cj4+IF9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCj4+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPj4gZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+PiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: zyw@rock-chips.com (Chris Zhong) Date: Sun, 5 Feb 2017 11:42:42 +0800 Subject: [PATCH v3 3/5] drm/rockchip/dsi: remove mode_valid function In-Reply-To: <20170201181218.GA8595@art_vandelay> 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> <5886BB8F.6040707@rock-chips.com> <20170201181218.GA8595@art_vandelay> Message-ID: <58969F32.9010003@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 02/02/2017 02:12 AM, Sean Paul wrote: > On Tue, Jan 24, 2017 at 10:27:27AM +0800, Chris Zhong wrote: >> 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. > I don't see anything in the vop driver that rejects large modes for little vop. > So, while I agree the check shouldn't be here, you should move it to where it > should be instead of removing it entirely. > > Sean drm_mode_validate_size will check the dev->mode_config.max_width and dev->mode_config.max_height, these 2 value come from rockchip_drm_mode_config_init, currently, they are both 4096. So you are right, drm driver does not distinguish between vop lit and big. I think Mark Yao already have a local solution, and he will post it soon. > >>> >>>> 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 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel at lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel