[Intel-gfx] [PATCH v4-CI] drm/i915/psr: Force PSR probe only after full initialization

[Jani Nikula]

On Thu, 27 Feb 2020, Ross Zwisler <zwisler at google.com> wrote:
> On Thu, Feb 27, 2020 at 03:18:26PM +0200, Jani Nikula wrote:
>> On Fri, 21 Feb 2020, José Roberto de Souza <jose.souza at intel.com> wrote:
>> > Commit 60c6a14b489b ("drm/i915/display: Force the state compute phase
>> > once to enable PSR") was forcing the state compute too earlier
>> > causing errors because not everything was initialized, so here
>> > moving to the end of i915_driver_modeset_probe() when the display is
>> > all initialized.
>> 
>> Hmph, really not happy about the placement here. These are high level
>> functions, not a dumping ground for random feature specific hacks. :(
>
> Should we just revert 
>
> 60c6a14b489b ("drm/i915/display: Force the state compute phase once to enable PSR")
>
> and try to land a fixed-up version in the next kernel cycle?  The current
> state is that my machine is completely unable to boot because of this issue,
> and I've confirmed that the above patch reverts cleanly and fixes the issue.

IIUC this patch, already committed as df1a5bfc16f3 ("drm/i915/psr: Force
PSR probe only after full initialization"), fixes the issue for you. At
least the Tested-by says so. ;) So we should just go with that.

I'm just being grumpy about the aesthetics of the implementation. I've
already incorporated some cleanup to this in an existing refactoring I
had [1].

BR,
Jani.


[1] http://patchwork.freedesktop.org/patch/msgid/20200227135839.12912-1-jani.nikula@intel.com




-- 
Jani Nikula, Intel Open Source Graphics Center