From patchwork Tue Jan 8 07:37:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Shankar, Uma" X-Patchwork-Id: 10751501 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 A814013B4 for ; Tue, 8 Jan 2019 07:14:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9254D28B4A for ; Tue, 8 Jan 2019 07:14:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F0D928B50; Tue, 8 Jan 2019 07:14:54 +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,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 35D9928B5A for ; Tue, 8 Jan 2019 07:14:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BBBF36EDA5; Tue, 8 Jan 2019 07:14:53 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 431BE6E948 for ; Tue, 8 Jan 2019 07:14:52 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2019 23:14:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,453,1539673200"; d="scan'208";a="289769233" Received: from linuxpresi1-desktop.iind.intel.com ([10.223.25.28]) by orsmga005.jf.intel.com with ESMTP; 07 Jan 2019 23:14:50 -0800 From: Uma Shankar To: intel-gfx@lists.freedesktop.org Date: Tue, 8 Jan 2019 13:07:29 +0530 Message-Id: <1546933053-10731-3-git-send-email-uma.shankar@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1546933053-10731-1-git-send-email-uma.shankar@intel.com> References: <1546933053-10731-1-git-send-email-uma.shankar@intel.com> Subject: [Intel-gfx] [v5 2/6] drm/i915: Sanitize crtc gamma mode X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ville.syrjala@intel.com, maarten.lankhorst@intel.com MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Sanitize crtc gamma mode and update the mode in driver in case BIOS has setup a different gamma mode as to what is expected by driver. There is restriction on HSW platform not to read/write color LUT's if ips is enabled. Handled the same accordingly. Credits-to: Matt Roper Signed-off-by: Uma Shankar Reviewed-by: Matt Roper --- drivers/gpu/drm/i915/intel_display.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 696e6f5..03c8f68 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15401,6 +15401,23 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, } } + /* + * Sanitize gamma mode incase BIOS leaves it in SPLIT GAMMA MODE + * Workaround HSW : Do not read or write the pipe palette/gamma data + * while GAMMA_MODE is configured for split gamma and IPS_CTL has IPS + * enabled. + */ + if (IS_HASWELL(dev_priv)) { + if (crtc_state->ips_enabled) + hsw_disable_ips(crtc_state); + + intel_color_set_csc(crtc_state); + intel_color_load_luts(crtc_state); + + if (crtc_state->ips_enabled) + hsw_enable_ips(crtc_state); + } + /* Adjust the state of the output pipe according to whether we * have active connectors/encoders. */ if (crtc_state->base.active && !intel_crtc_has_encoders(crtc))