Skip to contentSkip to conversation

drm/i915: remove stale comment from sanitize_encoder

PATCH Applied Daniel Vetter 4 participants 5 messages Nov 21, 2017 – Nov 22, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: remove stale comment from sanitize_encoder

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 <[email protected]>
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.

---
 drivers/gpu/drm/i915/intel_display.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -2
index 84817ccc5305..b16c563b453f 100644
@@ -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)
Signature · 6 lines
2.15.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw

Op 21-11-17 om 10:42 schreef Daniel Vetter:

Quoted 31 lines

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 <[email protected]>
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.

---
 drivers/gpu/drm/i915/intel_display.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index 84817ccc5305..b16c563b453f 100644

drivers/gpu/drm/i915/intel_display.c static void intel_sanitize_encoder(struct intel_encoder *encoder) · line 14865

Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c +0 -2
@@ -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,

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 39 lines · Maarten Lankhorst

Op 21-11-17 om 10:42 schreef Daniel Vetter:

Quoted 38 lines

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 <[email protected]>
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.

---
 drivers/gpu/drm/i915/intel_display.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -2
index 84817ccc5305..b16c563b453f 100644
@@ -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. */
 }
 
Quoted 5 lines

drivers/gpu/drm/i915/intel_display.c static void intel_sanitize_encoder(struct intel_encoder *encoder) · line 14865

Quoted 1 line
drivers/gpu/drm/i915/intel_display.c +0 -0
 void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)

Lets hope so,

Applied, thx for the review.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

✓ Fi.CI.BAT: success for drm/i915: remove stale comment from sanitize_encoder

In reply to Daniel Vetter
== Series Details ==

== 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

✗ Fi.CI.IGT: warning for drm/i915: remove stale comment from sanitize_encoder

In reply to Daniel Vetter
== Series Details ==

== 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx