Message ID | 1444418952-5671-18-git-send-email-shashank.sharma@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 9 October 2015 at 20:29, Shashank Sharma <shashank.sharma@intel.com> wrote: > Function intel_attach_color_properties_to_crtc attaches a > color property to its CRTC object. This patch calls this > function from crtc initialization sequence. > > Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> > Signed-off-by: Kausal Malladi <kausalmalladi@gmail.com> Maybe squash this with patch 10, following the pattern set by other patches ? Regards, Emil
Regards Shashank On 10/10/2015 5:15 AM, Emil Velikov wrote: > On 9 October 2015 at 20:29, Shashank Sharma <shashank.sharma@intel.com> wrote: >> Function intel_attach_color_properties_to_crtc attaches a >> color property to its CRTC object. This patch calls this >> function from crtc initialization sequence. >> >> Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> >> Signed-off-by: Kausal Malladi <kausalmalladi@gmail.com> > Maybe squash this with patch 10, following the pattern set by other patches ? > As explained in the previous patch, attaching the property is like enabling the framework. It was Matt's comment to do it, only when atleast one platform is ready. That's why we added this patch after CHV implementation is completed. > Regards, > Emil >
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8235341..514cd44 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13859,6 +13859,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) intel_crtc->cursor_size = ~0; intel_crtc->wm.cxsr_allowed = true; + intel_attach_color_properties_to_crtc(dev, &intel_crtc->base); BUG_ON(pipe >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) || dev_priv->plane_to_crtc_mapping[intel_crtc->plane] != NULL); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index d100e81..1ce4f2b 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1472,4 +1472,6 @@ extern const struct drm_plane_helper_funcs intel_plane_helper_funcs; /* intel_color_mnager.c */ void intel_color_manager_crtc_commit(struct drm_device *dev, struct drm_crtc_state *crtc_state); +void intel_attach_color_properties_to_crtc(struct drm_device *dev, + struct drm_crtc *crtc); #endif /* __INTEL_DRV_H__ */