Received: by 10.223.185.116 with SMTP id b49csp4174762wrg; Mon, 26 Feb 2018 12:33:54 -0800 (PST) X-Google-Smtp-Source: AH8x226HRJmFl3jPvoCT0IHOkcNdHJqdEzb4KO9YOeURDJD60VMBZXS1JEdPZBaemsNEe/g17o3T X-Received: by 10.101.88.15 with SMTP id g15mr9274962pgr.383.1519677234589; Mon, 26 Feb 2018 12:33:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519677234; cv=none; d=google.com; s=arc-20160816; b=kH31hrxRrTswuiu9VBurlUBtaVH0SECcMBi+t2EIEsIh6nBT5LRBO/n3G4OBRJJo3i 8+73USgb4hH4M1ZBKh3uO4cXe79eA52Las297YZtQIfsOBdk5incDEByy7quFBqYkgeO szfh8rrp2pkrAkgkAF+eFIWz6uGMah+LmEVDJLToUyLQzuRTpnKT7bQ7W+tN1xuhpdEk pnHZgpvhXdAq7MQu1NS8fiy+jEAZkxvXjuyQ6RFRnW+o3W1PffC+XKqRetjWrKB1SRuD Oqc3woj2M9C1hgri6HtFbHRdJucrCFMfXNZkIxviUXUxcc8GRhzLYSgQEizPGFR5BSvB 6ZnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=9alsys2IZ32X5tPFadBTe0iGPNWXPAN33Sygv3HS6Vs=; b=FhNYk3dRshhkJT1nw4Punml7Lfu24lDbQ/dmexKShb8IVi7CXl+CETqk8Sb3ex3Bz/ c9ohJ0TRx1aG7lIsMfiJ6Ly+kADO11cQr3DEJMBtX5nMeu7Q2ZvcOWyKfB8lkrVVIaHD NOCVr+xyM32SjVLz/unIKkr8XZrNtdvPxk+XLNRauU0FYhJHnhpCzXwUqadt6TFhJn2i KvkedUc/fT+08GVv8aY/afUBvuf9RGe7PiMBjtxDKHK9Jme1S3nnFPUS5Hx5vUbIla/7 HgivCfFfhjIJREQ2AHvybRznwPRmD1Etw2n0S/xTfrBlHIWNXqLR3CIduWKyUAcSyVCt ungQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e5-v6si7206482plb.566.2018.02.26.12.33.38; Mon, 26 Feb 2018 12:33:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932085AbeBZU23 (ORCPT + 99 others); Mon, 26 Feb 2018 15:28:29 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:37192 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753947AbeBZU20 (ORCPT ); Mon, 26 Feb 2018 15:28:26 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 72D4BE64; Mon, 26 Feb 2018 20:28:25 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Rosin , Daniel Vetter , Daniel Vetter , Gerd Hoffmann Subject: [PATCH 4.15 53/64] drm/cirrus: Load lut in crtc_commit Date: Mon, 26 Feb 2018 21:22:30 +0100 Message-Id: <20180226202155.705573549@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Vetter commit 745fd50f3b044db6a3922e1718306555613164b0 upstream. In the past the ast driver relied upon the fbdev emulation helpers to call ->load_lut at boot-up. But since commit b8e2b0199cc377617dc238f5106352c06dcd3fa2 Author: Peter Rosin Date: Tue Jul 4 12:36:57 2017 +0200 drm/fb-helper: factor out pseudo-palette that's cleaned up and drivers are expected to boot into a consistent lut state. This patch fixes that. Fixes: b8e2b0199cc3 ("drm/fb-helper: factor out pseudo-palette") Cc: Peter Rosin Cc: Daniel Vetter Cc: # v4.14+ References: https://bugzilla.kernel.org/show_bug.cgi?id=198123 Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/20180131110450.22153-1-daniel.vetter@ffwll.ch Signed-off-by: Gerd Hoffmann Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/cirrus/cirrus_mode.c | 40 ++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 17 deletions(-) --- a/drivers/gpu/drm/cirrus/cirrus_mode.c +++ b/drivers/gpu/drm/cirrus/cirrus_mode.c @@ -294,22 +294,7 @@ static void cirrus_crtc_prepare(struct d { } -/* - * This is called after a mode is programmed. It should reverse anything done - * by the prepare function - */ -static void cirrus_crtc_commit(struct drm_crtc *crtc) -{ -} - -/* - * The core can pass us a set of gamma values to program. We actually only - * use this for 8-bit mode so can't perform smooth fades on deeper modes, - * but it's a requirement that we provide the function - */ -static int cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, - u16 *blue, uint32_t size, - struct drm_modeset_acquire_ctx *ctx) +static void cirrus_crtc_load_lut(struct drm_crtc *crtc) { struct drm_device *dev = crtc->dev; struct cirrus_device *cdev = dev->dev_private; @@ -317,7 +302,7 @@ static int cirrus_crtc_gamma_set(struct int i; if (!crtc->enabled) - return 0; + return; r = crtc->gamma_store; g = r + crtc->gamma_size; @@ -330,6 +315,27 @@ static int cirrus_crtc_gamma_set(struct WREG8(PALETTE_DATA, *g++ >> 8); WREG8(PALETTE_DATA, *b++ >> 8); } +} + +/* + * This is called after a mode is programmed. It should reverse anything done + * by the prepare function + */ +static void cirrus_crtc_commit(struct drm_crtc *crtc) +{ + cirrus_crtc_load_lut(crtc); +} + +/* + * The core can pass us a set of gamma values to program. We actually only + * use this for 8-bit mode so can't perform smooth fades on deeper modes, + * but it's a requirement that we provide the function + */ +static int cirrus_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, + u16 *blue, uint32_t size, + struct drm_modeset_acquire_ctx *ctx) +{ + cirrus_crtc_load_lut(crtc); return 0; }