Re: Question about drm-intel-next vs drm-intel-next-fixes for HDMI scrambling patch

Re: Question about drm-intel-next vs drm-intel-next-fixes for HDMI scrambling patch

[Jani Nikula]

On Wed, 29 Jul 2026, Jerome Tollet <jerome.tollet@gmail.com> wrote:
> Hi Jani,
>
> I would like to better understand the i915 patch flow, rather than question
> the decision itself.
>
> The commit b7d51d65e4f1 ("drm/i915/hdmi: Poll for 200 msec for
> TMDS_Scrambler_Status") was pushed to drm-intel-next on June 11. It was then
> included in the July 2 drm-intel-next pull, described as the first feature
> pull towards v7.3.
>
> However, it was not included in the drm-intel-next-fixes pulls for v7.2,
> including the June 25 pull, and it is consequently not present in v7.2-rc5.
>
> Could you please explain how the decision is made to route a patch to
> drm-intel-next versus drm-intel-next-fixes? In this particular case, was
> there a technical or review reason why the patch was not considered for the
> v7.2 fixes pull, or was it mainly a timing/queueing decision?
>
> I am asking to understand the process for future contributions.

All i915 patches get applied to drm-intel-next first, and fixes are
cherry-picked to drm-intel-fixes/drm-intel-next-fixes based on Fixes:
and Cc: stable trailers. In this case, the patch had neither, and none
were added while applying the patch.

It can still be cherry-picked for drm-intel-fixes if necessary.


BR,
Jani.

-- 
Jani Nikula, Intel

Re: Question about drm-intel-next vs drm-intel-next-fixes for HDMI scrambling patch

[Rodrigo Vivi]

On Thu, Jul 30, 2026 at 05:36:07AM +0200, Jerome Tollet wrote:
> Hi Jani,
> 
> Thanks, this clarifies the process.
> 
> I understand that the patch was applied to drm-intel-next first, but since it
> had neither a Fixes: nor a Cc: stable@vger.kernel.org trailer, it was not
> selected for drm-intel-fixes.
> 
> Since the patch fixes 4K@60Hz failures on some HDMI 2.0 sinks, and has passed
> CI and review, would you consider it appropriate to cherry-pick it into
> drm-intel-fixes for Linux 7.2, or should it remain targeted at Linux 7.3?

I will pick this up and send towards the 7.2

Do you agree that a proper fixes tag for this patch should be:

Fixes: 15953637886d ("drm/i915: enable scrambling")

?

If so I will manually add it while picking up for fixes.

Thanks,
Rodrigo.

> 
> I am happy to provide any additional testing or information if needed.
> 
> Thanks,
> Jerome

Re: Question about drm-intel-next vs drm-intel-next-fixes for HDMI scrambling patch

[Rodrigo Vivi]

On Thu, Jul 30, 2026 at 06:31:23PM +0200, Jerome Tollet wrote:
> Hi Rodrigo,
> 
> Yes, I agree that this is the appropriate Fixes tag:
> 
> Fixes: 15953637886d ("drm/i915: enable scrambling")
> 
> Thank you very much for picking this up for v7.2.

Thank you for the patch and for the heads up.
It is already in today's pull request towards drm-fixes
for 7.2-rc6

Thanks,
Rodrigo.

> 
> Best regards,
> Jerome