From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bibby Hsieh Subject: [PATCH v4 2/4] drm/mediatek: Add GAMMA engine basic function Date: Thu, 28 Jul 2016 10:22:53 +0800 Message-ID: <1469672575-5847-3-git-send-email-bibby.hsieh@mediatek.com> References: <1469672575-5847-1-git-send-email-bibby.hsieh@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1469672575-5847-1-git-send-email-bibby.hsieh@mediatek.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 , Matthias Brugger , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Cawa Cheng , Mao Huang , Yingjoe Chen , Sascha Hauer , linux-arm-kernel@lists.infradead.org List-Id: linux-mediatek@lists.infradead.org SW4gb3JkZXIgdG8gY29ycmVjdCBicmlnaHRuZXNzIHZhbHVlcywgd2UgaGF2ZQp0byBzdXBwb3J0 IGdhbW1hIGZ1bmNpdG9uIG9uIE1UODE3My4gSW4gTVQ4MTczLAp3ZSBoYXZlIHR3byBlbmdpbmVz IGZvciBzdXBwb3J0aW5nIGdhbW1hIGZ1bmN0aW9uOgpBQUwgYW5kIEdBTU1BLiBUaGlzIHBhdGNo IGFkZCBzb21lIEdBTU1BIGVuZ2luZQpiYXNpYyBmdW5jdGlvbiwgaW5jbHVkZSBjb25maWcsIHN0 YXJ0IGFuZCBzdG9wCmZ1bmN0aW9uLgoKU2lnbmVkLW9mZi1ieTogQmliYnkgSHNpZWggPGJpYmJ5 LmhzaWVoQG1lZGlhdGVrLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Ry bV9kZHBfY29tcC5jIHwgICAyOSArKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDEgZmlsZSBj aGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZGRwX2NvbXAuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9tZWRpYXRlay9tdGtfZHJtX2RkcF9jb21wLmMKaW5kZXggNWZjOTY3MS4uYmE4OTVjOCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZGRwX2NvbXAuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9kZHBfY29tcC5jCkBAIC00MSw2ICs0 MSw5IEBACiAjZGVmaW5lIERJU1BfQUFMX0VOCQkJCTB4MDAwMAogI2RlZmluZSBESVNQX0FBTF9T SVpFCQkJCTB4MDAzMAogCisjZGVmaW5lIERJU1BfR0FNTUFfRU4JCQkJMHgwMDAwCisjZGVmaW5l IERJU1BfR0FNTUFfU0laRQkJCQkweDAwMzAKKwogI2RlZmluZQlPRF9SRUxBWV9NT0RFCQlCSVQo MCkKIAogI2RlZmluZQlVRk9fQllQQVNTCQlCSVQoMikKQEAgLTUwLDYgKzUzLDggQEAKIAogI2Rl ZmluZSBBQUxfRU4JCQlCSVQoMCkKIAorI2RlZmluZSBHQU1NQV9FTgkJQklUKDApCisKIHN0YXRp YyB2b2lkIG10a19jb2xvcl9jb25maWcoc3RydWN0IG10a19kZHBfY29tcCAqY29tcCwgdW5zaWdu ZWQgaW50IHcsCiAJCQkgICAgIHVuc2lnbmVkIGludCBoLCB1bnNpZ25lZCBpbnQgdnJlZnJlc2gp CiB7CkBAIC05NywxMiArMTAyLDM0IEBAIHN0YXRpYyB2b2lkIG10a19hYWxfc3RvcChzdHJ1Y3Qg bXRrX2RkcF9jb21wICpjb21wKQogCXdyaXRlbF9yZWxheGVkKDB4MCwgY29tcC0+cmVncyArIERJ U1BfQUFMX0VOKTsKIH0KIAorc3RhdGljIHZvaWQgbXRrX2dhbW1hX2NvbmZpZyhzdHJ1Y3QgbXRr X2RkcF9jb21wICpjb21wLCB1bnNpZ25lZCBpbnQgdywKKwkJCSAgICAgdW5zaWduZWQgaW50IGgs IHVuc2lnbmVkIGludCB2cmVmcmVzaCkKK3sKKwl3cml0ZWwoaCA8PCAxNiB8IHcsIGNvbXAtPnJl Z3MgKyBESVNQX0dBTU1BX1NJWkUpOworfQorCitzdGF0aWMgdm9pZCBtdGtfZ2FtbWFfc3RhcnQo c3RydWN0IG10a19kZHBfY29tcCAqY29tcCkKK3sKKwl3cml0ZWwoR0FNTUFfRU4sIGNvbXAtPnJl Z3MgICsgRElTUF9HQU1NQV9FTik7Cit9CisKK3N0YXRpYyB2b2lkIG10a19nYW1tYV9zdG9wKHN0 cnVjdCBtdGtfZGRwX2NvbXAgKmNvbXApCit7CisJd3JpdGVsX3JlbGF4ZWQoMHgwLCBjb21wLT5y ZWdzICArIERJU1BfR0FNTUFfRU4pOworfQorCiBzdGF0aWMgY29uc3Qgc3RydWN0IG10a19kZHBf Y29tcF9mdW5jcyBkZHBfYWFsID0gewogCS5jb25maWcgPSBtdGtfYWFsX2NvbmZpZywKIAkuc3Rh cnQgPSBtdGtfYWFsX3N0YXJ0LAogCS5zdG9wID0gbXRrX2FhbF9zdG9wLAogfTsKIAorc3RhdGlj IGNvbnN0IHN0cnVjdCBtdGtfZGRwX2NvbXBfZnVuY3MgZGRwX2dhbW1hID0geworCS5jb25maWcg PSBtdGtfZ2FtbWFfY29uZmlnLAorCS5zdGFydCA9IG10a19nYW1tYV9zdGFydCwKKwkuc3RvcCA9 IG10a19nYW1tYV9zdG9wLAorfTsKKwogc3RhdGljIGNvbnN0IHN0cnVjdCBtdGtfZGRwX2NvbXBf ZnVuY3MgZGRwX2NvbG9yID0gewogCS5jb25maWcgPSBtdGtfY29sb3JfY29uZmlnLAogCS5zdGFy dCA9IG10a19jb2xvcl9zdGFydCwKQEAgLTE0NSw3ICsxNzIsNyBAQCBzdGF0aWMgY29uc3Qgc3Ry dWN0IG10a19kZHBfY29tcF9tYXRjaCBtdGtfZGRwX21hdGNoZXNbRERQX0NPTVBPTkVOVF9JRF9N QVhdID0gewogCVtERFBfQ09NUE9ORU5UX0RQSTBdCT0geyBNVEtfRFBJLAkJMCwgTlVMTCB9LAog CVtERFBfQ09NUE9ORU5UX0RTSTBdCT0geyBNVEtfRFNJLAkJMCwgTlVMTCB9LAogCVtERFBfQ09N UE9ORU5UX0RTSTFdCT0geyBNVEtfRFNJLAkJMSwgTlVMTCB9LAotCVtERFBfQ09NUE9ORU5UX0dB TU1BXQk9IHsgTVRLX0RJU1BfR0FNTUEsCTAsIE5VTEwgfSwKKwlbRERQX0NPTVBPTkVOVF9HQU1N QV0JPSB7IE1US19ESVNQX0dBTU1BLAkwLCAmZGRwX2dhbW1hIH0sCiAJW0REUF9DT01QT05FTlRf T0RdCT0geyBNVEtfRElTUF9PRCwJMCwgJmRkcF9vZCB9LAogCVtERFBfQ09NUE9ORU5UX09WTDBd CT0geyBNVEtfRElTUF9PVkwsCTAsIE5VTEwgfSwKIAlbRERQX0NPTVBPTkVOVF9PVkwxXQk9IHsg TVRLX0RJU1BfT1ZMLAkxLCBOVUxMIH0sCi0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: bibby.hsieh@mediatek.com (Bibby Hsieh) Date: Thu, 28 Jul 2016 10:22:53 +0800 Subject: [PATCH v4 2/4] drm/mediatek: Add GAMMA engine basic function In-Reply-To: <1469672575-5847-1-git-send-email-bibby.hsieh@mediatek.com> References: <1469672575-5847-1-git-send-email-bibby.hsieh@mediatek.com> Message-ID: <1469672575-5847-3-git-send-email-bibby.hsieh@mediatek.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org In order to correct brightness values, we have to support gamma funciton on MT8173. In MT8173, we have two engines for supporting gamma function: AAL and GAMMA. This patch add some GAMMA engine basic function, include config, start and stop function. Signed-off-by: Bibby Hsieh --- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 29 ++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c index 5fc9671..ba895c8 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c @@ -41,6 +41,9 @@ #define DISP_AAL_EN 0x0000 #define DISP_AAL_SIZE 0x0030 +#define DISP_GAMMA_EN 0x0000 +#define DISP_GAMMA_SIZE 0x0030 + #define OD_RELAY_MODE BIT(0) #define UFO_BYPASS BIT(2) @@ -50,6 +53,8 @@ #define AAL_EN BIT(0) +#define GAMMA_EN BIT(0) + static void mtk_color_config(struct mtk_ddp_comp *comp, unsigned int w, unsigned int h, unsigned int vrefresh) { @@ -97,12 +102,34 @@ static void mtk_aal_stop(struct mtk_ddp_comp *comp) writel_relaxed(0x0, comp->regs + DISP_AAL_EN); } +static void mtk_gamma_config(struct mtk_ddp_comp *comp, unsigned int w, + unsigned int h, unsigned int vrefresh) +{ + writel(h << 16 | w, comp->regs + DISP_GAMMA_SIZE); +} + +static void mtk_gamma_start(struct mtk_ddp_comp *comp) +{ + writel(GAMMA_EN, comp->regs + DISP_GAMMA_EN); +} + +static void mtk_gamma_stop(struct mtk_ddp_comp *comp) +{ + writel_relaxed(0x0, comp->regs + DISP_GAMMA_EN); +} + static const struct mtk_ddp_comp_funcs ddp_aal = { .config = mtk_aal_config, .start = mtk_aal_start, .stop = mtk_aal_stop, }; +static const struct mtk_ddp_comp_funcs ddp_gamma = { + .config = mtk_gamma_config, + .start = mtk_gamma_start, + .stop = mtk_gamma_stop, +}; + static const struct mtk_ddp_comp_funcs ddp_color = { .config = mtk_color_config, .start = mtk_color_start, @@ -145,7 +172,7 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_DPI0] = { MTK_DPI, 0, NULL }, [DDP_COMPONENT_DSI0] = { MTK_DSI, 0, NULL }, [DDP_COMPONENT_DSI1] = { MTK_DSI, 1, NULL }, - [DDP_COMPONENT_GAMMA] = { MTK_DISP_GAMMA, 0, NULL }, + [DDP_COMPONENT_GAMMA] = { MTK_DISP_GAMMA, 0, &ddp_gamma }, [DDP_COMPONENT_OD] = { MTK_DISP_OD, 0, &ddp_od }, [DDP_COMPONENT_OVL0] = { MTK_DISP_OVL, 0, NULL }, [DDP_COMPONENT_OVL1] = { MTK_DISP_OVL, 1, NULL }, -- 1.7.9.5 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758823AbcG1CXQ (ORCPT ); Wed, 27 Jul 2016 22:23:16 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:25331 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754062AbcG1CXC (ORCPT ); Wed, 27 Jul 2016 22:23:02 -0400 From: Bibby Hsieh To: David Airlie , Matthias Brugger , Daniel Vetter , , CC: Yingjoe Chen , Cawa Cheng , Daniel Kurtz , Bibby Hsieh , Philipp Zabel , YT Shen , Thierry Reding , CK Hu , Mao Huang , , , Sascha Hauer Subject: [PATCH v4 2/4] drm/mediatek: Add GAMMA engine basic function Date: Thu, 28 Jul 2016 10:22:53 +0800 Message-ID: <1469672575-5847-3-git-send-email-bibby.hsieh@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1469672575-5847-1-git-send-email-bibby.hsieh@mediatek.com> References: <1469672575-5847-1-git-send-email-bibby.hsieh@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to correct brightness values, we have to support gamma funciton on MT8173. In MT8173, we have two engines for supporting gamma function: AAL and GAMMA. This patch add some GAMMA engine basic function, include config, start and stop function. Signed-off-by: Bibby Hsieh --- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 29 ++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c index 5fc9671..ba895c8 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c @@ -41,6 +41,9 @@ #define DISP_AAL_EN 0x0000 #define DISP_AAL_SIZE 0x0030 +#define DISP_GAMMA_EN 0x0000 +#define DISP_GAMMA_SIZE 0x0030 + #define OD_RELAY_MODE BIT(0) #define UFO_BYPASS BIT(2) @@ -50,6 +53,8 @@ #define AAL_EN BIT(0) +#define GAMMA_EN BIT(0) + static void mtk_color_config(struct mtk_ddp_comp *comp, unsigned int w, unsigned int h, unsigned int vrefresh) { @@ -97,12 +102,34 @@ static void mtk_aal_stop(struct mtk_ddp_comp *comp) writel_relaxed(0x0, comp->regs + DISP_AAL_EN); } +static void mtk_gamma_config(struct mtk_ddp_comp *comp, unsigned int w, + unsigned int h, unsigned int vrefresh) +{ + writel(h << 16 | w, comp->regs + DISP_GAMMA_SIZE); +} + +static void mtk_gamma_start(struct mtk_ddp_comp *comp) +{ + writel(GAMMA_EN, comp->regs + DISP_GAMMA_EN); +} + +static void mtk_gamma_stop(struct mtk_ddp_comp *comp) +{ + writel_relaxed(0x0, comp->regs + DISP_GAMMA_EN); +} + static const struct mtk_ddp_comp_funcs ddp_aal = { .config = mtk_aal_config, .start = mtk_aal_start, .stop = mtk_aal_stop, }; +static const struct mtk_ddp_comp_funcs ddp_gamma = { + .config = mtk_gamma_config, + .start = mtk_gamma_start, + .stop = mtk_gamma_stop, +}; + static const struct mtk_ddp_comp_funcs ddp_color = { .config = mtk_color_config, .start = mtk_color_start, @@ -145,7 +172,7 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_DPI0] = { MTK_DPI, 0, NULL }, [DDP_COMPONENT_DSI0] = { MTK_DSI, 0, NULL }, [DDP_COMPONENT_DSI1] = { MTK_DSI, 1, NULL }, - [DDP_COMPONENT_GAMMA] = { MTK_DISP_GAMMA, 0, NULL }, + [DDP_COMPONENT_GAMMA] = { MTK_DISP_GAMMA, 0, &ddp_gamma }, [DDP_COMPONENT_OD] = { MTK_DISP_OD, 0, &ddp_od }, [DDP_COMPONENT_OVL0] = { MTK_DISP_OVL, 0, NULL }, [DDP_COMPONENT_OVL1] = { MTK_DISP_OVL, 1, NULL }, -- 1.7.9.5