| Message ID | 20200204112927.17391-6-anshuman.gupta@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | 3 display pipes combination system support | expand |
On Tue, Feb 04, 2020 at 04:59:25PM +0530, Anshuman Gupta wrote: > intel_plane_fb_max_stride should return the max stride of > primary plane for first available pipe in intel device info > pipe_mask. > > changes since RFC: > - Introduced a helper to get first intel_crtc intel_get_first_crtc. [Ville] > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 5 +++-- > drivers/gpu/drm/i915/display/intel_display_types.h | 6 ++++++ > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 7c51eb3faeb3..0dcf400f6954 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -2706,9 +2706,10 @@ u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv, > > /* > * We assume the primary plane for pipe A has > - * the highest stride limits of them all. > + * the highest stride limits of them all, > + * if in case pipe A is disabled, use the first pipe from pipe_mask. > */ > - crtc = intel_get_crtc_for_pipe(dev_priv, PIPE_A); > + crtc = intel_get_first_crtc(dev_priv); > if (!crtc) > return 0; > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index 80a6460da852..1f295c89061a 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1423,6 +1423,12 @@ vlv_pipe_to_channel(enum pipe pipe) > } > } > > +static inline struct intel_crtc * > +intel_get_first_crtc(struct drm_i915_private *dev_priv) > +{ > + return to_intel_crtc(drm_crtc_from_index(&dev_priv->drm, 0)); > +} > + > static inline struct intel_crtc * > intel_get_crtc_for_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) > { > -- > 2.24.0
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 7c51eb3faeb3..0dcf400f6954 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -2706,9 +2706,10 @@ u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv, /* * We assume the primary plane for pipe A has - * the highest stride limits of them all. + * the highest stride limits of them all, + * if in case pipe A is disabled, use the first pipe from pipe_mask. */ - crtc = intel_get_crtc_for_pipe(dev_priv, PIPE_A); + crtc = intel_get_first_crtc(dev_priv); if (!crtc) return 0; diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 80a6460da852..1f295c89061a 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1423,6 +1423,12 @@ vlv_pipe_to_channel(enum pipe pipe) } } +static inline struct intel_crtc * +intel_get_first_crtc(struct drm_i915_private *dev_priv) +{ + return to_intel_crtc(drm_crtc_from_index(&dev_priv->drm, 0)); +} + static inline struct intel_crtc * intel_get_crtc_for_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) {
intel_plane_fb_max_stride should return the max stride of primary plane for first available pipe in intel device info pipe_mask. changes since RFC: - Introduced a helper to get first intel_crtc intel_get_first_crtc. [Ville] Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> --- drivers/gpu/drm/i915/display/intel_display.c | 5 +++-- drivers/gpu/drm/i915/display/intel_display_types.h | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-)