* [PATCH] drm/i915/bios: remove duplicated code
@ 2018-04-10 9:12 Jani Nikula
2018-04-10 9:41 ` ✓ Fi.CI.BAT: success for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Jani Nikula @ 2018-04-10 9:12 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Apparently caused by a merge fail at some point. Due to the nature of
the duplicated block, the second one will have no effect, and there's no
need to backport.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_bios.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index fc14bab9c798..7f95d405d585 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1276,13 +1276,6 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
is_hdmi = false;
}
- if (port == PORT_A && is_dvi) {
- DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n",
- is_hdmi ? "/HDMI" : "");
- is_dvi = false;
- is_hdmi = false;
- }
-
info->supports_dvi = is_dvi;
info->supports_hdmi = is_hdmi;
info->supports_dp = is_dp;
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* ✓ Fi.CI.BAT: success for drm/i915/bios: remove duplicated code
2018-04-10 9:12 [PATCH] drm/i915/bios: remove duplicated code Jani Nikula
@ 2018-04-10 9:41 ` Patchwork
2018-04-10 10:29 ` ✓ Fi.CI.IGT: " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2018-04-10 9:41 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/bios: remove duplicated code
URL : https://patchwork.freedesktop.org/series/41448/
State : success
== Summary ==
Series 41448v1 drm/i915/bios: remove duplicated code
https://patchwork.freedesktop.org/api/1.0/series/41448/revisions/1/mbox/
---- Known issues:
Test gem_exec_suspend:
Subgroup basic-s3:
dmesg-warn -> PASS (fi-glk-j4005) fdo#103359
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
fail -> PASS (fi-glk-j4005) fdo#100368
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fi-bdw-5557u total:285 pass:264 dwarn:0 dfail:0 fail:0 skip:21 time:428s
fi-bdw-gvtdvm total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:444s
fi-blb-e6850 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:384s
fi-bsw-n3050 total:285 pass:239 dwarn:0 dfail:0 fail:0 skip:46 time:537s
fi-bwr-2160 total:285 pass:180 dwarn:0 dfail:0 fail:0 skip:105 time:298s
fi-bxt-dsi total:285 pass:255 dwarn:0 dfail:0 fail:0 skip:30 time:518s
fi-bxt-j4205 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:513s
fi-byt-j1900 total:285 pass:250 dwarn:0 dfail:0 fail:0 skip:35 time:524s
fi-byt-n2820 total:285 pass:246 dwarn:0 dfail:0 fail:0 skip:39 time:510s
fi-cfl-8700k total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:410s
fi-cfl-s3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:563s
fi-cfl-u total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:513s
fi-cnl-y3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:582s
fi-elk-e7500 total:285 pass:226 dwarn:0 dfail:0 fail:0 skip:59 time:424s
fi-gdg-551 total:285 pass:176 dwarn:0 dfail:0 fail:1 skip:108 time:317s
fi-glk-1 total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:539s
fi-glk-j4005 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:488s
fi-hsw-4770 total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:404s
fi-ilk-650 total:285 pass:225 dwarn:0 dfail:0 fail:0 skip:60 time:427s
fi-ivb-3520m total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:472s
fi-ivb-3770 total:285 pass:252 dwarn:0 dfail:0 fail:0 skip:33 time:434s
fi-kbl-7500u total:285 pass:260 dwarn:1 dfail:0 fail:0 skip:24 time:476s
fi-kbl-7567u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:460s
fi-kbl-r total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:516s
fi-pnv-d510 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:666s
fi-skl-6260u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:440s
fi-skl-6600u total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:537s
fi-skl-6700k2 total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:502s
fi-skl-6770hq total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:500s
fi-skl-guc total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:430s
fi-skl-gvtdvm total:285 pass:262 dwarn:0 dfail:0 fail:0 skip:23 time:448s
fi-snb-2520m total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:588s
fi-snb-2600 total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:402s
617cdf0bd4fd2cb0dcc64ddf07fbb56572ba800a drm-tip: 2018y-04m-09d-19h-55m-54s UTC integration manifest
ade5a4637437 drm/i915/bios: remove duplicated code
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8651/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* ✓ Fi.CI.IGT: success for drm/i915/bios: remove duplicated code
2018-04-10 9:12 [PATCH] drm/i915/bios: remove duplicated code Jani Nikula
2018-04-10 9:41 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-04-10 10:29 ` Patchwork
2018-04-10 10:36 ` ✗ Fi.CI.IGT: warning " Patchwork
2018-04-10 21:06 ` [PATCH] " Paulo Zanoni
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2018-04-10 10:29 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/bios: remove duplicated code
URL : https://patchwork.freedesktop.org/series/41448/
State : success
== Summary ==
---- Known issues:
Test kms_cursor_legacy:
Subgroup flip-vs-cursor-varying-size:
pass -> FAIL (shard-hsw) fdo#102670
Test kms_flip:
Subgroup dpms-vs-vblank-race:
fail -> PASS (shard-hsw) fdo#103060
Test kms_plane:
Subgroup pixel-format-pipe-b-planes:
dmesg-warn -> PASS (shard-hsw) fdo#102614 +1
Test kms_sysfs_edid_timing:
warn -> PASS (shard-apl) fdo#100047
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
shard-apl total:2680 pass:1836 dwarn:1 dfail:0 fail:7 skip:836 time:12680s
shard-hsw total:2680 pass:1785 dwarn:1 dfail:0 fail:2 skip:891 time:11362s
Blacklisted hosts:
shard-kbl total:2680 pass:1961 dwarn:1 dfail:0 fail:7 skip:711 time:9236s
shard-snb total:2680 pass:1377 dwarn:1 dfail:0 fail:3 skip:1299 time:6885s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8651/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* ✗ Fi.CI.IGT: warning for drm/i915/bios: remove duplicated code
2018-04-10 9:12 [PATCH] drm/i915/bios: remove duplicated code Jani Nikula
2018-04-10 9:41 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-04-10 10:29 ` ✓ Fi.CI.IGT: " Patchwork
@ 2018-04-10 10:36 ` Patchwork
2018-04-10 21:06 ` [PATCH] " Paulo Zanoni
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2018-04-10 10:36 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/bios: remove duplicated code
URL : https://patchwork.freedesktop.org/series/41448/
State : warning
== Summary ==
= CI Bug Log - changes from CI_DRM_4038_full -> Patchwork_8651_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_8651_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_8651_full, please notify your bug team to allow them
to document this new failure mode, which will reduce the CI noise.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8651/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_8651_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-dirty-render:
shard-kbl: PASS -> SKIP
== Known issues ==
Here are the changes found in Patchwork_8651_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_cursor_legacy@flip-vs-cursor-varying-size:
shard-hsw: PASS -> FAIL (fdo#102670)
==== Possible fixes ====
igt@kms_flip@dpms-vs-vblank-race:
shard-hsw: FAIL (fdo#103060) -> PASS
igt@kms_plane@pixel-format-pipe-b-planes:
shard-hsw: DMESG-WARN (fdo#102614) -> PASS +1
igt@kms_sysfs_edid_timing:
shard-apl: WARN (fdo#100047) -> PASS
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
== Participating hosts (6 -> 4) ==
Missing (2): shard-glk shard-glkb
== Build changes ==
* Linux: CI_DRM_4038 -> Patchwork_8651
* Piglit: None -> piglit_4418
CI_DRM_4038: 617cdf0bd4fd2cb0dcc64ddf07fbb56572ba800a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4418: 7c474e011548d35df6b80ceed81d3e6ca560c71d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8651: ade5a46374378cdcb3f392bc70f1557c52f2ab17 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4418: 45e115f293fd6acc0c9647cf2d3b76be78819ba5 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8651/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915/bios: remove duplicated code
2018-04-10 9:12 [PATCH] drm/i915/bios: remove duplicated code Jani Nikula
` (2 preceding siblings ...)
2018-04-10 10:36 ` ✗ Fi.CI.IGT: warning " Patchwork
@ 2018-04-10 21:06 ` Paulo Zanoni
2018-04-11 13:12 ` Jani Nikula
3 siblings, 1 reply; 6+ messages in thread
From: Paulo Zanoni @ 2018-04-10 21:06 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
Em Ter, 2018-04-10 às 12:12 +0300, Jani Nikula escreveu:
> Apparently caused by a merge fail at some point. Due to the nature of
> the duplicated block, the second one will have no effect, and there's
> no
> need to backport.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> ---
> drivers/gpu/drm/i915/intel_bios.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_bios.c
> b/drivers/gpu/drm/i915/intel_bios.c
> index fc14bab9c798..7f95d405d585 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -1276,13 +1276,6 @@ static void parse_ddi_port(struct
> drm_i915_private *dev_priv, enum port port,
> is_hdmi = false;
> }
>
> - if (port == PORT_A && is_dvi) {
> - DRM_DEBUG_KMS("VBT claims port A supports DVI%s,
> ignoring\n",
> - is_hdmi ? "/HDMI" : "");
> - is_dvi = false;
> - is_hdmi = false;
> - }
> -
> info->supports_dvi = is_dvi;
> info->supports_hdmi = is_hdmi;
> info->supports_dp = is_dp;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915/bios: remove duplicated code
2018-04-10 21:06 ` [PATCH] " Paulo Zanoni
@ 2018-04-11 13:12 ` Jani Nikula
0 siblings, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2018-04-11 13:12 UTC (permalink / raw)
To: Paulo Zanoni, intel-gfx
On Tue, 10 Apr 2018, Paulo Zanoni <paulo.r.zanoni@intel.com> wrote:
> Em Ter, 2018-04-10 às 12:12 +0300, Jani Nikula escreveu:
>> Apparently caused by a merge fail at some point. Due to the nature of
>> the duplicated block, the second one will have no effect, and there's
>> no
>> need to backport.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Pushed, thanks for the review.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/intel_bios.c | 7 -------
>> 1 file changed, 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_bios.c
>> b/drivers/gpu/drm/i915/intel_bios.c
>> index fc14bab9c798..7f95d405d585 100644
>> --- a/drivers/gpu/drm/i915/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>> @@ -1276,13 +1276,6 @@ static void parse_ddi_port(struct
>> drm_i915_private *dev_priv, enum port port,
>> is_hdmi = false;
>> }
>>
>> - if (port == PORT_A && is_dvi) {
>> - DRM_DEBUG_KMS("VBT claims port A supports DVI%s,
>> ignoring\n",
>> - is_hdmi ? "/HDMI" : "");
>> - is_dvi = false;
>> - is_hdmi = false;
>> - }
>> -
>> info->supports_dvi = is_dvi;
>> info->supports_hdmi = is_hdmi;
>> info->supports_dp = is_dp;
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-04-11 13:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-10 9:12 [PATCH] drm/i915/bios: remove duplicated code Jani Nikula
2018-04-10 9:41 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-04-10 10:29 ` ✓ Fi.CI.IGT: " Patchwork
2018-04-10 10:36 ` ✗ Fi.CI.IGT: warning " Patchwork
2018-04-10 21:06 ` [PATCH] " Paulo Zanoni
2018-04-11 13:12 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox