From: Werner Sembach <wse@tuxedocomputers.com>
To: Jani Nikula <jani.nikula@linux.intel.com>,
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
Date: Thu, 6 May 2021 18:41:34 +0200 [thread overview]
Message-ID: <3796a7b9-8035-38ea-1c3d-b1ffe89aa19e@tuxedocomputers.com> (raw)
In-Reply-To: <87v97ww4e5.fsf@intel.com>
Am 06.05.21 um 12:19 schrieb Jani Nikula:
> On Wed, 05 May 2021, Werner Sembach <wse@tuxedocomputers.com> 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 <wse@tuxedocomputers.com>
>> ---
>>
>> From 42a4a3a7d9ea9948b4071f406e7fcae23bfa0bdf Mon Sep 17 00:00:00 2001
>> From: Werner Sembach <wse@tuxedocomputers.com>
>> 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.
After reading https://www.kernel.org/doc/html/v5.12/process/submitting-patches.html#the-canonical-patch-format I thought the format was:
<commit message for upstream and signed of lines>
---
<additional comments only for mailing list/stuff that gets ignored by the tools>
---
<the patch>
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;
next prev parent reply other threads:[~2021-05-06 16:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 17:23 [PATCH 0/3] drm/i915/display Try YCbCr420 color when RGB fails Werner Sembach
2021-05-05 17:23 ` [PATCH 1/3] New function to avoid duplicate code in upcomming commits Werner Sembach
2021-05-06 10:19 ` [Intel-gfx] " Jani Nikula
2021-05-06 16:41 ` Werner Sembach [this message]
2021-05-06 17:33 ` Jani Nikula
2021-05-06 10:21 ` Jani Nikula
2021-05-05 17:24 ` [PATCH 2/3] Restructure output format computation for better expandability Werner Sembach
2021-05-05 17:24 ` [PATCH 3/3] Use YCbCr420 as fallback when RGB fails Werner Sembach
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3796a7b9-8035-38ea-1c3d-b1ffe89aa19e@tuxedocomputers.com \
--to=wse@tuxedocomputers.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).