From patchwork Fri Mar 16 21:50:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schake X-Patchwork-Id: 10290349 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 656CD60386 for ; Fri, 16 Mar 2018 21:51:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 539492903C for ; Fri, 16 Mar 2018 21:51:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4598D290C9; Fri, 16 Mar 2018 21:51:28 +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 F134C2903C for ; Fri, 16 Mar 2018 21:51:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DE1B06EC01; Fri, 16 Mar 2018 21:51:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id DB51A6EC0A for ; Fri, 16 Mar 2018 21:51:23 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id h76so5622411wme.4 for ; Fri, 16 Mar 2018 14:51:23 -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=NS27F8B/a4oqhboY6j4ntI6FrSt/jO7jkwQc3bxK3Ts=; b=FweGlIE+qpIJc6sb0aY8S2oNMkuAFKBuyMdkQJdceOSWIX71vRgsAk0b9V25Xtb8Gf bYSjWTx8sEjH/kc9JPuTyV+cXZ1S5fKU0m83uRbto1wm2EekciqM9rHSrWQ6X4q40LCK l3LuBjwnQUc8LNbzIG1FrAubj08QHm3fz04ejJYB089tmTcWEigJXre2Hd4dmclaIOEy 03oYbI5L1chDjJlQyAHkec2N6dkIjKZPrVeXQK1kepZVQ0lhbFpwNolzWJcTBk6cIqXX 4H7/maN4D/2ZMaNad4UTBdN6rQJ3G+2YNkTJ/rBtxOcKgUUfmXw+fiU6u/wM2oJPQ/6A D3UQ== 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=NS27F8B/a4oqhboY6j4ntI6FrSt/jO7jkwQc3bxK3Ts=; b=duDa//waS5Vr1TwaNvnKHPXkENYVAQ+c3TY5Fda6dpet1889reUSssVnA/dBOzsFjn hNz0sxtItYCFyVxtrzBBIvjcNO3SSLXku17fTN1fv35vICNGYwnoEUg0VKEcYFyZi73a 8EsbS0i3d68IfV8r/VIcM7VpitXj0SRYCjZsZjCOPYodMS98bAEPxqg5OyM5/cmMA88b J/5OJ5uVmMg1bfCPmkwHZjAsV6JmQL0lX6xkV9ogbWuqF45Ejny+ZEqdxWKwhkRlLRvg BuNIbBZDUo2dBg0E4C3YEcHrfLplCQjV1KRbGaxZIeuEFrU4djvQ8UfhXMMZkjt7doMy xAAw== X-Gm-Message-State: AElRT7GuO6UqMyza8uwUqynR+CMPy6hItz1qa3Kucn3a+g6ywa0bNQkD 0LN2468oVoReq5rYzOSahCM= X-Google-Smtp-Source: AG47ELtqV0YeV0+ScEkiVsjWmoQGXGjLLUw90hRhG8urnPHTpEzvAjU/w3SNz5wxKMS4Lh8mkmyLRQ== X-Received: by 10.80.208.153 with SMTP id v25mr4016581edd.182.1521237082382; Fri, 16 Mar 2018 14:51:22 -0700 (PDT) Received: from localhost.localdomain (x5ce4c84b.dyn.telefonica.de. [92.228.200.75]) by smtp.gmail.com with ESMTPSA id m23sm5000606edc.69.2018.03.16.14.51.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Mar 2018 14:51:21 -0700 (PDT) From: Stefan Schake To: eric@anholt.net Subject: [PATCH 1/3] drm/vc4: Expose gamma as atomic property Date: Fri, 16 Mar 2018 22:50:57 +0100 Message-Id: <1521237059-37117-2-git-send-email-stschake@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521237059-37117-1-git-send-email-stschake@gmail.com> References: <1521237059-37117-1-git-send-email-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 --- 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 bf46674..8d71098 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 = crtc->state->gamma_lut->length / sizeof(*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