| Message ID | 20220822081642.159908-3-suraj.kandpal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable Pipewriteback | expand |
> From: Suraj Kandpal <suraj.kandpal@intel.com> > > Changing intel_connector iterators as with writeback introduction not all > drm_connector will be embedded within intel_connector. > > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.h | 7 ++--- > .../drm/i915/display/intel_display_types.h | 26 ++++++++++++++++++- > .../drm/i915/display/intel_modeset_setup.c | 16 +++++++++--- > 3 files changed, 40 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.h > b/drivers/gpu/drm/i915/display/intel_display.h > index 4e9f22954a41..3b9987b5f304 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -52,6 +52,7 @@ struct intel_crtc_state; struct intel_digital_port; struct > intel_dp; struct intel_encoder; > +struct intel_connector; > struct intel_initial_plane_config; > struct intel_load_detect_pipe; > struct intel_plane; > @@ -469,16 +470,12 @@ enum hpd_pin { > for_each_if(intel_encoder_can_psr(intel_encoder)) > > #define for_each_intel_connector_iter(intel_connector, iter) \ > - while ((intel_connector = > to_intel_connector(drm_connector_list_iter_next(iter)))) > + while ((intel_connector = intel_connector_list_iter_next(iter))) > > #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \ > list_for_each_entry((intel_encoder), &(dev)- > >mode_config.encoder_list, base.head) \ > for_each_if((intel_encoder)->base.crtc == (__crtc)) > > -#define for_each_connector_on_encoder(dev, __encoder, intel_connector) > \ > - list_for_each_entry((intel_connector), &(dev)- > >mode_config.connector_list, base.head) \ > - for_each_if((intel_connector)->base.encoder == (__encoder)) > - > #define for_each_old_intel_plane_in_state(__state, plane, old_plane_state, > __i) \ > for ((__i) = 0; \ > (__i) < (__state)->base.dev->mode_config.num_total_plane && \ > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h > b/drivers/gpu/drm/i915/display/intel_display_types.h > index 0e94bd430bcb..7a82b7acbaf2 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1497,12 +1497,14 @@ struct cxsr_latency { #define > to_intel_atomic_state(x) container_of(x, struct intel_atomic_state, base) > #define to_intel_crtc(x) container_of(x, struct intel_crtc, base) #define > to_intel_crtc_state(x) container_of(x, struct intel_crtc_state, uapi) -#define > to_intel_connector(x) container_of(x, struct intel_connector, base) > +#define to_intel_wb_connector(x) container_of(x, struct > +intel_wb_connector, base) > #define to_intel_encoder(x) container_of(x, struct intel_encoder, base) > #define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, > base) #define to_intel_plane(x) container_of(x, struct intel_plane, base) > #define to_intel_plane_state(x) container_of(x, struct intel_plane_state, > uapi) #define intel_fb_obj(x) ((x) ? to_intel_bo((x)->obj[0]) : NULL) > +#define to_intel_connector(x) (((x->connector_type == > DRM_MODE_CONNECTOR_WRITEBACK)) ? \ > + NULL : container_of(x, struct intel_connector, > base)) > > struct intel_hdmi { > i915_reg_t hdmi_reg; > @@ -2068,4 +2070,26 @@ to_intel_frontbuffer(struct drm_framebuffer *fb) > return fb ? to_intel_framebuffer(fb)->frontbuffer : NULL; } > > +static inline struct intel_connector * > +intel_connector_list_iter_next(struct drm_connector_list_iter *iter) { > + struct drm_connector *connector; > + bool flag = true; > + /* > + * Skipping connector that are Writeback connector as they will > + * not be embedded in intel connector > + */ Better to be more clear, "An intel_connector entity is not created for writeback, hence decoupling" With the above changes Reviewed-by: Arun R Murthy <arun.r.murthy> > + while (flag) { > + connector = drm_connector_list_iter_next(iter); > + if (connector && !to_intel_connector(connector)) > + continue; > + > + flag = false; > + > + if (connector) > + return to_intel_connector(connector); > + > + } > + return NULL; > +} > #endif /* __INTEL_DISPLAY_TYPES_H__ */ diff --git > a/drivers/gpu/drm/i915/display/intel_modeset_setup.c > b/drivers/gpu/drm/i915/display/intel_modeset_setup.c > index f0e04d3904c6..985dfa5f7aa1 100644 > --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c > +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c > @@ -204,12 +204,22 @@ static bool intel_crtc_has_encoders(struct > intel_crtc *crtc) > > static struct intel_connector *intel_encoder_find_connector(struct > intel_encoder *encoder) { > - struct drm_device *dev = encoder->base.dev; > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > struct intel_connector *connector; > + struct drm_connector_list_iter conn_iter; > + bool found_connector = false; > > - for_each_connector_on_encoder(dev, &encoder->base, connector) > - return connector; > + drm_connector_list_iter_begin(&i915->drm, &conn_iter); > + for_each_intel_connector_iter(connector, &conn_iter) { > + if (&encoder->base == connector->base.encoder) { > + found_connector = true; > + break; > + } > + } > + drm_connector_list_iter_end(&conn_iter); > > + if (found_connector) > + return connector; > return NULL; > } > > -- > 2.25.1 Thanks and Regards, Arun R Murthy --------------------
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 4e9f22954a41..3b9987b5f304 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -52,6 +52,7 @@ struct intel_crtc_state; struct intel_digital_port; struct intel_dp; struct intel_encoder; +struct intel_connector; struct intel_initial_plane_config; struct intel_load_detect_pipe; struct intel_plane; @@ -469,16 +470,12 @@ enum hpd_pin { for_each_if(intel_encoder_can_psr(intel_encoder)) #define for_each_intel_connector_iter(intel_connector, iter) \ - while ((intel_connector = to_intel_connector(drm_connector_list_iter_next(iter)))) + while ((intel_connector = intel_connector_list_iter_next(iter))) #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \ list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \ for_each_if((intel_encoder)->base.crtc == (__crtc)) -#define for_each_connector_on_encoder(dev, __encoder, intel_connector) \ - list_for_each_entry((intel_connector), &(dev)->mode_config.connector_list, base.head) \ - for_each_if((intel_connector)->base.encoder == (__encoder)) - #define for_each_old_intel_plane_in_state(__state, plane, old_plane_state, __i) \ for ((__i) = 0; \ (__i) < (__state)->base.dev->mode_config.num_total_plane && \ diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 0e94bd430bcb..7a82b7acbaf2 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1497,12 +1497,14 @@ struct cxsr_latency { #define to_intel_atomic_state(x) container_of(x, struct intel_atomic_state, base) #define to_intel_crtc(x) container_of(x, struct intel_crtc, base) #define to_intel_crtc_state(x) container_of(x, struct intel_crtc_state, uapi) -#define to_intel_connector(x) container_of(x, struct intel_connector, base) +#define to_intel_wb_connector(x) container_of(x, struct intel_wb_connector, base) #define to_intel_encoder(x) container_of(x, struct intel_encoder, base) #define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, base) #define to_intel_plane(x) container_of(x, struct intel_plane, base) #define to_intel_plane_state(x) container_of(x, struct intel_plane_state, uapi) #define intel_fb_obj(x) ((x) ? to_intel_bo((x)->obj[0]) : NULL) +#define to_intel_connector(x) (((x->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)) ? \ + NULL : container_of(x, struct intel_connector, base)) struct intel_hdmi { i915_reg_t hdmi_reg; @@ -2068,4 +2070,26 @@ to_intel_frontbuffer(struct drm_framebuffer *fb) return fb ? to_intel_framebuffer(fb)->frontbuffer : NULL; } +static inline struct intel_connector * +intel_connector_list_iter_next(struct drm_connector_list_iter *iter) +{ + struct drm_connector *connector; + bool flag = true; + /* + * Skipping connector that are Writeback connector as they will + * not be embedded in intel connector + */ + while (flag) { + connector = drm_connector_list_iter_next(iter); + if (connector && !to_intel_connector(connector)) + continue; + + flag = false; + + if (connector) + return to_intel_connector(connector); + + } + return NULL; +} #endif /* __INTEL_DISPLAY_TYPES_H__ */ diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c b/drivers/gpu/drm/i915/display/intel_modeset_setup.c index f0e04d3904c6..985dfa5f7aa1 100644 --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c @@ -204,12 +204,22 @@ static bool intel_crtc_has_encoders(struct intel_crtc *crtc) static struct intel_connector *intel_encoder_find_connector(struct intel_encoder *encoder) { - struct drm_device *dev = encoder->base.dev; + struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct intel_connector *connector; + struct drm_connector_list_iter conn_iter; + bool found_connector = false; - for_each_connector_on_encoder(dev, &encoder->base, connector) - return connector; + drm_connector_list_iter_begin(&i915->drm, &conn_iter); + for_each_intel_connector_iter(connector, &conn_iter) { + if (&encoder->base == connector->base.encoder) { + found_connector = true; + break; + } + } + drm_connector_list_iter_end(&conn_iter); + if (found_connector) + return connector; return NULL; }