From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752882AbdBHC0w (ORCPT ); Tue, 7 Feb 2017 21:26:52 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:36858 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751140AbdBHC0p (ORCPT ); Tue, 7 Feb 2017 21:26:45 -0500 From: Chris Zhong To: john@metanate.com, 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, seanpaul@chromium.org Cc: linux-rockchip@lists.infradead.org, Chris Zhong , Mark Yao , David Airlie , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 4/6] drm/rockchip/dsi: remove mode_valid function Date: Wed, 8 Feb 2017 10:25:20 +0800 Message-Id: <1486520722-8853-5-git-send-email-zyw@rock-chips.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1486520722-8853-1-git-send-email-zyw@rock-chips.com> References: <1486520722-8853-1-git-send-email-zyw@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Chris Zhong --- Changes in v6: None Changes in v5: None Changes in v4: None 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 6795190..a2b4ec4 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 { @@ -1077,23 +1075,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) @@ -1164,33 +1147,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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Zhong Subject: [PATCH v6 4/6] drm/rockchip/dsi: remove mode_valid function Date: Wed, 8 Feb 2017 10:25:20 +0800 Message-ID: <1486520722-8853-5-git-send-email-zyw@rock-chips.com> References: <1486520722-8853-1-git-send-email-zyw@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1486520722-8853-1-git-send-email-zyw@rock-chips.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: john@metanate.com, 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, seanpaul@chromium.org Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Chris Zhong , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org VGhlIE1JUEkgRFNJIGRvIG5vdCBuZWVkIGNoZWNrIHRoZSB2YWxpZGl0eSBvZiByZXNvbHV0aW9u LCB0aGUgbWF4CnJlc29sdXRpb24gc2hvdWxkIGRlcGVuZCBWT1AuIEhlbmNlLCByZW1vdmUgcmsz Mjg4X21pcGlfZHNpX21vZGVfdmFsaWQKaGVyZS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFpob25n IDx6eXdAcm9jay1jaGlwcy5jb20+Ci0tLQoKQ2hhbmdlcyBpbiB2NjogTm9uZQpDaGFuZ2VzIGlu IHY1OiBOb25lCkNoYW5nZXMgaW4gdjQ6IE5vbmUKQ2hhbmdlcyBpbiB2MzogTm9uZQoKIGRyaXZl cnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jIHwgMzkgLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM5IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jIGIvZHJpdmVycy9n cHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKaW5kZXggNjc5NTE5MC4uYTJiNGVjNCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKQEAgLTI3OCw4ICsyNzgsNiBAQCBz dHJ1Y3QgZHdfbWlwaV9kc2lfcGxhdF9kYXRhIHsKIAl1MzIgZ3JmX2RzaTBfbW9kZTsKIAl1MzIg Z3JmX2RzaTBfbW9kZV9yZWc7CiAJdW5zaWduZWQgaW50IG1heF9kYXRhX2xhbmVzOwotCWVudW0g ZHJtX21vZGVfc3RhdHVzICgqbW9kZV92YWxpZCkoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5l Y3RvciwKLQkJCQkJICAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpOwogfTsKIAogc3Ry dWN0IGR3X21pcGlfZHNpIHsKQEAgLTEwNzcsMjMgKzEwNzUsOCBAQCBzdGF0aWMgaW50IGR3X21p cGlfZHNpX2Nvbm5lY3Rvcl9nZXRfbW9kZXMoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv cikKIAlyZXR1cm4gZHJtX3BhbmVsX2dldF9tb2Rlcyhkc2ktPnBhbmVsKTsKIH0KIAotc3RhdGlj IGVudW0gZHJtX21vZGVfc3RhdHVzIGR3X21pcGlfZHNpX21vZGVfdmFsaWQoCi0JCQkJCXN0cnVj dCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCi0JCQkJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2Rl ICptb2RlKQotewotCXN0cnVjdCBkd19taXBpX2RzaSAqZHNpID0gY29uX3RvX2RzaShjb25uZWN0 b3IpOwotCi0JZW51bSBkcm1fbW9kZV9zdGF0dXMgbW9kZV9zdGF0dXMgPSBNT0RFX09LOwotCi0J aWYgKGRzaS0+cGRhdGEtPm1vZGVfdmFsaWQpCi0JCW1vZGVfc3RhdHVzID0gZHNpLT5wZGF0YS0+ bW9kZV92YWxpZChjb25uZWN0b3IsIG1vZGUpOwotCi0JcmV0dXJuIG1vZGVfc3RhdHVzOwotfQot CiBzdGF0aWMgc3RydWN0IGRybV9jb25uZWN0b3JfaGVscGVyX2Z1bmNzIGR3X21pcGlfZHNpX2Nv bm5lY3Rvcl9oZWxwZXJfZnVuY3MgPSB7CiAJLmdldF9tb2RlcyA9IGR3X21pcGlfZHNpX2Nvbm5l Y3Rvcl9nZXRfbW9kZXMsCi0JLm1vZGVfdmFsaWQgPSBkd19taXBpX2RzaV9tb2RlX3ZhbGlkLAog fTsKIAogc3RhdGljIHZvaWQgZHdfbWlwaV9kc2lfZHJtX2Nvbm5lY3Rvcl9kZXN0cm95KHN0cnVj dCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCkBAIC0xMTY0LDMzICsxMTQ3LDExIEBAIHN0YXRp YyBpbnQgcm9ja2NoaXBfbWlwaV9wYXJzZV9kdChzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSkKIAly ZXR1cm4gMDsKIH0KIAotc3RhdGljIGVudW0gZHJtX21vZGVfc3RhdHVzIHJrMzI4OF9taXBpX2Rz aV9tb2RlX3ZhbGlkKAotCQkJCQlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAotCQkJ CQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSkKLXsKLQkvKgotCSAqIFRoZSBWSURfUEtU X1NJWkUgZmllbGQgaW4gdGhlIERTSV9WSURfUEtUX0NGRwotCSAqIHJlZ2lzdGVyIGlzIDExLWJp dC4KLQkgKi8KLQlpZiAobW9kZS0+aGRpc3BsYXkgPiAweDdmZikKLQkJcmV0dXJuIE1PREVfQkFE X0hWQUxVRTsKLQotCS8qCi0JICogVGhlIFZfQUNUSVZFX0xJTkVTIGZpZWxkIGluIHRoZSBEU0lf VlRJTUlOR19DRkcKLQkgKiByZWdpc3RlciBpcyAxMS1iaXQuCi0JICovCi0JaWYgKG1vZGUtPnZk aXNwbGF5ID4gMHg3ZmYpCi0JCXJldHVybiBNT0RFX0JBRF9WVkFMVUU7Ci0KLQlyZXR1cm4gTU9E RV9PSzsKLX0KLQogc3RhdGljIHN0cnVjdCBkd19taXBpX2RzaV9wbGF0X2RhdGEgcmszMjg4X21p cGlfZHNpX2Rydl9kYXRhID0gewogCS5kc2kwX2VuX2JpdCA9IFJLMzI4OF9EU0kwX1NFTF9WT1Bf TElULAogCS5kc2kxX2VuX2JpdCA9IFJLMzI4OF9EU0kxX1NFTF9WT1BfTElULAogCS5ncmZfc3dp dGNoX3JlZyA9IFJLMzI4OF9HUkZfU09DX0NPTjYsCiAJLm1heF9kYXRhX2xhbmVzID0gNCwKLQku bW9kZV92YWxpZCA9IHJrMzI4OF9taXBpX2RzaV9tb2RlX3ZhbGlkLAogfTsKIAogc3RhdGljIHN0 cnVjdCBkd19taXBpX2RzaV9wbGF0X2RhdGEgcmszMzk5X21pcGlfZHNpX2Rydl9kYXRhID0gewot LSAKMi42LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: zyw@rock-chips.com (Chris Zhong) Date: Wed, 8 Feb 2017 10:25:20 +0800 Subject: [PATCH v6 4/6] drm/rockchip/dsi: remove mode_valid function In-Reply-To: <1486520722-8853-1-git-send-email-zyw@rock-chips.com> References: <1486520722-8853-1-git-send-email-zyw@rock-chips.com> Message-ID: <1486520722-8853-5-git-send-email-zyw@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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. Signed-off-by: Chris Zhong --- Changes in v6: None Changes in v5: None Changes in v4: None 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 6795190..a2b4ec4 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 { @@ -1077,23 +1075,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) @@ -1164,33 +1147,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