Re: [PATCH 2/3] drm/i915: Add a .color_post_update() hook

[Greg KH <greg@kroah.com>]

On Mon, Apr 03, 2023 at 07:26:17PM +0300, Ville Syrjälä wrote:
> We're going to need stuff after the color management
> register latching has happened. Add a corresponding hook.
> 
> (cherry picked from commit 3962ca4e080a525fc9eae87aa6b2286f1fae351d)
> (cherry picked from commit c880f855d1e240a956dcfce884269bad92fc849c)
> 
> Cc: <stable@vger.kernel.org> #v5.19+
> Cc: <stable@vger.kernel.org> # 52a90349f2ed: drm/i915: Introduce intel_crtc_needs_fastset()
> Cc: <stable@vger.kernel.org> # 925ac8bc33bf: drm/i915: Remove some local 'mode_changed' bools
> Cc: <stable@vger.kernel.org> # f5e674e92e95: drm/i915: Introduce intel_crtc_needs_color_update()
> Cc: <stable@vger.kernel.org> # 4c35e5d11900: drm/i915: Activate DRRS after state readout
> Cc: Manasi Navare <navaremanasi@google.com>
> Cc: Drew Davenport <ddavenport@chromium.org>
> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Jouni Högander <jouni.hogander@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Link: https://patchwork.freedesktop.org/patch/msgid/20230320095438.17328-4-ville.syrjala@linux.intel.com
> Reviewed-by: Imre Deak <imre.deak@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_color.c   | 13 +++++++++++++
>  drivers/gpu/drm/i915/display/intel_color.h   |  1 +
>  drivers/gpu/drm/i915/display/intel_display.c |  3 +++
>  3 files changed, 17 insertions(+)

This patch fails to apply:

checking file drivers/gpu/drm/i915/display/intel_color.c
checking file drivers/gpu/drm/i915/display/intel_color.h
Hunk #1 succeeded at 16 (offset -2 lines).
checking file drivers/gpu/drm/i915/display/intel_display.c
Hunk #1 FAILED at 1252.
1 out of 1 hunk FAILED

Can you rebase this, and 3/3, against the next 6.1.y release (which
contains other patches for this driver) and resend just the two missing
patches?

thanks,

greg k-h