From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23E9FC433DB for ; Wed, 13 Jan 2021 11:53:01 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id BA694233ED for ; Wed, 13 Jan 2021 11:53:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA694233ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 14C896E7D4; Wed, 13 Jan 2021 11:53:00 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id E0C096E7D4 for ; Wed, 13 Jan 2021 11:52:58 +0000 (UTC) IronPort-SDR: BAbtZWRvMFWow9A4Eypx5iXcSKk/A4vROj7nyHax0LapHhRU5TK3vs2+PQfB7ML7OXK24iom3J ZLlVjeSZC/PA== X-IronPort-AV: E=McAfee;i="6000,8403,9862"; a="239731638" X-IronPort-AV: E=Sophos;i="5.79,344,1602572400"; d="scan'208";a="239731638" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2021 03:52:58 -0800 IronPort-SDR: Np0+9mjgupxnPtr+WMPLdWM09Yjr/k4mhU8IsBaKzsSYl0IIxtoYjxwsqdnpbpRNzITYa+TNBR QAa/5CthDcvA== X-IronPort-AV: E=Sophos;i="5.79,344,1602572400"; d="scan'208";a="381817499" Received: from iklein-mobl.ger.corp.intel.com (HELO localhost) ([10.249.40.83]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2021 03:52:56 -0800 From: Jani Nikula To: "Nautiyal\, Ankit K" , Chris Wilson , intel-gfx@lists.freedesktop.org In-Reply-To: <87wnwny3hb.fsf@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20201223103917.14687-1-chris@chris-wilson.co.uk> <87a6u4okvl.fsf@intel.com> <87wnwny3hb.fsf@intel.com> Date: Wed, 13 Jan 2021 13:52:53 +0200 Message-ID: <87zh1drr3e.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/display: Bitwise or the conversion colour specifier together 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, 08 Jan 2021, Jani Nikula wrote: > On Thu, 24 Dec 2020, "Nautiyal, Ankit K" wrote: >> Thanks Chris to catch this. >> >> This definitely should be bitwise Operator, as mentioned by Jani is >> right thing to do. >> >> The PCON which I had access to, had the F/W which was using 303Ch >> (previously proposed) for color conversion capability, instead of what >> is latest mentioned in the spec ie. 83h. >> >> While testing, I had to skip this line of code, and hardcoded to older >> register ie. 303Ch. >> >> I Will get this patch tested and update. > > In the mean time, the topic/dp-hdmi-2.1-pcon branch has been merged to > drm-next and backmerged to drm-intel-next. So drm-intel-next is where > the fixes should now land. Ankit, where are we with this? I'm anxious to merge this. BR, Jani. > > BR, > Jani. > > >> >> >> Thanks & Regards, >> >> Ankit >> >> >> On 12/23/2020 4:21 PM, Jani Nikula wrote: >>> On Wed, 23 Dec 2020, Chris Wilson wrote: >>>> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op? >>>> drivers/gpu/drm/i915/display/intel_dp.c:6922 intel_dp_update_420() warn: should this be a bitwise op? >>>> drivers/gpu/drm/i915/display/intel_dp.c:6923 intel_dp_update_420() warn: should this be a bitwise op? >>>> >>>> Inside drm_dp_downstream_rgb_to_ycbcr_conversion(), that paramter >>>> 'color_spc' is used as return port_cap[3] & color_spc, implying that it >>>> is indeed a mask and not a boolean value. >>> So this one belongs in topic/dp-hdmi-2.1-pcon branch. >>> >>> Purely based on the context this is the right thing to do, so: >>> >>> Reviewed-by: Jani Nikula >>> >>> Ankit, please test the patch in case it uncovers some other >>> issues. It'll impact the RGB to YCbCr conversion. >>> >>> BR, >>> Jani. >>> >>> >>>> Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can") >>>> Signed-off-by: Chris Wilson >>>> Cc: Uma Shankar >>>> Cc: Ankit Nautiyal >>>> Cc: Jani Nikula >>>> --- >>>> drivers/gpu/drm/i915/display/intel_dp.c | 4 ++-- >>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c >>>> index 8b4b2ea52859..157a850a83a7 100644 >>>> --- a/drivers/gpu/drm/i915/display/intel_dp.c >>>> +++ b/drivers/gpu/drm/i915/display/intel_dp.c >>>> @@ -6918,8 +6918,8 @@ intel_dp_update_420(struct intel_dp *intel_dp) >>>> intel_dp->downstream_ports); >>>> rgb_to_ycbcr = drm_dp_downstream_rgb_to_ycbcr_conversion(intel_dp->dpcd, >>>> intel_dp->downstream_ports, >>>> - DP_DS_HDMI_BT601_RGB_YCBCR_CONV || >>>> - DP_DS_HDMI_BT709_RGB_YCBCR_CONV || >>>> + DP_DS_HDMI_BT601_RGB_YCBCR_CONV | >>>> + DP_DS_HDMI_BT709_RGB_YCBCR_CONV | >>>> DP_DS_HDMI_BT2020_RGB_YCBCR_CONV); >>>> >>>> if (INTEL_GEN(i915) >= 11) { >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx