From patchwork Sun Mar 25 01:52:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schake X-Patchwork-Id: 10306469 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BB188600CC for ; Sun, 25 Mar 2018 01:53:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8EA129172 for ; Sun, 25 Mar 2018 01:53:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABF35291F1; Sun, 25 Mar 2018 01:53:41 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5CF67291DE for ; Sun, 25 Mar 2018 01:53:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 79B2B6E3A6; Sun, 25 Mar 2018 01:53:37 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 76B696E064 for ; Sun, 25 Mar 2018 01:53:33 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id r82so9622954wme.0 for ; Sat, 24 Mar 2018 18:53:33 -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:in-reply-to:references; bh=BkFNS5WXL1lefk9yX00GMcyk+EkDpgiHA6LhndmtrRE=; b=plF9yCeMLDjljHssprrH8IyOcSffbqamlm6R0bF1K4KWxqvx3adgfTWGSl+oOBsg8e 0Lsj7XwZs8yd/d+rZCzNllh1nFym9/nDUwGiI0IPSuJ1JUbEQsCoIfdICZVx/gpi4pzL k5WWARJBquvOga8MS5VasJnGqiHb8kPtAnS6Om0bn18VelXmLx4l88S34ThOrdbST7lX aq1J2TVlfgOu1WPfjQaGfBKoLqy8Ii9iFE3ea1bpyyh9NcEWqLycg3abMSL10mLumuwk AkuGmpI9zezNVuUMAqqBj13UqQnTHJmukBWHsOnU2wjawidi0CcxL5DGUb2UeGs9EYdq Yrpg== 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:in-reply-to :references; bh=BkFNS5WXL1lefk9yX00GMcyk+EkDpgiHA6LhndmtrRE=; b=ZwwqwVQmMlUhVUyppbko+/4ngV1Zku5RggLCFDqcZWG9ASWFDeKxSNyDA6qfYCNGQf dqOKPQH1ctzWzMhH9VG+FqHUQrEouAGZUxe+/XNoT+0KVJxo7zP/9Fy9xF8sHELhH0GS tT7MaoinPfhiENmKNFOonRtLfqvpethMy+fNP/nIDi5/paxAJZoWbXU/eGYc1zqd6UEy B1zSzRrj0QoTY0kWpYWIo7wDaOVZAAsKVo4vY66zjO3MLZLt1VEQBbHGdNJn+0cLTfur GU93pr7fZPs2T73QrnickPhGB3Mn72Yy8k1H07nOmVqG1Quc1BCxtCGmYRCCHnOZyCLq JbBw== X-Gm-Message-State: AElRT7FdpRJPGofusgACo8n5sBLbFcmkWfMWxzQBzVwQ2IY0/vq445QP HNSMuGDYnENGO+rRrn1l54Q= X-Google-Smtp-Source: AG47ELvNBftO4NUGjgDP1oTROfXJ9bEsfhdLP6NUJfHWEkVgAabgXq8zdFjc/GWi6d5sMi9yNgN1CQ== X-Received: by 10.28.236.15 with SMTP id k15mr11790608wmh.129.1521942811935; Sat, 24 Mar 2018 18:53:31 -0700 (PDT) Received: from localhost.localdomain (ip-88-153-118-32.hsi04.unitymediagroup.de. [88.153.118.32]) by smtp.gmail.com with ESMTPSA id j3sm15413678wra.19.2018.03.24.18.53.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Mar 2018 18:53:30 -0700 (PDT) From: Stefan Schake To: eric@anholt.net Subject: [PATCH v2 1/3] drm/vc4: Expose gamma as atomic property Date: Sat, 24 Mar 2018 18:52:38 -0700 Message-Id: <20180325015240.75464-3-stschake@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180325015240.75464-1-stschake@gmail.com> References: <20180325015240.75464-1-stschake@gmail.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: airlied@linux.ie, linux-rpi-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Stefan Schake MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP We are an atomic driver so the gamma LUT should also be exposed as a CRTC property through the DRM atomic color management. This will also take care of the legacy path for us. Signed-off-by: Stefan Schake --- v2: Use drm_color_lut_size for LUT length drivers/gpu/drm/vc4/vc4_crtc.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index bf4667481935..239215cb3274 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -298,23 +298,21 @@ vc4_crtc_lut_load(struct drm_crtc *crtc) HVS_WRITE(SCALER_GAMDATA, vc4_crtc->lut_b[i]); } -static int -vc4_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b, - uint32_t size, - struct drm_modeset_acquire_ctx *ctx) +static void +vc4_crtc_update_gamma_lut(struct drm_crtc *crtc) { struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); + struct drm_color_lut *lut = crtc->state->gamma_lut->data; + u32 length = drm_color_lut_size(crtc->state->gamma_lut); u32 i; - for (i = 0; i < size; i++) { - vc4_crtc->lut_r[i] = r[i] >> 8; - vc4_crtc->lut_g[i] = g[i] >> 8; - vc4_crtc->lut_b[i] = b[i] >> 8; + for (i = 0; i < length; i++) { + vc4_crtc->lut_r[i] = drm_color_lut_extract(lut[i].red, 8); + vc4_crtc->lut_g[i] = drm_color_lut_extract(lut[i].green, 8); + vc4_crtc->lut_b[i] = drm_color_lut_extract(lut[i].blue, 8); } vc4_crtc_lut_load(crtc); - - return 0; } static u32 vc4_get_fifo_full_level(u32 format) @@ -699,6 +697,9 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc, if (crtc->state->active && old_state->active) vc4_crtc_update_dlist(crtc); + if (crtc->state->color_mgmt_changed && crtc->state->gamma_lut) + vc4_crtc_update_gamma_lut(crtc); + if (debug_dump_regs) { DRM_INFO("CRTC %d HVS after:\n", drm_crtc_index(crtc)); vc4_hvs_dump_state(dev); @@ -909,7 +910,7 @@ static const struct drm_crtc_funcs vc4_crtc_funcs = { .reset = vc4_crtc_reset, .atomic_duplicate_state = vc4_crtc_duplicate_state, .atomic_destroy_state = vc4_crtc_destroy_state, - .gamma_set = vc4_crtc_gamma_set, + .gamma_set = drm_atomic_helper_legacy_gamma_set, .enable_vblank = vc4_enable_vblank, .disable_vblank = vc4_disable_vblank, }; @@ -1035,6 +1036,7 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) primary_plane->crtc = crtc; vc4_crtc->channel = vc4_crtc->data->hvs_channel; drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r)); + drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size); /* Set up some arbitrary number of planes. We're not limited * by a set number of physical registers, just the space in