* [PATCH] drm/i915: remove stale comment from sanitize_encoder
@ 2017-11-21 9:42 Daniel Vetter
2017-11-21 10:01 ` Maarten Lankhorst
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Daniel Vetter @ 2017-11-21 9:42 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter
This goes back to pre-atomic, where due to intermediate dpms states
connectors and encoder states might indeed not have matched.
With atomic that's all smashed together (and hopefully no bios ever
enables a vga output in dpms standby/suspedn state or we're toast).
In
commit 873ffe69a9097fb241fff2967ea6f0bf2c179195
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date: Wed Aug 5 12:37:07 2015 +0200
drm/i915: Remove connectors_active from sanitization, v2.
sanitize_encoders was changed to disable the encoder in all cases,
which made the comment obsolete.
Remove the misleading comment.
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 84817ccc5305..b16c563b453f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14860,8 +14860,6 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
connector->base.dpms = DRM_MODE_DPMS_OFF;
connector->base.encoder = NULL;
}
- /* Enabled encoders without active connectors will be fixed in
- * the crtc fixup. */
}
void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)
--
2.15.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915: remove stale comment from sanitize_encoder
2017-11-21 9:42 [PATCH] drm/i915: remove stale comment from sanitize_encoder Daniel Vetter
@ 2017-11-21 10:01 ` Maarten Lankhorst
2017-11-22 8:32 ` Daniel Vetter
2017-11-21 10:52 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-11-21 12:10 ` ✗ Fi.CI.IGT: warning " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Maarten Lankhorst @ 2017-11-21 10:01 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics Development; +Cc: Daniel Vetter
Op 21-11-17 om 10:42 schreef Daniel Vetter:
> This goes back to pre-atomic, where due to intermediate dpms states
> connectors and encoder states might indeed not have matched.
>
> With atomic that's all smashed together (and hopefully no bios ever
> enables a vga output in dpms standby/suspedn state or we're toast).
> In
>
> commit 873ffe69a9097fb241fff2967ea6f0bf2c179195
> Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Date: Wed Aug 5 12:37:07 2015 +0200
>
> drm/i915: Remove connectors_active from sanitization, v2.
>
> sanitize_encoders was changed to disable the encoder in all cases,
> which made the comment obsolete.
>
> Remove the misleading comment.
>
> Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 84817ccc5305..b16c563b453f 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -14860,8 +14860,6 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
> connector->base.dpms = DRM_MODE_DPMS_OFF;
> connector->base.encoder = NULL;
> }
> - /* Enabled encoders without active connectors will be fixed in
> - * the crtc fixup. */
> }
>
> void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)
Lets hope so,
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: remove stale comment from sanitize_encoder
2017-11-21 10:01 ` Maarten Lankhorst
@ 2017-11-22 8:32 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2017-11-22 8:32 UTC (permalink / raw)
To: Maarten Lankhorst
Cc: Daniel Vetter, Intel Graphics Development, Daniel Vetter
On Tue, Nov 21, 2017 at 11:01:09AM +0100, Maarten Lankhorst wrote:
> Op 21-11-17 om 10:42 schreef Daniel Vetter:
> > This goes back to pre-atomic, where due to intermediate dpms states
> > connectors and encoder states might indeed not have matched.
> >
> > With atomic that's all smashed together (and hopefully no bios ever
> > enables a vga output in dpms standby/suspedn state or we're toast).
> > In
> >
> > commit 873ffe69a9097fb241fff2967ea6f0bf2c179195
> > Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Date: Wed Aug 5 12:37:07 2015 +0200
> >
> > drm/i915: Remove connectors_active from sanitization, v2.
> >
> > sanitize_encoders was changed to disable the encoder in all cases,
> > which made the comment obsolete.
> >
> > Remove the misleading comment.
> >
> > Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> > drivers/gpu/drm/i915/intel_display.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 84817ccc5305..b16c563b453f 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -14860,8 +14860,6 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
> > connector->base.dpms = DRM_MODE_DPMS_OFF;
> > connector->base.encoder = NULL;
> > }
> > - /* Enabled encoders without active connectors will be fixed in
> > - * the crtc fixup. */
> > }
> >
> > void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)
>
> Lets hope so,
>
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Applied, thx for the review.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: remove stale comment from sanitize_encoder
2017-11-21 9:42 [PATCH] drm/i915: remove stale comment from sanitize_encoder Daniel Vetter
2017-11-21 10:01 ` Maarten Lankhorst
@ 2017-11-21 10:52 ` Patchwork
2017-11-21 12:10 ` ✗ Fi.CI.IGT: warning " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2017-11-21 10:52 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: remove stale comment from sanitize_encoder
URL : https://patchwork.freedesktop.org/series/34148/
State : success
== Summary ==
Series 34148v1 drm/i915: remove stale comment from sanitize_encoder
https://patchwork.freedesktop.org/api/1.0/series/34148/revisions/1/mbox/
Test gem_exec_reloc:
Subgroup basic-write-cpu-active:
fail -> PASS (fi-gdg-551) fdo#102582
Test kms_cursor_legacy:
Subgroup basic-flip-before-cursor-varying-size:
skip -> PASS (fi-hsw-4770r)
fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:441s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:455s
fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:379s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:547s
fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:278s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:507s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:507s
fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:497s
fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:488s
fi-cfl-s2 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:611s
fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:433s
fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:262s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:541s
fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:435s
fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:438s
fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:427s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:481s
fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:462s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:485s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:533s
fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:480s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:530s
fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:573s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:462s
fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:545s
fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:558s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:519s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:498s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:457s
fi-snb-2520m total:246 pass:212 dwarn:0 dfail:0 fail:0 skip:33
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:419s
Blacklisted hosts:
fi-glk-dsi total:288 pass:157 dwarn:0 dfail:9 fail:3 skip:118
ee3fc3c956f817479cfe2bac3cc2a72112dbdec1 drm-tip: 2017y-11m-21d-09h-02m-11s UTC integration manifest
b92bdbc59f27 drm/i915: remove stale comment from sanitize_encoder
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7213/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* ✗ Fi.CI.IGT: warning for drm/i915: remove stale comment from sanitize_encoder
2017-11-21 9:42 [PATCH] drm/i915: remove stale comment from sanitize_encoder Daniel Vetter
2017-11-21 10:01 ` Maarten Lankhorst
2017-11-21 10:52 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2017-11-21 12:10 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2017-11-21 12:10 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: remove stale comment from sanitize_encoder
URL : https://patchwork.freedesktop.org/series/34148/
State : warning
== Summary ==
Warning: bzip CI_DRM_3367/shard-glkb3/results12.json.bz2 wasn't in correct JSON format
Test kms_atomic_transition:
Subgroup plane-use-after-nonblocking-unbind:
pass -> SKIP (shard-snb)
Test gem_busy:
Subgroup close-race:
pass -> FAIL (shard-snb) fdo#103829
Test kms_flip:
Subgroup flip-vs-expired-vblank:
fail -> PASS (shard-hsw) fdo#102887
fdo#103829 https://bugs.freedesktop.org/show_bug.cgi?id=103829
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
shard-hsw total:2585 pass:1474 dwarn:2 dfail:1 fail:9 skip:1099 time:9519s
shard-snb total:2585 pass:1255 dwarn:2 dfail:1 fail:13 skip:1314 time:7976s
Blacklisted hosts:
shard-apl total:2565 pass:1606 dwarn:1 dfail:0 fail:21 skip:936 time:13131s
shard-kbl total:2467 pass:1595 dwarn:37 dfail:5 fail:24 skip:803 time:9914s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7213/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-11-22 8:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-21 9:42 [PATCH] drm/i915: remove stale comment from sanitize_encoder Daniel Vetter
2017-11-21 10:01 ` Maarten Lankhorst
2017-11-22 8:32 ` Daniel Vetter
2017-11-21 10:52 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-11-21 12:10 ` ✗ Fi.CI.IGT: warning " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox