From patchwork Tue Nov 12 10:40:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Qian Wang X-Patchwork-Id: 11239047 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 689131515 for ; Tue, 12 Nov 2019 10:41:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4FBFC2196E for ; Tue, 12 Nov 2019 10:41:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FBFC2196E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 87F346EB08; Tue, 12 Nov 2019 10:41:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50083.outbound.protection.outlook.com [40.107.5.83]) by gabe.freedesktop.org (Postfix) with ESMTPS id CD03F6EB08 for ; Tue, 12 Nov 2019 10:40:58 +0000 (UTC) Received: from AM6PR08CA0001.eurprd08.prod.outlook.com (2603:10a6:20b:b2::13) by VI1SPR00MB254.eurprd08.prod.outlook.com (2603:10a6:800:5c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2451.23; Tue, 12 Nov 2019 10:40:55 +0000 Received: from VE1EUR03FT037.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::207) by AM6PR08CA0001.outlook.office365.com (2603:10a6:20b:b2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2451.23 via Frontend Transport; Tue, 12 Nov 2019 10:40:55 +0000 Received-SPF: Fail (protection.outlook.com: domain of arm.com does not designate 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT037.mail.protection.outlook.com (10.152.19.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2430.21 via Frontend Transport; Tue, 12 Nov 2019 10:40:54 +0000 Received: ("Tessian outbound e4042aced47b:v33"); Tue, 12 Nov 2019 10:40:52 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 16091eeb146b9c36 X-CR-MTA-TID: 64aa7808 Received: from a79b2280da58.2 (cr-mta-lb-1.cr-mta-net [104.47.10.53]) by 64aa7808-outbound-1.mta.getcheckrecipient.com id 8719C66A-E6A7-461B-A2DA-38CA8FCF4D23.1; Tue, 12 Nov 2019 10:40:46 +0000 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2053.outbound.protection.outlook.com [104.47.10.53]) by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a79b2280da58.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384); Tue, 12 Nov 2019 10:40:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HrFuMHW7ZgK2nUdg2qsI8Sq6A//y971CxGSIvdh9+8HHfm1blvIbAPxsKDSEbK2OwkpgEnmlej+wIkfaMhexD4XP92ucO4R6dZxtCNuJE/NMGmOOdhprcEkR4cdU8jr+J3MzanQT+75U842qhcps40H32MusJk4Q+TToYBWrISNPfMl7LiOV00xYBsM9Hwf3H5bGO6RQyWwgN+pWZZ2nrJvAe6B2m8hY5Y4ZaacLjTJWAmmdxap79lFc5utj/FzyNa7uY2h55qZm7Y3uNmTXy1U/r7HjsciNcmi2YHwS7FYNdvkdjteL07FBQoPgm7Nt9bdK9WtqELl2aDpEurT7VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9TQq3bHNRrYQiNPP2nRVJpod47h6p3GxLvGsKKnTnHo=; b=lN73BnBUZv+ZjU9GmObLyFfTMOa+O++A3o/OpizfzB7zum/DHdBuw1vfggVULim4BSD5bZc4AMYZt3j1Hpfba1PQY2itDYotj8z+mwH2FTUSxSUPXm2E9c4dtsenPaFZiwET/qNG/yhBFiaouAtzbquuAbzVCPPAMp5r3bHqH2TdYk8bWKxJHi6npDMuiYqgH3UB4FPf1+BJK83thIyhOCgA8wilTVbukz9LvpM6M4lhQJysxIimT9t+P1jIARcmwgpkNvFhS/yInhv3/1X1fp23ya4xW6tQYDwH2vR63GKXvH4305WN+Lu+P3yF3V6iriZpquk7bq4WhNx2i53uOA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Received: from AM0PR08MB4995.eurprd08.prod.outlook.com (10.255.30.207) by AM0PR08MB4082.eurprd08.prod.outlook.com (20.178.119.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2451.23; Tue, 12 Nov 2019 10:40:45 +0000 Received: from AM0PR08MB4995.eurprd08.prod.outlook.com ([fe80::3c0c:3112:ccbf:13d0]) by AM0PR08MB4995.eurprd08.prod.outlook.com ([fe80::3c0c:3112:ccbf:13d0%6]) with mapi id 15.20.2430.027; Tue, 12 Nov 2019 10:40:45 +0000 From: "james qian wang (Arm Technology China)" To: Liviu Dudau , "airlied@linux.ie" , Brian Starkey , "maarten.lankhorst@linux.intel.com" , "sean@poorly.run" , Mihail Atanassov , "imirkin@alum.mit.edu" Subject: [PATCH v9 4/4] drm/komeda: Adds gamma and color-transform support for DOU-IPS Thread-Topic: [PATCH v9 4/4] drm/komeda: Adds gamma and color-transform support for DOU-IPS Thread-Index: AQHVmUWjWKw2oVnDAEWCPL8R/YV3Ug== Date: Tue, 12 Nov 2019 10:40:44 +0000 Message-ID: <20191112103956.19074-5-james.qian.wang@arm.com> References: <20191112103956.19074-1-james.qian.wang@arm.com> In-Reply-To: <20191112103956.19074-1-james.qian.wang@arm.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [113.29.88.7] x-clientproxiedby: HK0PR03CA0087.apcprd03.prod.outlook.com (2603:1096:203:72::27) To AM0PR08MB4995.eurprd08.prod.outlook.com (2603:10a6:208:162::15) Authentication-Results-Original: spf=none (sender IP is ) smtp.mailfrom=james.qian.wang@arm.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4b4ec4e4-66af-4e1a-6964-08d7675ccbd4 X-MS-TrafficTypeDiagnostic: AM0PR08MB4082:|AM0PR08MB4082:|VI1SPR00MB254: x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true x-ms-oob-tlc-oobclassifiers: OLM:2582;OLM:2582; x-forefront-prvs: 021975AE46 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(136003)(396003)(346002)(366004)(376002)(199004)(189003)(64756008)(66476007)(66556008)(66946007)(6116002)(66446008)(3846002)(256004)(386003)(8936002)(6506007)(99286004)(2906002)(1076003)(14444005)(102836004)(103116003)(55236004)(4326008)(36756003)(71200400001)(71190400001)(486006)(305945005)(2501003)(76176011)(50226002)(81156014)(81166006)(26005)(8676002)(52116002)(7736002)(186003)(110136005)(54906003)(5660300002)(316002)(86362001)(66066001)(6512007)(478600001)(2616005)(11346002)(446003)(2201001)(6436002)(25786009)(476003)(6486002)(2171002)(14454004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR08MB4082; H:AM0PR08MB4995.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: JVUoa+QCXbQh6WlEr+6RggSotbccpTZmzuLQow8rfBD4g3/sGuHCEYDIdIX3Y5zXqtqimBrZZt5KFY0xWbQHb+UXmvisMLXyyIJ8fBbgfF9BsZxWFDzomM0NxbKTF0JcAAiqETXt4dW7c9FY65e02D8w2FlyO+fsA6eneuCTXJR0vQ9o3oZEyu3InmGGCUF8IeRY9/VOe8tZhnCILkKB9MzUxewIh+fMilgTbi3wUo6Qzq7kv9OQxsSNkF9sTLImzdRdI5c0gBQdAjpFnYhxiQmNdocEMJY69lNO6DmEE6ReHktcdXECIBt7uPvd32xMp20FBV8Mm0Ylt8TN8e7EP5QNwrBjwNlzwFdCuGIJMMh176U4ywBLHn/TftNjvh2s0+xtfK3sf/AWtuqGj8SZdaZitfBVVeZ6itHiw0NDc2cmZ5sFb6o5ZguGM0bd35gH MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4082 Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=james.qian.wang@arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT037.eop-EUR03.prod.protection.outlook.com X-Forefront-Antispam-Report: CIP:63.35.35.123; IPV:CAL; SCL:-1; CTRY:IE; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(346002)(39860400002)(396003)(376002)(136003)(1110001)(339900001)(199004)(189003)(102836004)(50466002)(86362001)(2201001)(305945005)(7736002)(6116002)(3846002)(50226002)(486006)(2501003)(81156014)(81166006)(1076003)(476003)(8676002)(22756006)(126002)(76130400001)(8936002)(8746002)(70586007)(70206006)(386003)(6506007)(5660300002)(2616005)(2906002)(76176011)(105606002)(99286004)(26005)(6512007)(103116003)(2171002)(336012)(4326008)(14454004)(478600001)(36756003)(6486002)(14444005)(26826003)(36906005)(47776003)(110136005)(356004)(316002)(11346002)(23756003)(66066001)(186003)(446003)(25786009)(54906003); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1SPR00MB254; H:64aa7808-outbound-1.mta.getcheckrecipient.com; FPR:; SPF:Fail; LANG:en; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; A:1; MX:1; X-MS-Office365-Filtering-Correlation-Id-Prvs: 317e8938-a06e-45a2-a0de-08d7675cc5a6 NoDisclaimer: True X-Forefront-PRVS: 021975AE46 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o8qNU0IRlX5S3AOHri/yoF9Sz5FQ3NtsmroztO8voiB+4gGbiqaMgsmUva2slr54xlvubM/v6fmjcsenGfcfupmYNWjwF50se9CwO4bZxR3gAa3zsZzjqpO2xCzINaD/sUD+TItI6l+DeQix1HNz5LZKrb3UIVgMlw4i4oRikpPEABVF81Ndz9wsWjZO0oDPuiz8xThp5avODYpa8CEYVlRoCHdzT5x1zrEPLBjGCPYtewbidQdQ8/ErsTndJZsIsbMDvnK4x3Qo3FN0wMkbAlWnVnySxFQZWhq8bFpEhUXUwzmZSh0quiDxqrT68jC1laxAJKK8qxpDJ8QftvIxKRI6cc6jcmswvwJGjorlntbfEN2OwYy7SSh/W5W6YsLDQcy85njhSuE/fjfgTlU6vHnPOR1l1nmywRRdT05QnJIzi6wjlsQ6reXfgPfVEsiX X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2019 10:40:54.8990 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4b4ec4e4-66af-4e1a-6964-08d7675ccbd4 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1SPR00MB254 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9TQq3bHNRrYQiNPP2nRVJpod47h6p3GxLvGsKKnTnHo=; b=DGoHfE+hYMD4cT2wlzqS2XtmlAGKLxThc/wqMgP3ZqYdAl54CZ4r+IojipD33GDDTD7/WexZF0g7XTRQ9ecijFgbGaI8+3kEb8gKRtG3bJd1CIcEcog7ejVl2oM+XyK5zJ0KhbMXJmWaaKQwuH1OQmra0huQphRM8RnDxWv+Ss4= X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9TQq3bHNRrYQiNPP2nRVJpod47h6p3GxLvGsKKnTnHo=; b=DGoHfE+hYMD4cT2wlzqS2XtmlAGKLxThc/wqMgP3ZqYdAl54CZ4r+IojipD33GDDTD7/WexZF0g7XTRQ9ecijFgbGaI8+3kEb8gKRtG3bJd1CIcEcog7ejVl2oM+XyK5zJ0KhbMXJmWaaKQwuH1OQmra0huQphRM8RnDxWv+Ss4= X-Mailman-Original-Authentication-Results: spf=fail (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; lists.freedesktop.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;lists.freedesktop.org; dmarc=none action=none header.from=arm.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nd , Ayan Halder , "Oscar Zhang \(Arm Technology China\)" , "Tiannan Zhu \(Arm Technology China\)" , "Jonathan Chai \(Arm Technology China\)" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "Julien Yin \(Arm Technology China\)" , "Channing Chen \(Arm Technology China\)" , "Yiqi Kang \(Arm Technology China\)" , "Thomas Sun \(Arm Technology China\)" , "Lowry Li \(Arm Technology China\)" , Ben Davis Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: "Lowry Li (Arm Technology China)" Adds gamma and color-transform support for DOU-IPS. Adds two caps members fgamma_coeffs and ctm_coeffs to komeda_improc_state. If color management changed, set gamma and color-transform accordingly. v5: Rebase with drm-misc-next Signed-off-by: Lowry Li (Arm Technology China) Reviewed-by: Mihail Atanassov --- .../arm/display/komeda/d71/d71_component.c | 20 +++++++++++++++++++ .../gpu/drm/arm/display/komeda/komeda_crtc.c | 2 ++ .../drm/arm/display/komeda/komeda_pipeline.h | 3 +++ .../display/komeda/komeda_pipeline_state.c | 6 ++++++ 4 files changed, 31 insertions(+) diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c index f0ba26e282c3..b6517c46e670 100644 --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c @@ -1044,7 +1044,9 @@ static int d71_merger_init(struct d71_dev *d71, static void d71_improc_update(struct komeda_component *c, struct komeda_component_state *state) { + struct drm_crtc_state *crtc_st = state->crtc->state; struct komeda_improc_state *st = to_improc_st(state); + struct d71_pipeline *pipe = to_d71_pipeline(c->pipeline); u32 __iomem *reg = c->reg; u32 index, mask = 0, ctrl = 0; @@ -1055,6 +1057,24 @@ static void d71_improc_update(struct komeda_component *c, malidp_write32(reg, BLK_SIZE, HV_SIZE(st->hsize, st->vsize)); malidp_write32(reg, IPS_DEPTH, st->color_depth); + if (crtc_st->color_mgmt_changed) { + mask |= IPS_CTRL_FT | IPS_CTRL_RGB; + + if (crtc_st->gamma_lut) { + malidp_write_group(pipe->dou_ft_coeff_addr, FT_COEFF0, + KOMEDA_N_GAMMA_COEFFS, + st->fgamma_coeffs); + ctrl |= IPS_CTRL_FT; /* enable gamma */ + } + + if (crtc_st->ctm) { + malidp_write_group(reg, IPS_RGB_RGB_COEFF0, + KOMEDA_N_CTM_COEFFS, + st->ctm_coeffs); + ctrl |= IPS_CTRL_RGB; /* enable gamut */ + } + } + mask |= IPS_CTRL_YUV | IPS_CTRL_CHD422 | IPS_CTRL_CHD420; /* config color format */ diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c index 252015210fbc..1c452ea75999 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -617,6 +617,8 @@ static int komeda_crtc_add(struct komeda_kms_dev *kms, crtc->port = kcrtc->master->of_output_port; + drm_crtc_enable_color_mgmt(crtc, 0, true, KOMEDA_COLOR_LUT_SIZE); + return err; } diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h index bd6ca7c87037..ac8725e24853 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h @@ -11,6 +11,7 @@ #include #include #include "malidp_utils.h" +#include "komeda_color_mgmt.h" #define KOMEDA_MAX_PIPELINES 2 #define KOMEDA_PIPELINE_MAX_LAYERS 4 @@ -327,6 +328,8 @@ struct komeda_improc_state { struct komeda_component_state base; u8 color_format, color_depth; u16 hsize, vsize; + u32 fgamma_coeffs[KOMEDA_N_GAMMA_COEFFS]; + u32 ctm_coeffs[KOMEDA_N_CTM_COEFFS]; }; /* display timing controller */ diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c index 42bdc63dcffa..0930234abb9d 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c @@ -802,6 +802,12 @@ komeda_improc_validate(struct komeda_improc *improc, st->color_format = BIT(__ffs(avail_formats)); } + if (kcrtc_st->base.color_mgmt_changed) { + drm_lut_to_fgamma_coeffs(kcrtc_st->base.gamma_lut, + st->fgamma_coeffs); + drm_ctm_to_coeffs(kcrtc_st->base.ctm, st->ctm_coeffs); + } + komeda_component_add_input(&st->base, &dflow->input, 0); komeda_component_set_output(&dflow->input, &improc->base, 0);