On Tue, Apr 11, 2023 at 06:51:52PM +0300, Ville Syrjälä wrote: > On Tue, Apr 11, 2023 at 03:58:49PM +0200, Greg KH wrote: > > On Mon, Apr 03, 2023 at 07:26:16PM +0300, Ville Syrjala wrote: > > > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > > > > > We're going to want different behavior for skl/glk vs. icl > > > in .color_commit_noarm(), so split the hook into two. Arguably > > > we already had slightly different behaviour since > > > csc_enable/gamma_enable are never set on icl+, so the old > > > code was perhaps a bit confusing as well. > > > > > > Cc: <stable@xxxxxxxxxxxxxxx> #v5.19+ > > > Cc: <stable@xxxxxxxxxxxxxxx> # 05ca98523481: drm/i915: Use _MMIO_PIPE() for SKL_BOTTOM_COLOR > > > Cc: Manasi Navare <navaremanasi@xxxxxxxxxx> > > > Cc: Drew Davenport <ddavenport@xxxxxxxxxxxx> > > > Cc: Imre Deak <imre.deak@xxxxxxxxx> > > > Cc: Jouni Högander <jouni.hogander@xxxxxxxxx> > > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > > Link: https://patchwork.freedesktop.org/patch/msgid/20230320095438.17328-2-ville.syrjala@xxxxxxxxxxxxxxx > > > Reviewed-by: Imre Deak <imre.deak@xxxxxxxxx> > > > (cherry picked from commit f161eb01f50ab31f2084975b43bce54b7b671e17) > > > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > > (cherry picked from commit 76b767d4d1cd052e455cf18e06929e8b2b70101d) > > > --- > > > drivers/gpu/drm/i915/display/intel_color.c | 21 ++++++++++++++++++++- > > > 1 file changed, 20 insertions(+), 1 deletion(-) > > > > This commit breaks the build. > > You did cherry pick all the dependencies I listed? Nope! When you send a patch series, I had assumed that it was self-contained :( I'll try that and see what happens this time... greg k-h