From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751289AbdBUCmB (ORCPT ); Mon, 20 Feb 2017 21:42:01 -0500 Received: from regular1.263xmail.com ([211.150.99.134]:43763 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751043AbdBUCmA (ORCPT ); Mon, 20 Feb 2017 21:42: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: mark.yao@rock-chips.com X-FST-TO: airlied@linux.ie X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <222c7585df6675e08c4a3ff6f154390f> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Mark Yao To: David Airlie , Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Mark Yao Subject: [PATCH 1/2] drm/rockchip: vop: verify display mode with vop max_output Date: Tue, 21 Feb 2017 10:41:24 +0800 Message-Id: <1487644885-22492-1-git-send-email-mark.yao@rock-chips.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Mark Yao --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 ++++++ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +++++++++++++ 3 files changed, 26 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 8dab2af..7ec5d7f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -867,6 +867,12 @@ static bool vop_crtc_mode_fixup(struct drm_crtc *crtc, struct drm_display_mode *adjusted_mode) { struct vop *vop = to_vop(crtc); + const struct vop_data *vop_data = vop->data; + + if (mode->hdisplay > vop_data->max_output.width) + return false; + if (mode->vdisplay > vop_data->max_output.height) + return false; adjusted_mode->clock = clk_round_rate(vop->dclk, mode->clock * 1000) / 1000; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 5a4faa85..de5a714 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -135,6 +135,11 @@ struct vop_win_data { enum drm_plane_type type; }; +struct vop_rect { + int width; + int height; +}; + struct vop_data { const struct vop_reg_data *init_table; unsigned int table_size; @@ -142,6 +147,8 @@ struct vop_data { const struct vop_intr *intr; const struct vop_win_data *win; unsigned int win_size; + struct vop_rect max_input; + struct vop_rect max_output; }; /* interrupt define */ diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index 91fbc7b..f4ffb677 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -132,6 +132,8 @@ }; static const struct vop_data rk3036_vop = { + .max_input = {1920, 1080}, + .max_output = {1920, 1080}, .init_table = rk3036_vop_init_reg_table, .table_size = ARRAY_SIZE(rk3036_vop_init_reg_table), .ctrl = &rk3036_ctrl_data, @@ -273,6 +275,13 @@ }; static const struct vop_data rk3288_vop = { + .max_input = {4096, 8192}, + /* + * TODO: rk3288 have two vop, big one support 3840x2160, + * little one only support 2560x1600. + * Now force use 3840x2160. + */ + .max_output = {3840, 2160}, .init_table = rk3288_init_reg_table, .table_size = ARRAY_SIZE(rk3288_init_reg_table), .intr = &rk3288_vop_intr, @@ -341,6 +350,8 @@ }; static const struct vop_data rk3399_vop_big = { + .max_input = {4096, 8192}, + .max_output = {4096, 2160}, .init_table = rk3399_init_reg_table, .table_size = ARRAY_SIZE(rk3399_init_reg_table), .intr = &rk3399_vop_intr, @@ -360,6 +371,8 @@ }; static const struct vop_data rk3399_vop_lit = { + .max_input = {4096, 8192}, + .max_output = {2560, 1600}, .init_table = rk3399_init_reg_table, .table_size = ARRAY_SIZE(rk3399_init_reg_table), .intr = &rk3399_vop_intr, -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Yao Subject: [PATCH 1/2] drm/rockchip: vop: verify display mode with vop max_output Date: Tue, 21 Feb 2017 10:41:24 +0800 Message-ID: <1487644885-22492-1-git-send-email-mark.yao@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie , Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org List-Id: linux-rockchip.vger.kernel.org U2lnbmVkLW9mZi1ieTogTWFyayBZYW8gPG1hcmsueWFvQHJvY2stY2hpcHMuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMgfCAgNiArKysrKysKIGRy aXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmggfCAgNyArKysrKysrCiBk cml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfdm9wX3JlZy5jIHwgMTMgKysrKysrKysr KysrKwogMyBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3AuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMKaW5kZXggOGRhYjJhZi4uN2VjNWQ3ZiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3AuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jCkBAIC04NjcsNiAr ODY3LDEyIEBAIHN0YXRpYyBib29sIHZvcF9jcnRjX21vZGVfZml4dXAoc3RydWN0IGRybV9jcnRj ICpjcnRjLAogCQkJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlKQogewog CXN0cnVjdCB2b3AgKnZvcCA9IHRvX3ZvcChjcnRjKTsKKwljb25zdCBzdHJ1Y3Qgdm9wX2RhdGEg KnZvcF9kYXRhID0gdm9wLT5kYXRhOworCisJaWYgKG1vZGUtPmhkaXNwbGF5ID4gdm9wX2RhdGEt Pm1heF9vdXRwdXQud2lkdGgpCisJCXJldHVybiBmYWxzZTsKKwlpZiAobW9kZS0+dmRpc3BsYXkg PiB2b3BfZGF0YS0+bWF4X291dHB1dC5oZWlnaHQpCisJCXJldHVybiBmYWxzZTsKIAogCWFkanVz dGVkX21vZGUtPmNsb2NrID0KIAkJY2xrX3JvdW5kX3JhdGUodm9wLT5kY2xrLCBtb2RlLT5jbG9j ayAqIDEwMDApIC8gMTAwMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9y b2NrY2hpcF9kcm1fdm9wLmggYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJt X3ZvcC5oCmluZGV4IDVhNGZhYTg1Li5kZTVhNzE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2Nr Y2hpcC9yb2NrY2hpcF9kcm1fdm9wLmgKQEAgLTEzNSw2ICsxMzUsMTEgQEAgc3RydWN0IHZvcF93 aW5fZGF0YSB7CiAJZW51bSBkcm1fcGxhbmVfdHlwZSB0eXBlOwogfTsKIAorc3RydWN0IHZvcF9y ZWN0IHsKKwlpbnQgd2lkdGg7CisJaW50IGhlaWdodDsKK307CisKIHN0cnVjdCB2b3BfZGF0YSB7 CiAJY29uc3Qgc3RydWN0IHZvcF9yZWdfZGF0YSAqaW5pdF90YWJsZTsKIAl1bnNpZ25lZCBpbnQg dGFibGVfc2l6ZTsKQEAgLTE0Miw2ICsxNDcsOCBAQCBzdHJ1Y3Qgdm9wX2RhdGEgewogCWNvbnN0 IHN0cnVjdCB2b3BfaW50ciAqaW50cjsKIAljb25zdCBzdHJ1Y3Qgdm9wX3dpbl9kYXRhICp3aW47 CiAJdW5zaWduZWQgaW50IHdpbl9zaXplOworCXN0cnVjdCB2b3BfcmVjdCBtYXhfaW5wdXQ7CisJ c3RydWN0IHZvcF9yZWN0IG1heF9vdXRwdXQ7CiB9OwogCiAvKiBpbnRlcnJ1cHQgZGVmaW5lICov CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfdm9wX3JlZy5j IGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX3ZvcF9yZWcuYwppbmRleCA5MWZi YzdiLi5mNGZmYjY3NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tj aGlwX3ZvcF9yZWcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfdm9w X3JlZy5jCkBAIC0xMzIsNiArMTMyLDggQEAKIH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgdm9w X2RhdGEgcmszMDM2X3ZvcCA9IHsKKwkubWF4X2lucHV0ID0gezE5MjAsIDEwODB9LAorCS5tYXhf b3V0cHV0ID0gezE5MjAsIDEwODB9LAogCS5pbml0X3RhYmxlID0gcmszMDM2X3ZvcF9pbml0X3Jl Z190YWJsZSwKIAkudGFibGVfc2l6ZSA9IEFSUkFZX1NJWkUocmszMDM2X3ZvcF9pbml0X3JlZ190 YWJsZSksCiAJLmN0cmwgPSAmcmszMDM2X2N0cmxfZGF0YSwKQEAgLTI3Myw2ICsyNzUsMTMgQEAK IH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgdm9wX2RhdGEgcmszMjg4X3ZvcCA9IHsKKwkubWF4 X2lucHV0ID0gezQwOTYsIDgxOTJ9LAorCS8qCisJICogVE9ETzogcmszMjg4IGhhdmUgdHdvIHZv cCwgYmlnIG9uZSBzdXBwb3J0IDM4NDB4MjE2MCwKKwkgKiBsaXR0bGUgb25lIG9ubHkgc3VwcG9y dCAyNTYweDE2MDAuCisJICogTm93IGZvcmNlIHVzZSAzODQweDIxNjAuCisJICovCisJLm1heF9v dXRwdXQgPSB7Mzg0MCwgMjE2MH0sCiAJLmluaXRfdGFibGUgPSByazMyODhfaW5pdF9yZWdfdGFi bGUsCiAJLnRhYmxlX3NpemUgPSBBUlJBWV9TSVpFKHJrMzI4OF9pbml0X3JlZ190YWJsZSksCiAJ LmludHIgPSAmcmszMjg4X3ZvcF9pbnRyLApAQCAtMzQxLDYgKzM1MCw4IEBACiB9OwogCiBzdGF0 aWMgY29uc3Qgc3RydWN0IHZvcF9kYXRhIHJrMzM5OV92b3BfYmlnID0geworCS5tYXhfaW5wdXQg PSB7NDA5NiwgODE5Mn0sCisJLm1heF9vdXRwdXQgPSB7NDA5NiwgMjE2MH0sCiAJLmluaXRfdGFi bGUgPSByazMzOTlfaW5pdF9yZWdfdGFibGUsCiAJLnRhYmxlX3NpemUgPSBBUlJBWV9TSVpFKHJr MzM5OV9pbml0X3JlZ190YWJsZSksCiAJLmludHIgPSAmcmszMzk5X3ZvcF9pbnRyLApAQCAtMzYw LDYgKzM3MSw4IEBACiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IHZvcF9kYXRhIHJrMzM5OV92 b3BfbGl0ID0geworCS5tYXhfaW5wdXQgPSB7NDA5NiwgODE5Mn0sCisJLm1heF9vdXRwdXQgPSB7 MjU2MCwgMTYwMH0sCiAJLmluaXRfdGFibGUgPSByazMzOTlfaW5pdF9yZWdfdGFibGUsCiAJLnRh YmxlX3NpemUgPSBBUlJBWV9TSVpFKHJrMzM5OV9pbml0X3JlZ190YWJsZSksCiAJLmludHIgPSAm cmszMzk5X3ZvcF9pbnRyLAotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark Yao) Date: Tue, 21 Feb 2017 10:41:24 +0800 Subject: [PATCH 1/2] drm/rockchip: vop: verify display mode with vop max_output Message-ID: <1487644885-22492-1-git-send-email-mark.yao@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Signed-off-by: Mark Yao --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 ++++++ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 13 +++++++++++++ 3 files changed, 26 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 8dab2af..7ec5d7f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -867,6 +867,12 @@ static bool vop_crtc_mode_fixup(struct drm_crtc *crtc, struct drm_display_mode *adjusted_mode) { struct vop *vop = to_vop(crtc); + const struct vop_data *vop_data = vop->data; + + if (mode->hdisplay > vop_data->max_output.width) + return false; + if (mode->vdisplay > vop_data->max_output.height) + return false; adjusted_mode->clock = clk_round_rate(vop->dclk, mode->clock * 1000) / 1000; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 5a4faa85..de5a714 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -135,6 +135,11 @@ struct vop_win_data { enum drm_plane_type type; }; +struct vop_rect { + int width; + int height; +}; + struct vop_data { const struct vop_reg_data *init_table; unsigned int table_size; @@ -142,6 +147,8 @@ struct vop_data { const struct vop_intr *intr; const struct vop_win_data *win; unsigned int win_size; + struct vop_rect max_input; + struct vop_rect max_output; }; /* interrupt define */ diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index 91fbc7b..f4ffb677 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -132,6 +132,8 @@ }; static const struct vop_data rk3036_vop = { + .max_input = {1920, 1080}, + .max_output = {1920, 1080}, .init_table = rk3036_vop_init_reg_table, .table_size = ARRAY_SIZE(rk3036_vop_init_reg_table), .ctrl = &rk3036_ctrl_data, @@ -273,6 +275,13 @@ }; static const struct vop_data rk3288_vop = { + .max_input = {4096, 8192}, + /* + * TODO: rk3288 have two vop, big one support 3840x2160, + * little one only support 2560x1600. + * Now force use 3840x2160. + */ + .max_output = {3840, 2160}, .init_table = rk3288_init_reg_table, .table_size = ARRAY_SIZE(rk3288_init_reg_table), .intr = &rk3288_vop_intr, @@ -341,6 +350,8 @@ }; static const struct vop_data rk3399_vop_big = { + .max_input = {4096, 8192}, + .max_output = {4096, 2160}, .init_table = rk3399_init_reg_table, .table_size = ARRAY_SIZE(rk3399_init_reg_table), .intr = &rk3399_vop_intr, @@ -360,6 +371,8 @@ }; static const struct vop_data rk3399_vop_lit = { + .max_input = {4096, 8192}, + .max_output = {2560, 1600}, .init_table = rk3399_init_reg_table, .table_size = ARRAY_SIZE(rk3399_init_reg_table), .intr = &rk3399_vop_intr, -- 1.9.1