From patchwork Thu Mar 14 02:58:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10852071 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 286DC13B5 for ; Thu, 14 Mar 2019 02:59:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FE8F28C51 for ; Thu, 14 Mar 2019 02:59:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01C9D28CAA; Thu, 14 Mar 2019 02:59:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8887628C51 for ; Thu, 14 Mar 2019 02:59:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=THt4sIaLaIW20CW3n7wgmVicL8XY2TvKfij7zJZ7CRw=; b=m0N+PHhkKNrZnF lgfE8PJzdWLgSjHGVA46gMovYQ3SPB7orbBxiYX8eR49pO6jQjGmwYBvoZ+CybtmCfDlvsLHIMu5E kOT2kW2JdAOo4lOonX6A8N5VR6njq0n+i+19l/F8CZ1RysX2ujFbr8SFCvjY1ECVYPCSPLdikCIEk BhgNiTM8F8UPp6x4tlg9acNYjIoVSsYWtLcFUwtNWxCdS9SxBD2dyaS6MGvjNFyHRtWedlhM4rXkC SwC8vvFZPv+b/Mgu3nuxg/BjzaubxjOeH7qj38baYey83VOI/QDvXkeNZjm7yvNME0zvnChVP0dLm Sk8tXHsmonidINm7W/Pg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4GaC-0006Mb-T2; Thu, 14 Mar 2019 02:59:00 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h4Ga9-0006MG-Ea for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2019 02:58:58 +0000 Received: by mail-pg1-x543.google.com with SMTP id 125so2927483pgc.12 for ; Wed, 13 Mar 2019 19:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lGvZTcWzctcoAwrnDbiypuPTRlEHiXEcTaIOw32MWrk=; b=ALW264E9YI1JGYHAH4TD0Q3ZlldV+Zlke8czXv77Uvq3yr9tBmy6IQwv1IVDRJT+RU CUkWby+cBpOYSMH8VH6J2RAD+AA4kDcr6Ou2KQOKExVF5AcQJ39HsJyphBjzXHPEHCXB qLYRBPneJVfyClfZ97m8NsAqMuRE8EIZa+2WY7E3+rh9Jso7iVwrjYE/ImbAkgb7AP7J AU7XgEPhgBVWqP1zbjey93Gv4yxjgO45enBipgSxhJ/+GDSvMGWvVxpU/16VQ7RHZOmT eZ6zjcRqTg1nTX0eyxWujYHlcRyPhFDXmnopL7EN6PQ4pura8nhv4FNa5nkd19322XPS IP6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lGvZTcWzctcoAwrnDbiypuPTRlEHiXEcTaIOw32MWrk=; b=DuW3nnodcHfvBzm5gPrIqX1EHTeH81tmNkLjLhC11Kej6tHhwYfdcHAKCyf9QaAd7m +ZnRrreEwtzJg8rGnqg6/J8ztqqW7w6QpaAv9HXKeUUJsIuEbKOiF7XMlA4p1Rg7+trX uTE4pCsxPuPLDd4v3+s+aNGr91M2FOEfYPQMyRKUBucKsuFs400TM8Jnd3JHKMAyT7EF bNwku31lo2G5z2s17KzXpxGWRg4z50Yjhr4Gku37kqxIEHo9ULbWLgcQCA6RHhoDny+0 rVI2v0r0a0fKzHPi0H8Z2Y68KMRZxQo3O93lr7+emTY7LfF7H4fK8dcwEQTm9q6rlVAR U+IQ== X-Gm-Message-State: APjAAAUKAcpaftKjH2f3ZPvyKaqy6mNKKb6nbk27M82A/ukz2a/ha3KD tIU9Y967eiyWX9RwlEMnzO8= X-Google-Smtp-Source: APXvYqx54ghiC9sNA7TU8aQ3uPCiL2hepo1Mr94TGD/WSxc627/mU+LnqF4EYHS4Q2uDYBVj1SwqSQ== X-Received: by 2002:a62:1c94:: with SMTP id c142mr48601457pfc.54.1552532336070; Wed, 13 Mar 2019 19:58:56 -0700 (PDT) Received: from anarsoul-thinkpad.lan (216-71-213-236.dyn.novuscom.net. [216.71.213.236]) by smtp.gmail.com with ESMTPSA id c18sm18117562pfo.44.2019.03.13.19.58.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Mar 2019 19:58:55 -0700 (PDT) From: Vasily Khoruzhick To: Maxime Ripard , David Airlie , Daniel Vetter , Chen-Yu Tsai , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH] drm/sun4i: Implement gamma correction Date: Wed, 13 Mar 2019 19:58:38 -0700 Message-Id: <20190314025838.5867-1-anarsoul@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190313_195857_492793_845E5A92 X-CRM114-Status: GOOD ( 15.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for gamma corretion to sun4i TCON driver. Its LUT has 256 entries and can be updated only when gamma correction is disabled. Signed-off-by: Vasily Khoruzhick --- drivers/gpu/drm/sun4i/sun4i_crtc.c | 15 ++++++++++++++ drivers/gpu/drm/sun4i/sun4i_tcon.c | 33 ++++++++++++++++++++++++++++++ drivers/gpu/drm/sun4i/sun4i_tcon.h | 12 ++++++++++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c index 3eedf335a935..719259d09632 100644 --- a/drivers/gpu/drm/sun4i/sun4i_crtc.c +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c @@ -101,6 +101,20 @@ static void sun4i_crtc_atomic_flush(struct drm_crtc *crtc, drm_crtc_send_vblank_event(crtc, event); spin_unlock_irq(&crtc->dev->event_lock); } + + if (crtc->state->color_mgmt_changed) { + if (crtc->state->gamma_lut) { + /* LUT can be only updated when gamma correction is + * disabled + */ + sun4i_tcon_enable_gamma(scrtc->tcon, false); + sun4i_tcon_load_gamma_lut(scrtc->tcon, + crtc->state->gamma_lut->data); + sun4i_tcon_enable_gamma(scrtc->tcon, true); + } else + sun4i_tcon_enable_gamma(scrtc->tcon, false); + } + } static void sun4i_crtc_atomic_disable(struct drm_crtc *crtc, @@ -184,6 +198,7 @@ static const struct drm_crtc_funcs sun4i_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .enable_vblank = sun4i_crtc_enable_vblank, .disable_vblank = sun4i_crtc_disable_vblank, + .gamma_set = drm_atomic_helper_legacy_gamma_set, }; struct sun4i_crtc *sun4i_crtc_init(struct drm_device *drm, diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c index cf45d0f940f9..3f5f9d4f54a6 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c @@ -215,6 +215,34 @@ void sun4i_tcon_enable_vblank(struct sun4i_tcon *tcon, bool enable) } EXPORT_SYMBOL(sun4i_tcon_enable_vblank); +void sun4i_tcon_load_gamma_lut(struct sun4i_tcon *tcon, + struct drm_color_lut *lut) +{ + int i; + + for (i = 0; i < SUN4I_TCON_GAMMA_LUT_SIZE; i++) { + u32 r, g, b; + + r = drm_color_lut_extract(lut[i].red, 8); + g = drm_color_lut_extract(lut[i].green, 8); + b = drm_color_lut_extract(lut[i].blue, 8); + + regmap_write(tcon->regs, SUN4I_TCON_GAMMA_TABLE_REG + 4 * i, + SUN4I_TCON_GAMMA_TABLE_R(r) | + SUN4I_TCON_GAMMA_TABLE_G(g) | + SUN4I_TCON_GAMMA_TABLE_B(b)); + } +} +EXPORT_SYMBOL(sun4i_tcon_load_gamma_lut); + +void sun4i_tcon_enable_gamma(struct sun4i_tcon *tcon, bool enable) +{ + regmap_update_bits(tcon->regs, SUN4I_TCON_GCTL_REG, + SUN4I_TCON_GCTL_GAMMA_ENABLE, + enable ? SUN4I_TCON_GCTL_GAMMA_ENABLE : 0); +} +EXPORT_SYMBOL(sun4i_tcon_enable_gamma); + /* * This function is a helper for TCON output muxing. The TCON output * muxing control register in earlier SoCs (without the TCON TOP block) @@ -1261,6 +1289,11 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, list_add_tail(&tcon->list, &drv->tcon_list); + drm_mode_crtc_set_gamma_size(&tcon->crtc->crtc, + SUN4I_TCON_GAMMA_LUT_SIZE); + drm_crtc_enable_color_mgmt(&tcon->crtc->crtc, 0, false, + tcon->crtc->crtc.gamma_size); + return 0; err_free_dotclock: diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.h b/drivers/gpu/drm/sun4i/sun4i_tcon.h index 84cfb1952ff7..68a29e49e426 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.h +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h @@ -22,6 +22,7 @@ #define SUN4I_TCON_GCTL_REG 0x0 #define SUN4I_TCON_GCTL_TCON_ENABLE BIT(31) +#define SUN4I_TCON_GCTL_GAMMA_ENABLE BIT(30) #define SUN4I_TCON_GCTL_IOMAP_MASK BIT(0) #define SUN4I_TCON_GCTL_IOMAP_TCON1 (1 << 0) #define SUN4I_TCON_GCTL_IOMAP_TCON0 (0 << 0) @@ -215,7 +216,13 @@ #define SUN4I_TCON1_FILL_BEG2_REG 0x31c #define SUN4I_TCON1_FILL_END2_REG 0x320 #define SUN4I_TCON1_FILL_DATA2_REG 0x324 -#define SUN4I_TCON1_GAMMA_TABLE_REG 0x400 + +#define SUN4I_TCON_GAMMA_TABLE_REG 0x400 +#define SUN4I_TCON_GAMMA_TABLE_B(x) ((x) & 0xff) +#define SUN4I_TCON_GAMMA_TABLE_G(x) (((x) & 0xff) << 8) +#define SUN4I_TCON_GAMMA_TABLE_R(x) (((x) & 0xff) << 16) + +#define SUN4I_TCON_GAMMA_LUT_SIZE 256 #define SUN4I_TCON_MAX_CHANNELS 2 @@ -278,6 +285,9 @@ void sun4i_tcon_mode_set(struct sun4i_tcon *tcon, const struct drm_display_mode *mode); void sun4i_tcon_set_status(struct sun4i_tcon *crtc, const struct drm_encoder *encoder, bool enable); +void sun4i_tcon_load_gamma_lut(struct sun4i_tcon *tcon, + struct drm_color_lut *lut); +void sun4i_tcon_enable_gamma(struct sun4i_tcon *tcon, bool enable); extern const struct of_device_id sun4i_tcon_of_table[];