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 autolearn=unavailable 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 72CC0C433B4 for ; Thu, 6 May 2021 17:34:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 45F5A610E7 for ; Thu, 6 May 2021 17:34:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236394AbhEFRfG (ORCPT ); Thu, 6 May 2021 13:35:06 -0400 Received: from mga03.intel.com ([134.134.136.65]:38161 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236297AbhEFRe5 (ORCPT ); Thu, 6 May 2021 13:34:57 -0400 IronPort-SDR: AnfvO6FxHR70Lt2dx3vm/+z6pacB0L1/5Lrk7rwaQzqqJq4D0tH2F3Dwfg8FmCkl9MzlfW5Fch GIVOYz+bpfdQ== X-IronPort-AV: E=McAfee;i="6200,9189,9976"; a="198590371" X-IronPort-AV: E=Sophos;i="5.82,278,1613462400"; d="scan'208";a="198590371" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2021 10:33:56 -0700 IronPort-SDR: tgPWbbwUbAnnBDk5DujqGt1ruOtdLSgGIJIiPMjUS1hvjtnitWBhT5tvbVwpx5QiRqXo13tEgo dvKfDlneh6Ew== X-IronPort-AV: E=Sophos;i="5.82,278,1613462400"; d="scan'208";a="434481005" Received: from tchrzano-mobl.ger.corp.intel.com (HELO localhost) ([10.252.42.214]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2021 10:33:53 -0700 From: Jani Nikula To: Werner Sembach , ville.syrjala@linux.intel.com, airlied@linux.ie, daniel@ffwll.ch, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH 1/3] New function to avoid duplicate code in upcomming commits In-Reply-To: <3796a7b9-8035-38ea-1c3d-b1ffe89aa19e@tuxedocomputers.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210505172401.1453178-1-wse@tuxedocomputers.com> <20210505172401.1453178-2-wse@tuxedocomputers.com> <87v97ww4e5.fsf@intel.com> <3796a7b9-8035-38ea-1c3d-b1ffe89aa19e@tuxedocomputers.com> Date: Thu, 06 May 2021 20:33:51 +0300 Message-ID: <87fsyzwyv4.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 06 May 2021, Werner Sembach wrote: > Am 06.05.21 um 12:19 schrieb Jani Nikula: >> On Wed, 05 May 2021, Werner Sembach wrote: >>> Moves some checks that later will be performed 2 times to an own fuction. This >>> avoids duplicate code later on. >>> >>> Signed-off-by: Werner Sembach >>> --- >>> >>> From 42a4a3a7d9ea9948b4071f406e7fcae23bfa0bdf Mon Sep 17 00:00:00 2001 >>> From: Werner Sembach >>> Date: Mon, 3 May 2021 14:35:39 +0200 >>> Subject: [PATCH 1/3] New function to avoid duplicate code in upcomming commits >> What are you using to generate and send the patches? This looks like >> unnecessary cruft, and our CI fails to apply and test the changes. >> >> BR, >> Jani. > I'm using git send-email with --compose and --annotate. The From, Date, and Subject lines are automatically generated by it and I then add the commit message above. I'm not sure I understand correctly. You should write the commit messages in your git commits when you commit them. When you do 'git commit'. You shouldn't have to annotate any of the patches while sending, except to perhaps add a cover letter with --compose. BR, Jani. > > After reading https://www.kernel.org/doc/html/v5.12/process/submitting-patches.html#the-canonical-patch-format I thought the format was: > > > --- > > --- > > > With the middle part being optional. (I only tested with "git apply" which worked fine with the format) > > I will resend the patches without the middle part, and the drm/i915/display in all subject lines. > >> >>> --- >>> drivers/gpu/drm/i915/display/intel_hdmi.c | 41 ++++++++++++++--------- >>> 1 file changed, 26 insertions(+), 15 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c >>> index 46de56af33db..576d3d910d06 100644 >>> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c >>> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c >>> @@ -1861,6 +1861,31 @@ static int intel_hdmi_port_clock(int clock, int bpc) >>> return clock * bpc / 8; >>> } >>> >>> +static enum drm_mode_status >>> +intel_hdmi_mode_clock_valid(struct intel_hdmi *hdmi, int clock, bool has_hdmi_sink) >>> +{ >>> + struct drm_device *dev = intel_hdmi_to_dev(hdmi); >>> + struct drm_i915_private *dev_priv = to_i915(dev); >>> + enum drm_mode_status status; >>> + >>> + /* check if we can do 8bpc */ >>> + status = hdmi_port_clock_valid(hdmi, clock, true, has_hdmi_sink); >>> + >>> + if (has_hdmi_sink) { >>> + /* if we can't do 8bpc we may still be able to do 12bpc */ >>> + if (status != MODE_OK && !HAS_GMCH(dev_priv)) >>> + status = hdmi_port_clock_valid(hdmi, clock * 3 / 2, >>> + true, has_hdmi_sink); >>> + >>> + /* if we can't do 8,12bpc we may still be able to do 10bpc */ >>> + if (status != MODE_OK && INTEL_GEN(dev_priv) >= 11) >>> + status = hdmi_port_clock_valid(hdmi, clock * 5 / 4, >>> + true, has_hdmi_sink); >>> + } >>> + >>> + return status; >>> +} >>> + >>> static enum drm_mode_status >>> intel_hdmi_mode_valid(struct drm_connector *connector, >>> struct drm_display_mode *mode) >>> @@ -1891,21 +1916,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector, >>> if (drm_mode_is_420_only(&connector->display_info, mode)) >>> clock /= 2; >>> >>> - /* check if we can do 8bpc */ >>> - status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 8), >>> - true, has_hdmi_sink); >>> - >>> - if (has_hdmi_sink) { >>> - /* if we can't do 8bpc we may still be able to do 12bpc */ >>> - if (status != MODE_OK && !HAS_GMCH(dev_priv)) >>> - status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 12), >>> - true, has_hdmi_sink); >>> - >>> - /* if we can't do 8,12bpc we may still be able to do 10bpc */ >>> - if (status != MODE_OK && DISPLAY_VER(dev_priv) >= 11) >>> - status = hdmi_port_clock_valid(hdmi, intel_hdmi_port_clock(clock, 10), >>> - true, has_hdmi_sink); >>> - } >>> + status = intel_hdmi_mode_clock_valid(hdmi, clock, has_hdmi_sink); >>> if (status != MODE_OK) >>> return status; -- Jani Nikula, Intel Open Source Graphics Center