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 B0940C433E0 for ; Thu, 21 Jan 2021 09:12:39 +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 4DF5C23888 for ; Thu, 21 Jan 2021 09:12:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4DF5C23888 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 DA7026E05C; Thu, 21 Jan 2021 09:12:38 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id C28EF6E05C for ; Thu, 21 Jan 2021 09:12:37 +0000 (UTC) IronPort-SDR: LkWoDajDFno8IQD4ZtxYpdMdI4M1gVvqc8+eJoPWYwutta2jdf17fJfQZoWVrNkKGaKi5PYssG eUq4c5oz1kkw== X-IronPort-AV: E=McAfee;i="6000,8403,9870"; a="158419862" X-IronPort-AV: E=Sophos;i="5.79,363,1602572400"; d="scan'208";a="158419862" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jan 2021 01:12:37 -0800 IronPort-SDR: OcxemuhgOh+7wtcay4TZjrZMPYMUAqh1uOwhNdq7sp1zWZadlIoy2QB8GivzzPNujIM7fWKtMw 6F/J07n5BjRg== X-IronPort-AV: E=Sophos;i="5.79,363,1602572400"; d="scan'208";a="385226668" Received: from cohrs-mobl.ger.corp.intel.com (HELO localhost) ([10.252.51.23]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jan 2021 01:12:30 -0800 From: Jani Nikula To: Dan Carpenter , Ankit Nautiyal In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: Date: Thu, 21 Jan 2021 11:12:27 +0200 Message-ID: <87h7namz5w.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/dp: Fix a logical vs bitwise OR bug 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: , Cc: David Airlie , kernel-janitors@vger.kernel.org, Lucas De Marchi , Sean Paul , Chris Wilson , intel-gfx@lists.freedesktop.org, Wambui Karuga Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, 21 Jan 2021, Dan Carpenter wrote: > This was supposed to be | instead of ||. > > Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can") > Signed-off-by: Dan Carpenter Thanks, but we already have the fix [1] for this that I thought was pushed by now [2]. Chris? BR, Jani. [1] http://lore.kernel.org/r/20201223103917.14687-1-chris@chris-wilson.co.uk [2] http://lore.kernel.org/r/161069893278.19482.3803444937046587332@build.alporthouse.com > --- > 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 8a00e609085f..9c6f427b2703 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -6955,8 +6955,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) { -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Date: Thu, 21 Jan 2021 09:12:27 +0000 Subject: Re: [PATCH] drm/i915/dp: Fix a logical vs bitwise OR bug Message-Id: <87h7namz5w.fsf@intel.com> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter , Ankit Nautiyal Cc: David Airlie , kernel-janitors@vger.kernel.org, Lucas De Marchi , Sean Paul , Chris Wilson , intel-gfx@lists.freedesktop.org, Wambui Karuga On Thu, 21 Jan 2021, Dan Carpenter wrote: > This was supposed to be | instead of ||. > > Fixes: 522508b665df ("drm/i915/display: Let PCON convert from RGB to YCbCr if it can") > Signed-off-by: Dan Carpenter Thanks, but we already have the fix [1] for this that I thought was pushed by now [2]. Chris? BR, Jani. [1] http://lore.kernel.org/r/20201223103917.14687-1-chris@chris-wilson.co.uk [2] http://lore.kernel.org/r/161069893278.19482.3803444937046587332@build.alporthouse.com > --- > 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 8a00e609085f..9c6f427b2703 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -6955,8 +6955,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) { -- Jani Nikula, Intel Open Source Graphics Center