| Message ID | 20221019203527.1682301-1-clinton.a.taylor@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/hdmi: SPD infoframe updated for discrete | expand |
On Wed, 19 Oct 2022, "Taylor, Clinton A" <clinton.a.taylor@intel.com> wrote: > Replace internal with discrete on dgfx platforms Please use the imperative mood in the commit subject, i.e. "update" not "updated". > > Signed-off-by: Taylor, Clinton A <clinton.a.taylor@intel.com> > --- > drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c > index 93519fb23d9d..9070da469bdd 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -766,6 +766,7 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder, > struct intel_crtc_state *crtc_state, > struct drm_connector_state *conn_state) > { > + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); Always struct drm_i915_private *i915 for new code please. > struct hdmi_spd_infoframe *frame = &crtc_state->infoframes.spd.spd; > int ret; > > @@ -775,7 +776,10 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder, > crtc_state->infoframes.enable |= > intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_SPD); > > - ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx"); > + if (IS_DGFX(dev_priv)) > + ret = hdmi_spd_infoframe_init(frame, "Intel", "Discrete gfx"); > + else > + ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx"); > if (drm_WARN_ON(encoder->base.dev, ret)) > return false;
On Fri, 21 Oct 2022, Jani Nikula <jani.nikula@linux.intel.com> wrote: > On Wed, 19 Oct 2022, "Taylor, Clinton A" <clinton.a.taylor@intel.com> wrote: >> + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > Always struct drm_i915_private *i915 for new code please. Also for v2.
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 93519fb23d9d..9070da469bdd 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -766,6 +766,7 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder, struct intel_crtc_state *crtc_state, struct drm_connector_state *conn_state) { + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct hdmi_spd_infoframe *frame = &crtc_state->infoframes.spd.spd; int ret; @@ -775,7 +776,10 @@ intel_hdmi_compute_spd_infoframe(struct intel_encoder *encoder, crtc_state->infoframes.enable |= intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_SPD); - ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx"); + if (IS_DGFX(dev_priv)) + ret = hdmi_spd_infoframe_init(frame, "Intel", "Discrete gfx"); + else + ret = hdmi_spd_infoframe_init(frame, "Intel", "Integrated gfx"); if (drm_WARN_ON(encoder->base.dev, ret)) return false;
Replace internal with discrete on dgfx platforms Signed-off-by: Taylor, Clinton A <clinton.a.taylor@intel.com> --- drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)