[PATCH] drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder

[PATCH] drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder

[Maarten Lankhorst]

Normally this is called on a modeset, but the call is missing when
we inherit the mode from the BIOS, so make sure it's called somewhere
in hardware readout.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index cd60b4d5cd9d..26edae07e006 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14843,6 +14843,8 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
 
 		connector->base.dpms = DRM_MODE_DPMS_OFF;
 		connector->base.encoder = NULL;
+	} else if (connector) {
+		intel_opregion_notify_encoder(encoder, true);
 	}
 }
 
-- 
2.15.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder

[Patchwork]

== Series Details ==

Series: drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder
URL   : https://patchwork.freedesktop.org/series/34692/
State : success

== Summary ==

Series 34692v1 drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder
https://patchwork.freedesktop.org/api/1.0/series/34692/revisions/1/mbox/

Test gem_exec_reloc:
        Subgroup basic-cpu-active:
                dmesg-fail -> PASS       (fi-gdg-551) fdo#102582 +1

fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:438s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:441s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:385s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:520s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:281s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:506s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:511s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:485s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:475s
fi-elk-e7500     total:224  pass:162  dwarn:16  dfail:0   fail:0   skip:45 
fi-gdg-551       total:288  pass:178  dwarn:1   dfail:0   fail:1   skip:108 time:270s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:536s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:372s
fi-hsw-4770r     total:288  pass:224  dwarn:0   dfail:0   fail:0   skip:64  time:258s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:396s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:468s
fi-ivb-3770      total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:453s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:493s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:527s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:477s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:529s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:596s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:455s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:539s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:569s
fi-skl-6700k     total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:514s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:498s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:448s
fi-snb-2520m     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:544s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:415s
Blacklisted hosts:
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:603s
fi-cnl-y         total:252  pass:226  dwarn:0   dfail:0   fail:0   skip:25 
fi-glk-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:483s

07df63d96015816fbf6dd44e634474587931a294 drm-tip: 2017y-11m-30d-17h-26m-53s UTC integration manifest
9e18639fba0d drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7381/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.IGT: warning for drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder

[Patchwork]

== Series Details ==

Series: drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder
URL   : https://patchwork.freedesktop.org/series/34692/
State : warning

== Summary ==

Test kms_frontbuffer_tracking:
        Subgroup fbc-1p-offscren-pri-shrfb-draw-render:
                fail       -> PASS       (shard-snb) fdo#101623
Test perf:
        Subgroup blocking:
                pass       -> FAIL       (shard-hsw) fdo#102252
Test drv_module_reload:
        Subgroup basic-no-display:
                dmesg-warn -> PASS       (shard-snb) fdo#102707
Test kms_cursor_crc:
        Subgroup cursor-256x256-suspend:
                dmesg-warn -> PASS       (shard-snb) fdo#102365
Test drm_read:
        Subgroup empty-nonblock:
                pass       -> SKIP       (shard-hsw)
Test kms_draw_crc:
        Subgroup draw-method-xrgb8888-mmap-wc-xtiled:
                pass       -> SKIP       (shard-hsw)
Test gem_tiled_swapping:
        Subgroup non-threaded:
                incomplete -> PASS       (shard-snb)
                incomplete -> PASS       (shard-hsw) fdo#103525

fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
fdo#103525 https://bugs.freedesktop.org/show_bug.cgi?id=103525

shard-hsw        total:2663 pass:1533 dwarn:1   dfail:0   fail:11  skip:1118 time:9499s
shard-snb        total:2663 pass:1308 dwarn:2   dfail:0   fail:11  skip:1342 time:8134s
Blacklisted hosts:
shard-apl        total:2663 pass:1691 dwarn:1   dfail:0   fail:22  skip:949 time:13646s
shard-kbl        total:2650 pass:1795 dwarn:1   dfail:0   fail:23  skip:830 time:10540s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7381/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder

[Ville Syrjälä]

On Thu, Nov 30, 2017 at 04:18:53PM +0100, Maarten Lankhorst wrote:
> Normally this is called on a modeset, but the call is missing when
> we inherit the mode from the BIOS, so make sure it's called somewhere
> in hardware readout.
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index cd60b4d5cd9d..26edae07e006 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -14843,6 +14843,8 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
>  
>  		connector->base.dpms = DRM_MODE_DPMS_OFF;
>  		connector->base.encoder = NULL;
> +	} else if (connector) {
> +		intel_opregion_notify_encoder(encoder, true);


We should probably also do intel_opregion_notify_encoder(encoder, false)
when intel_sanitize_encoder() disables the encoder.

>  	}
>  }
>  
> -- 
> 2.15.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder

[Maarten Lankhorst]

Op 01-12-17 om 14:32 schreef Ville Syrjälä:
> On Thu, Nov 30, 2017 at 04:18:53PM +0100, Maarten Lankhorst wrote:
>> Normally this is called on a modeset, but the call is missing when
>> we inherit the mode from the BIOS, so make sure it's called somewhere
>> in hardware readout.
>>
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_display.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>> index cd60b4d5cd9d..26edae07e006 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -14843,6 +14843,8 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
>>  
>>  		connector->base.dpms = DRM_MODE_DPMS_OFF;
>>  		connector->base.encoder = NULL;
>> +	} else if (connector) {
>> +		intel_opregion_notify_encoder(encoder, true);
>
> We should probably also do intel_opregion_notify_encoder(encoder, false)
> when intel_sanitize_encoder() disables the encoder.
Would it be terrible to always call intel_opregion_notify_encoder, with true or false depending on need?

~Maarten
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Call intel_opregion_notify_encoder in intel_sanitize_encoder

[Ville Syrjälä]

On Wed, Dec 06, 2017 at 09:52:51AM +0100, Maarten Lankhorst wrote:
> Op 01-12-17 om 14:32 schreef Ville Syrjälä:
> > On Thu, Nov 30, 2017 at 04:18:53PM +0100, Maarten Lankhorst wrote:
> >> Normally this is called on a modeset, but the call is missing when
> >> we inherit the mode from the BIOS, so make sure it's called somewhere
> >> in hardware readout.
> >>
> >> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> >> ---
> >>  drivers/gpu/drm/i915/intel_display.c | 2 ++
> >>  1 file changed, 2 insertions(+)
> >>
> >> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> >> index cd60b4d5cd9d..26edae07e006 100644
> >> --- a/drivers/gpu/drm/i915/intel_display.c
> >> +++ b/drivers/gpu/drm/i915/intel_display.c
> >> @@ -14843,6 +14843,8 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
> >>  
> >>  		connector->base.dpms = DRM_MODE_DPMS_OFF;
> >>  		connector->base.encoder = NULL;
> >> +	} else if (connector) {
> >> +		intel_opregion_notify_encoder(encoder, true);
> >
> > We should probably also do intel_opregion_notify_encoder(encoder, false)
> > when intel_sanitize_encoder() disables the encoder.
> Would it be terrible to always call intel_opregion_notify_encoder, with true or false depending on need?

Sounds like a reasonable approach to me. But it's hard to say what the
correct thing is since this is all some form of BIOS magic.

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx