* [PATCH] drm/i915: Use the first mode if there is no preferred mode in the EDID
@ 2014-05-13 15:07 Chris Wilson
2014-05-13 15:50 ` Chris Wilson
0 siblings, 1 reply; 9+ messages in thread
From: Chris Wilson @ 2014-05-13 15:07 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson, stable
This matches the algorithm used by earlier kernels when selecting the
mode for the fbcon. And only if there is no modes at all, do we fall
back to using the BIOS configuration. Seamless transition is still
preserved (from the BIOS configuration to ours) so long as the BIOS has
also chosen what we hope is the native configuration.
Reported-by: Knut Petersen <Knut_Petersen@t-online.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78655
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/i915/intel_fbdev.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 1d3f0a9cce31..05beec4badd5 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -397,6 +397,14 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
height);
}
+ /* No preferred mode marked by the EDID? Are there any modes? */
+ if (!modes[i] && !list_empty(&connector->modes)) {
+ DRM_DEBUG_KMS("using first mode listed on connector %s\n",
+ drm_get_connector_name(connector));
+ modes[i] = list_first_entry(struct drm_display_mode,
+ &connector->modes, head);
+ }
+
/* last resort: use current mode */
if (!modes[i]) {
/*
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Use the first mode if there is no preferred mode in the EDID
2014-05-13 15:07 [PATCH] drm/i915: Use the first mode if there is no preferred mode in the EDID Chris Wilson
@ 2014-05-13 15:50 ` Chris Wilson
2014-05-13 20:24 ` Jesse Barnes
0 siblings, 1 reply; 9+ messages in thread
From: Chris Wilson @ 2014-05-13 15:50 UTC (permalink / raw)
To: intel-gfx; +Cc: stable
On Tue, May 13, 2014 at 04:07:37PM +0100, Chris Wilson wrote:
> This matches the algorithm used by earlier kernels when selecting the
> mode for the fbcon. And only if there is no modes at all, do we fall
> back to using the BIOS configuration. Seamless transition is still
> preserved (from the BIOS configuration to ours) so long as the BIOS has
> also chosen what we hope is the native configuration.
>
> Reported-by: Knut Petersen <Knut_Petersen@t-online.de>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78655
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@vger.kernel.org
> ---
> drivers/gpu/drm/i915/intel_fbdev.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
> index 1d3f0a9cce31..05beec4badd5 100644
> --- a/drivers/gpu/drm/i915/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> @@ -397,6 +397,14 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
> height);
> }
>
> + /* No preferred mode marked by the EDID? Are there any modes? */
> + if (!modes[i] && !list_empty(&connector->modes)) {
> + DRM_DEBUG_KMS("using first mode listed on connector %s\n",
> + drm_get_connector_name(connector));
> + modes[i] = list_first_entry(struct drm_display_mode,
> + &connector->modes, head);
Please imagine that I wrote this correctly.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Use the first mode if there is no preferred mode in the EDID
2014-05-13 15:50 ` Chris Wilson
@ 2014-05-13 20:24 ` Jesse Barnes
2014-05-14 5:35 ` Knut Petersen
0 siblings, 1 reply; 9+ messages in thread
From: Jesse Barnes @ 2014-05-13 20:24 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx, stable
On Tue, 13 May 2014 16:50:12 +0100
Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Tue, May 13, 2014 at 04:07:37PM +0100, Chris Wilson wrote:
> > This matches the algorithm used by earlier kernels when selecting the
> > mode for the fbcon. And only if there is no modes at all, do we fall
> > back to using the BIOS configuration. Seamless transition is still
> > preserved (from the BIOS configuration to ours) so long as the BIOS has
> > also chosen what we hope is the native configuration.
> >
> > Reported-by: Knut Petersen <Knut_Petersen@t-online.de>
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78655
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: stable@vger.kernel.org
> > ---
> > drivers/gpu/drm/i915/intel_fbdev.c | 8 ++++++++
> > 1 file changed, 8 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
> > index 1d3f0a9cce31..05beec4badd5 100644
> > --- a/drivers/gpu/drm/i915/intel_fbdev.c
> > +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> > @@ -397,6 +397,14 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
> > height);
> > }
> >
> > + /* No preferred mode marked by the EDID? Are there any modes? */
> > + if (!modes[i] && !list_empty(&connector->modes)) {
> > + DRM_DEBUG_KMS("using first mode listed on connector %s\n",
> > + drm_get_connector_name(connector));
> > + modes[i] = list_first_entry(struct drm_display_mode,
> > + &connector->modes, head);
>
> Please imagine that I wrote this correctly.
Imagining you wrote it correctly:
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Use the first mode if there is no preferred mode in the EDID
2014-05-13 20:24 ` Jesse Barnes
@ 2014-05-14 5:35 ` Knut Petersen
2014-05-15 8:13 ` Jani Nikula
2014-05-15 8:57 ` Jani Nikula
0 siblings, 2 replies; 9+ messages in thread
From: Knut Petersen @ 2014-05-14 5:35 UTC (permalink / raw)
To: Jesse Barnes, Chris Wilson; +Cc: intel-gfx, stable
On 13.05.2014 22:24, Jesse Barnes wrote:
> On Tue, 13 May 2014 16:50:12 +0100
> Chris Wilson <chris@chris-wilson.co.uk> wrote:
>
>> On Tue, May 13, 2014 at 04:07:37PM +0100, Chris Wilson wrote:
>>> This matches the algorithm used by earlier kernels when selecting the
>>> mode for the fbcon. And only if there is no modes at all, do we fall
>>> back to using the BIOS configuration. Seamless transition is still
>>> preserved (from the BIOS configuration to ours) so long as the BIOS has
>>> also chosen what we hope is the native configuration.
>>>
>>> Reported-by: Knut Petersen <Knut_Petersen@t-online.de>
>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78655
>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>> Cc: stable@vger.kernel.org
I don't think that Cc: stable@vger.kernel.org is necessary, kernels up to 3.14.x don't
expose the problem. And as this fixes a post-3.14 regression this is a clear candidate for
3.15
>>> ---
>>> drivers/gpu/drm/i915/intel_fbdev.c | 8 ++++++++
>>> 1 file changed, 8 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
>>> index 1d3f0a9cce31..05beec4badd5 100644
>>> --- a/drivers/gpu/drm/i915/intel_fbdev.c
>>> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
>>> @@ -397,6 +397,14 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
>>> height);
>>> }
>>>
>>> + /* No preferred mode marked by the EDID? Are there any modes? */
>>> + if (!modes[i] && !list_empty(&connector->modes)) {
>>> + DRM_DEBUG_KMS("using first mode listed on connector %s\n",
>>> + drm_get_connector_name(connector));
>>> + modes[i] = list_first_entry(struct drm_display_mode,
>>> + &connector->modes, head);
>> Please imagine that I wrote this correctly.
> Imagining you wrote it correctly:
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
After proper imagination Tested-by: Knut Petersen <Knut_Petersen@t-online.de>.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Use the first mode if there is no preferred mode in the EDID
2014-05-14 5:35 ` Knut Petersen
@ 2014-05-15 8:13 ` Jani Nikula
2014-05-15 8:19 ` Chris Wilson
2014-05-15 8:57 ` Jani Nikula
1 sibling, 1 reply; 9+ messages in thread
From: Jani Nikula @ 2014-05-15 8:13 UTC (permalink / raw)
To: Knut Petersen, Jesse Barnes, Chris Wilson; +Cc: intel-gfx, stable
On Wed, 14 May 2014, Knut Petersen <Knut_Petersen@t-online.de> wrote:
> On 13.05.2014 22:24, Jesse Barnes wrote:
>> On Tue, 13 May 2014 16:50:12 +0100
>> Chris Wilson <chris@chris-wilson.co.uk> wrote:
>>
>>> On Tue, May 13, 2014 at 04:07:37PM +0100, Chris Wilson wrote:
>>>> This matches the algorithm used by earlier kernels when selecting the
>>>> mode for the fbcon. And only if there is no modes at all, do we fall
>>>> back to using the BIOS configuration. Seamless transition is still
>>>> preserved (from the BIOS configuration to ours) so long as the BIOS has
>>>> also chosen what we hope is the native configuration.
>>>>
>>>> Reported-by: Knut Petersen <Knut_Petersen@t-online.de>
>>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78655
>>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>>> Cc: stable@vger.kernel.org
> I don't think that Cc: stable@vger.kernel.org is necessary, kernels up
> to 3.14.x don't expose the problem. And as this fixes a post-3.14
> regression this is a clear candidate for 3.15
Chris, do we drop cc: stable?
Jani.
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Use the first mode if there is no preferred mode in the EDID
2014-05-15 8:13 ` Jani Nikula
@ 2014-05-15 8:19 ` Chris Wilson
2014-05-19 17:20 ` Knut Petersen
0 siblings, 1 reply; 9+ messages in thread
From: Chris Wilson @ 2014-05-15 8:19 UTC (permalink / raw)
To: Jani Nikula; +Cc: stable, intel-gfx
On Thu, May 15, 2014 at 11:13:01AM +0300, Jani Nikula wrote:
> On Wed, 14 May 2014, Knut Petersen <Knut_Petersen@t-online.de> wrote:
> > On 13.05.2014 22:24, Jesse Barnes wrote:
> >> On Tue, 13 May 2014 16:50:12 +0100
> >> Chris Wilson <chris@chris-wilson.co.uk> wrote:
> >>
> >>> On Tue, May 13, 2014 at 04:07:37PM +0100, Chris Wilson wrote:
> >>>> This matches the algorithm used by earlier kernels when selecting the
> >>>> mode for the fbcon. And only if there is no modes at all, do we fall
> >>>> back to using the BIOS configuration. Seamless transition is still
> >>>> preserved (from the BIOS configuration to ours) so long as the BIOS has
> >>>> also chosen what we hope is the native configuration.
> >>>>
> >>>> Reported-by: Knut Petersen <Knut_Petersen@t-online.de>
> >>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78655
> >>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >>>> Cc: stable@vger.kernel.org
>
> > I don't think that Cc: stable@vger.kernel.org is necessary, kernels up
> > to 3.14.x don't expose the problem. And as this fixes a post-3.14
> > regression this is a clear candidate for 3.15
>
> Chris, do we drop cc: stable?
The switch-over was in 3.15, then yes the regression is only limited to
3.15
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Use the first mode if there is no preferred mode in the EDID
2014-05-14 5:35 ` Knut Petersen
2014-05-15 8:13 ` Jani Nikula
@ 2014-05-15 8:57 ` Jani Nikula
1 sibling, 0 replies; 9+ messages in thread
From: Jani Nikula @ 2014-05-15 8:57 UTC (permalink / raw)
To: Knut Petersen, Jesse Barnes, Chris Wilson; +Cc: intel-gfx, stable
On Wed, 14 May 2014, Knut Petersen <Knut_Petersen@t-online.de> wrote:
> On 13.05.2014 22:24, Jesse Barnes wrote:
>> On Tue, 13 May 2014 16:50:12 +0100
>> Chris Wilson <chris@chris-wilson.co.uk> wrote:
>>>> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
>>>> index 1d3f0a9cce31..05beec4badd5 100644
>>>> --- a/drivers/gpu/drm/i915/intel_fbdev.c
>>>> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
>>>> @@ -397,6 +397,14 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
>>>> height);
>>>> }
>>>>
>>>> + /* No preferred mode marked by the EDID? Are there any modes? */
>>>> + if (!modes[i] && !list_empty(&connector->modes)) {
>>>> + DRM_DEBUG_KMS("using first mode listed on connector %s\n",
>>>> + drm_get_connector_name(connector));
>>>> + modes[i] = list_first_entry(struct drm_display_mode,
>>>> + &connector->modes, head);
>>> Please imagine that I wrote this correctly.
>> Imagining you wrote it correctly:
>> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>
> After proper imagination Tested-by: Knut Petersen <Knut_Petersen@t-online.de>.
Pushed the imagined version to -fixes, thanks for the patch, review,
testing, and imagination.
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Use the first mode if there is no preferred mode in the EDID
2014-05-15 8:19 ` Chris Wilson
@ 2014-05-19 17:20 ` Knut Petersen
2014-05-19 21:58 ` Daniel Vetter
0 siblings, 1 reply; 9+ messages in thread
From: Knut Petersen @ 2014-05-19 17:20 UTC (permalink / raw)
To: Chris Wilson, Jani Nikula, Jesse Barnes, intel-gfx, stable
On 15.05.2014 10:19, Chris Wilson wrote:
> On Thu, May 15, 2014 at 11:13:01AM +0300, Jani Nikula wrote:
>> On Wed, 14 May 2014, Knut Petersen <Knut_Petersen@t-online.de> wrote:
>>> On 13.05.2014 22:24, Jesse Barnes wrote:
>>>> On Tue, 13 May 2014 16:50:12 +0100
>>>> Chris Wilson <chris@chris-wilson.co.uk> wrote:
>>>>
>>>>> On Tue, May 13, 2014 at 04:07:37PM +0100, Chris Wilson wrote:
>>>>>> This matches the algorithm used by earlier kernels when selecting the
>>>>>> mode for the fbcon. And only if there is no modes at all, do we fall
>>>>>> back to using the BIOS configuration. Seamless transition is still
>>>>>> preserved (from the BIOS configuration to ours) so long as the BIOS has
>>>>>> also chosen what we hope is the native configuration.
>>>>>>
>>>>>> Reported-by: Knut Petersen <Knut_Petersen@t-online.de>
>>>>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78655
>>>>>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>>>>>> Cc: stable@vger.kernel.org
>>> I don't think that Cc: stable@vger.kernel.org is necessary, kernels up
>>> to 3.14.x don't expose the problem. And as this fixes a post-3.14
>>> regression this is a clear candidate for 3.15
>> Chris, do we drop cc: stable?
> The switch-over was in 3.15, then yes the regression is only limited to
> 3.15
> -Chris
>
Still missing in git master ...
cu,
Knut
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] drm/i915: Use the first mode if there is no preferred mode in the EDID
2014-05-19 17:20 ` Knut Petersen
@ 2014-05-19 21:58 ` Daniel Vetter
0 siblings, 0 replies; 9+ messages in thread
From: Daniel Vetter @ 2014-05-19 21:58 UTC (permalink / raw)
To: Knut Petersen; +Cc: intel-gfx, stable
On Mon, May 19, 2014 at 7:20 PM, Knut Petersen
<Knut_Petersen@t-online.de> wrote:
> Still missing in git master ...
It's in drm-intel-fixes and waiting for Dave to forward the pull
request to Linus.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-05-19 21:58 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-13 15:07 [PATCH] drm/i915: Use the first mode if there is no preferred mode in the EDID Chris Wilson
2014-05-13 15:50 ` Chris Wilson
2014-05-13 20:24 ` Jesse Barnes
2014-05-14 5:35 ` Knut Petersen
2014-05-15 8:13 ` Jani Nikula
2014-05-15 8:19 ` Chris Wilson
2014-05-19 17:20 ` Knut Petersen
2014-05-19 21:58 ` Daniel Vetter
2014-05-15 8:57 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox