From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966026AbbLQDi3 (ORCPT ); Wed, 16 Dec 2015 22:38:29 -0500 Received: from regular1.263xmail.com ([211.150.99.138]:52039 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754636AbbLQDi0 (ORCPT ); Wed, 16 Dec 2015 22:38:26 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: mark.yao@rock-chips.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <13003d9bae9c45694b7aec97e87c2916> 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/6] drm/rockchip: vop: merge vop cfg_done into vop_data Date: Thu, 17 Dec 2015 11:37:01 +0800 Message-Id: <1450323426-32109-2-git-send-email-mark.yao@rock-chips.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1450323426-32109-1-git-send-email-mark.yao@rock-chips.com> References: <1450323426-32109-1-git-send-email-mark.yao@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move cfg_done register into vop_data, so it can use at multi-vop driver Signed-off-by: Mark Yao --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 6ded4cc..dcb1396 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -164,6 +164,8 @@ struct vop_ctrl { struct vop_reg vact_st_end; struct vop_reg hpost_st_end; struct vop_reg vpost_st_end; + + struct vop_reg cfg_done; }; struct vop_scl_regs { @@ -333,6 +335,7 @@ static const struct vop_ctrl ctrl_data = { .vact_st_end = VOP_REG(DSP_VACT_ST_END, 0x1fff1fff, 0), .hpost_st_end = VOP_REG(POST_DSP_HACT_INFO, 0x1fff1fff, 0), .vpost_st_end = VOP_REG(POST_DSP_VACT_INFO, 0x1fff1fff, 0), + .cfg_done = VOP_REG(REG_CFG_DONE, 0x1, 0), }; static const struct vop_reg_data vop_init_reg_table[] = { @@ -393,11 +396,6 @@ static inline uint32_t vop_read_reg(struct vop *vop, uint32_t base, return (vop_readl(vop, base + reg->offset) >> reg->shift) & reg->mask; } -static inline void vop_cfg_done(struct vop *vop) -{ - writel(0x01, vop->regs + REG_CFG_DONE); -} - static inline void vop_mask_write(struct vop *vop, uint32_t offset, uint32_t mask, uint32_t v) { @@ -422,6 +420,11 @@ static inline void vop_mask_write_relaxed(struct vop *vop, uint32_t offset, } } +static inline void vop_cfg_done(struct vop *vop) +{ + VOP_CTRL_SET(vop, cfg_done, 1); +} + static bool has_rb_swapped(uint32_t format) { switch (format) { -- 1.7.9.5 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Yao Subject: [PATCH 1/6] drm/rockchip: vop: merge vop cfg_done into vop_data Date: Thu, 17 Dec 2015 11:37:01 +0800 Message-ID: <1450323426-32109-2-git-send-email-mark.yao@rock-chips.com> References: <1450323426-32109-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: In-Reply-To: <1450323426-32109-1-git-send-email-mark.yao@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: 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 TW92ZSBjZmdfZG9uZSByZWdpc3RlciBpbnRvIHZvcF9kYXRhLCBzbyBpdCBjYW4gdXNlIGF0IG11 bHRpLXZvcCBkcml2ZXIKClNpZ25lZC1vZmYtYnk6IE1hcmsgWWFvIDxtYXJrLnlhb0Byb2NrLWNo aXBzLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5j IHwgICAxMyArKysrKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA1 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2Nr Y2hpcF9kcm1fdm9wLmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3Zv cC5jCmluZGV4IDZkZWQ0Y2MuLmRjYjEzOTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9y b2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlw L3JvY2tjaGlwX2RybV92b3AuYwpAQCAtMTY0LDYgKzE2NCw4IEBAIHN0cnVjdCB2b3BfY3RybCB7 CiAJc3RydWN0IHZvcF9yZWcgdmFjdF9zdF9lbmQ7CiAJc3RydWN0IHZvcF9yZWcgaHBvc3Rfc3Rf ZW5kOwogCXN0cnVjdCB2b3BfcmVnIHZwb3N0X3N0X2VuZDsKKworCXN0cnVjdCB2b3BfcmVnIGNm Z19kb25lOwogfTsKIAogc3RydWN0IHZvcF9zY2xfcmVncyB7CkBAIC0zMzMsNiArMzM1LDcgQEAg c3RhdGljIGNvbnN0IHN0cnVjdCB2b3BfY3RybCBjdHJsX2RhdGEgPSB7CiAJLnZhY3Rfc3RfZW5k ID0gVk9QX1JFRyhEU1BfVkFDVF9TVF9FTkQsIDB4MWZmZjFmZmYsIDApLAogCS5ocG9zdF9zdF9l bmQgPSBWT1BfUkVHKFBPU1RfRFNQX0hBQ1RfSU5GTywgMHgxZmZmMWZmZiwgMCksCiAJLnZwb3N0 X3N0X2VuZCA9IFZPUF9SRUcoUE9TVF9EU1BfVkFDVF9JTkZPLCAweDFmZmYxZmZmLCAwKSwKKwku Y2ZnX2RvbmUgPSBWT1BfUkVHKFJFR19DRkdfRE9ORSwgMHgxLCAwKSwKIH07CiAKIHN0YXRpYyBj b25zdCBzdHJ1Y3Qgdm9wX3JlZ19kYXRhIHZvcF9pbml0X3JlZ190YWJsZVtdID0gewpAQCAtMzkz LDExICszOTYsNiBAQCBzdGF0aWMgaW5saW5lIHVpbnQzMl90IHZvcF9yZWFkX3JlZyhzdHJ1Y3Qg dm9wICp2b3AsIHVpbnQzMl90IGJhc2UsCiAJcmV0dXJuICh2b3BfcmVhZGwodm9wLCBiYXNlICsg cmVnLT5vZmZzZXQpID4+IHJlZy0+c2hpZnQpICYgcmVnLT5tYXNrOwogfQogCi1zdGF0aWMgaW5s aW5lIHZvaWQgdm9wX2NmZ19kb25lKHN0cnVjdCB2b3AgKnZvcCkKLXsKLQl3cml0ZWwoMHgwMSwg dm9wLT5yZWdzICsgUkVHX0NGR19ET05FKTsKLX0KLQogc3RhdGljIGlubGluZSB2b2lkIHZvcF9t YXNrX3dyaXRlKHN0cnVjdCB2b3AgKnZvcCwgdWludDMyX3Qgb2Zmc2V0LAogCQkJCSAgdWludDMy X3QgbWFzaywgdWludDMyX3QgdikKIHsKQEAgLTQyMiw2ICs0MjAsMTEgQEAgc3RhdGljIGlubGlu ZSB2b2lkIHZvcF9tYXNrX3dyaXRlX3JlbGF4ZWQoc3RydWN0IHZvcCAqdm9wLCB1aW50MzJfdCBv ZmZzZXQsCiAJfQogfQogCitzdGF0aWMgaW5saW5lIHZvaWQgdm9wX2NmZ19kb25lKHN0cnVjdCB2 b3AgKnZvcCkKK3sKKwlWT1BfQ1RSTF9TRVQodm9wLCBjZmdfZG9uZSwgMSk7Cit9CisKIHN0YXRp YyBib29sIGhhc19yYl9zd2FwcGVkKHVpbnQzMl90IGZvcm1hdCkKIHsKIAlzd2l0Y2ggKGZvcm1h dCkgewotLSAKMS43LjkuNQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark Yao) Date: Thu, 17 Dec 2015 11:37:01 +0800 Subject: [PATCH 1/6] drm/rockchip: vop: merge vop cfg_done into vop_data In-Reply-To: <1450323426-32109-1-git-send-email-mark.yao@rock-chips.com> References: <1450323426-32109-1-git-send-email-mark.yao@rock-chips.com> Message-ID: <1450323426-32109-2-git-send-email-mark.yao@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Move cfg_done register into vop_data, so it can use at multi-vop driver Signed-off-by: Mark Yao --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 6ded4cc..dcb1396 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -164,6 +164,8 @@ struct vop_ctrl { struct vop_reg vact_st_end; struct vop_reg hpost_st_end; struct vop_reg vpost_st_end; + + struct vop_reg cfg_done; }; struct vop_scl_regs { @@ -333,6 +335,7 @@ static const struct vop_ctrl ctrl_data = { .vact_st_end = VOP_REG(DSP_VACT_ST_END, 0x1fff1fff, 0), .hpost_st_end = VOP_REG(POST_DSP_HACT_INFO, 0x1fff1fff, 0), .vpost_st_end = VOP_REG(POST_DSP_VACT_INFO, 0x1fff1fff, 0), + .cfg_done = VOP_REG(REG_CFG_DONE, 0x1, 0), }; static const struct vop_reg_data vop_init_reg_table[] = { @@ -393,11 +396,6 @@ static inline uint32_t vop_read_reg(struct vop *vop, uint32_t base, return (vop_readl(vop, base + reg->offset) >> reg->shift) & reg->mask; } -static inline void vop_cfg_done(struct vop *vop) -{ - writel(0x01, vop->regs + REG_CFG_DONE); -} - static inline void vop_mask_write(struct vop *vop, uint32_t offset, uint32_t mask, uint32_t v) { @@ -422,6 +420,11 @@ static inline void vop_mask_write_relaxed(struct vop *vop, uint32_t offset, } } +static inline void vop_cfg_done(struct vop *vop) +{ + VOP_CTRL_SET(vop, cfg_done, 1); +} + static bool has_rb_swapped(uint32_t format) { switch (format) { -- 1.7.9.5