linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 2388 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in:

  drivers/gpu/drm/i915/display/intel_vdsc.h

between commit:

  bb5f1cd10101c ("drm/i915/dsc: Add helper for writing DSC Selective Update ET parameters")

from the drm-intel-fixes tree and commits:

  c8698d61aeb3f ("drm/i915/dsc: Add helper for writing DSC Selective Update ET parameters")
  91f0a94974144 ("drm/i915/dsc: Add intel_dsc_get_slice_config()")
  889ff8dd4679a ("drm/i915/dsc: Track the detaild DSC slice configuration")

from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined drivers/gpu/drm/i915/display/intel_vdsc.h
index 99bb9042592a4,3372f8694054d..0000000000000
--- a/drivers/gpu/drm/i915/display/intel_vdsc.h
+++ b/drivers/gpu/drm/i915/display/intel_vdsc.h
@@@ -13,10 -13,16 +13,16 @@@ struct drm_printer
  enum transcoder;
  struct intel_crtc;
  struct intel_crtc_state;
+ struct intel_display;
  struct intel_dsb;
+ struct intel_dsc_slice_config;
  struct intel_encoder;
  
  bool intel_dsc_source_support(const struct intel_crtc_state *crtc_state);
+ int intel_dsc_line_slice_count(const struct intel_dsc_slice_config *config);
+ bool intel_dsc_get_slice_config(struct intel_display *display,
+ 				int num_joined_pipes, int slice_per_pipe,
+ 				struct intel_dsc_slice_config *config);
  void intel_uncompressed_joiner_enable(const struct intel_crtc_state *crtc_state);
  void intel_dsc_enable(const struct intel_crtc_state *crtc_state);
  void intel_dsc_disable(const struct intel_crtc_state *crtc_state);
@@@ -38,5 -44,8 +44,8 @@@ void intel_vdsc_state_dump(struct drm_p
  			   const struct intel_crtc_state *crtc_state);
  int intel_vdsc_min_cdclk(const struct intel_crtc_state *crtc_state);
  unsigned int intel_vdsc_prefill_lines(const struct intel_crtc_state *crtc_state);
+ int intel_dsc_get_pixel_rate_with_dsc_bubbles(struct intel_display *display,
+ 					      int pixel_rate, int htotal,
+ 					      int dsc_horizontal_slices);
  
  #endif /* __INTEL_VDSC_H__ */

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]