[Intel-gfx] Fixes that failed to backport to v4.12-rc1

[Jani Nikula]

On Thu, 08 Jun 2017, Ville Syrjälä <ville.syrjala at linux.intel.com> wrote:
> On Thu, Jun 08, 2017 at 05:47:23PM +0300, Jani Nikula wrote:
>> On Thu, 08 Jun 2017, Ville Syrjälä <ville.syrjala at linux.intel.com> wrote:
>> > On Wed, Jun 07, 2017 at 04:45:07PM +0300, Jani Nikula wrote:
>> >> On Mon, 15 May 2017, Jani Nikula <jani.nikula at intel.com> wrote:
>> >> > The following commits have been marked as Cc: stable or fixing something
>> >> > in v4.12-rc1 or earlier, but failed to cherry-pick to
>> >> > drm-intel-fixes. Please see if they are worth backporting, and please do
>> >> > so if they are.
>> >> 
>> >> Update:
>> >> 
>> >> d96a7d2adb04 ("drm/i915: Fix scaling check for 90/270 degree plane rotation")
>> >> fce5adf568ab ("drm/i915: Fix SKL+ watermarks for 90/270 rotation")
>> >> 
>> >> I am about to pick up 73714c05df97 ("drm/i915: Fix 90/270 rotated
>> >> coordinates for FBC") which does apply cleanly - does it make sense
>> >> without the other two?
>> >
>> > Probably not. Shouldn't be too hard for me to fix up the other two
>> > since I already resolved the same conflicts in the other direction
>> > when applying the patches ;)
>> 
>> Whoops, I already sent the pull request without the two. Anything bad in
>> me queuing the backports you provided in the next -rc? Or should I
>> recall the pull request to include these two at the same time?
>
> Next -rc is fine. No need to rush.

Thanks for the backports, pushed them.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center