From patchwork Thu Sep 28 15:31:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13403285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A8E5BE732E6 for ; Thu, 28 Sep 2023 15:32:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 407A310E04B; Thu, 28 Sep 2023 15:32:00 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id A977510E04B for ; Thu, 28 Sep 2023 15:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695915117; x=1727451117; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=E8hQTs0QFjk0o6aQxxfKH0gVIXIZiK2xO7RnagGGpYI=; b=m1q0tV84Zg2OMo+Qhq8sAZNFwAFS96xrxqZ8mnMjnVw1EPX1ikyirH4l aOOT/JUxPz37EKgvoDIqO1LUfzAsjCRLhFEthCGfPfA3LdNCNFZhyyKXe QyC/Uf2C0+MvGLkFDLTxyedZvJr8qoHs7Pq3O2L4ljOe2v+ADVE5Ogfbf o5IwKYrObdjgWHTL8x/l52lKiZNYpM+fsoxrA4Xsy83IN54bL8QIeE9Wu qqhO0+p7GVLBfBZcreuvMQpXKfnQYRsI8i/hrWAgmIr0h5hsLEmsXFNMP mqCHLdD6ezrbz5UGACGRP5LWnJRInIDsaORTU0GeA6Na5dAYJRA1fUHr6 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10847"; a="385952780" X-IronPort-AV: E=Sophos;i="6.03,184,1694761200"; d="scan'208";a="385952780" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2023 08:31:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10847"; a="1080606931" X-IronPort-AV: E=Sophos;i="6.03,184,1694761200"; d="scan'208";a="1080606931" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.153]) by fmsmga005.fm.intel.com with SMTP; 28 Sep 2023 08:31:10 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 28 Sep 2023 18:31:09 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Thu, 28 Sep 2023 18:31:08 +0300 Message-ID: <20230928153109.1976-1-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/2] drm/i915/dsb: Re-instate DSB for LUT updates X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Ville Syrjälä With all the known issues sorted out we can start to use DSB to load the LUTs. Reviewed-by: Uma Shankar Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_color.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c index 4f92fc31059f..40b04aa7d98c 100644 --- a/drivers/gpu/drm/i915/display/intel_color.c +++ b/drivers/gpu/drm/i915/display/intel_color.c @@ -1895,9 +1895,6 @@ void intel_color_prepare_commit(struct intel_crtc_state *crtc_state) struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); struct drm_i915_private *i915 = to_i915(crtc->base.dev); - /* FIXME DSB has issues loading LUTs, disable it for now */ - return; - if (!crtc_state->hw.active || intel_crtc_needs_modeset(crtc_state)) return; From patchwork Thu Sep 28 15:31:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13403286 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 276A7E732E8 for ; Thu, 28 Sep 2023 15:32:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 658FD10E68B; Thu, 28 Sep 2023 15:32:05 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6897710E04B for ; Thu, 28 Sep 2023 15:31:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695915118; x=1727451118; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IcB5++ONRJ6TGbhGMlMLs4MaS8u2FXkl4Y8mTG5WS+M=; b=HslHITMKJl3AIyQ8CgFXBo1ntuP8JXZedxXmyW7Lrwgi0HlhYhrQ1btP bPZ9bHtb2H0pF3HJzRJjqco0Bq9dpjDZYtAz9IVgOIz3vcv9NBdkxfaoA cX1WxqUcAfL6pGaY3L4Yq8Ai2gzwWfT7QOrchLJO8VS5zCv95+oLxNaC0 TnufaxJjfPoFU9miaMKsh5uA36Tvn05JprYgm6J67Ey39aXBsrGHwckjc ObRo+0bUpPrx53BwHlDOccFtq2CCbewle/x4vxOb/zNuk1+4D5IAOeAHL DL4YgD1CUvDyGj0999u8cj7smiQiyxa1OplIMe/GZw8+RkhtTM0wFMY1v g==; X-IronPort-AV: E=McAfee;i="6600,9927,10847"; a="385952795" X-IronPort-AV: E=Sophos;i="6.03,184,1694761200"; d="scan'208";a="385952795" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2023 08:31:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10847"; a="1080606943" X-IronPort-AV: E=Sophos;i="6.03,184,1694761200"; d="scan'208";a="1080606943" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.153]) by fmsmga005.fm.intel.com with SMTP; 28 Sep 2023 08:31:13 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 28 Sep 2023 18:31:12 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Thu, 28 Sep 2023 18:31:09 +0300 Message-ID: <20230928153109.1976-2-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928153109.1976-1-ville.syrjala@linux.intel.com> References: <20230928153109.1976-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Do state check for color management changes X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Ville Syrjälä In order to validate LUT programming more thoroughly let's do a state check for all color management updates as well. Not sure we really want this outside CI. It is rather heavy and color management updates could become rather common with all the HDR/etc. stuff happening. Maybe we should have an extra knob for this that we could enable in CI? v2: Skip for initial_commit to avoid FDI dotclock sanity checks/etc. tripping up Reviewed-by: Uma Shankar Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_modeset_verify.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c b/drivers/gpu/drm/i915/display/intel_modeset_verify.c index 138144a65a45..1ee3636f1b97 100644 --- a/drivers/gpu/drm/i915/display/intel_modeset_verify.c +++ b/drivers/gpu/drm/i915/display/intel_modeset_verify.c @@ -231,6 +231,8 @@ void intel_modeset_verify_crtc(struct intel_crtc *crtc, struct intel_crtc_state *new_crtc_state) { if (!intel_crtc_needs_modeset(new_crtc_state) && + (!intel_crtc_needs_color_update(new_crtc_state) || + new_crtc_state->inherited) && !intel_crtc_needs_fastset(new_crtc_state)) return;