On Wed, Jul 15, 2015 at 06:39:34PM +0530, Kausal Malladi wrote:
This patch adds set_property handler for Gamma color correction and enhancement capability at Pipe level on CHV/BSW platform. The set function just attaches the Gamma blob to CRTC state, that later gets committed using atomic path.
Signed-off-by: Shashank Sharma shashank.sharma@intel.com Signed-off-by: Kausal Malladi Kausal.Malladi@intel.com
drivers/gpu/drm/i915/intel_atomic.c | 7 +++++++ drivers/gpu/drm/i915/intel_color_manager.c | 19 +++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 3 +++ 3 files changed, 29 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index d873bda..72d6b37 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -473,6 +473,13 @@ int intel_crtc_atomic_set_property(struct drm_crtc *crtc, struct drm_property *property, uint64_t val) {
- struct drm_device *dev = crtc->dev;
- struct drm_mode_config *config = &dev->mode_config;
- if (property == config->prop_palette_after_ctm)
return intel_color_manager_set_pipe_gamma(dev, state,&crtc->base, val);- DRM_DEBUG_KMS("Unknown crtc property '%s'\n", property->name); return -EINVAL;
} diff --git a/drivers/gpu/drm/i915/intel_color_manager.c b/drivers/gpu/drm/i915/intel_color_manager.c index def20d0f..70c0d42 100644 --- a/drivers/gpu/drm/i915/intel_color_manager.c +++ b/drivers/gpu/drm/i915/intel_color_manager.c @@ -27,6 +27,25 @@
#include "intel_color_manager.h"
+int intel_color_manager_set_pipe_gamma(struct drm_device *dev,
struct drm_crtc_state *crtc_state,struct drm_mode_object *obj, uint32_t blob_id)+{
- struct drm_property_blob *blob;
- blob = drm_property_lookup_blob(dev, blob_id);
- if (!blob) {
DRM_ERROR("Invalid Blob ID\n");return -EINVAL;- }
I'm not terribly familiar the semantics of the color correction stuff...this prevents userspace from removing the gamma setting by passing a 0; is that expected that gamma can't be disabled once set? Same question for your degamma patch later in the series.
Matt
- if (crtc_state->palette_after_ctm_blob)
drm_property_unreference_blob(crtc_state->palette_after_ctm_blob);- crtc_state->palette_after_ctm_blob = blob;
- return 0;
+}
int get_chv_pipe_gamma_capabilities(struct drm_device *dev, struct drm_palette_caps *palette_caps, struct drm_crtc *crtc) { diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 1e61036..45c42f0 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1453,5 +1453,8 @@ extern const struct drm_plane_helper_funcs intel_plane_helper_funcs; /* intel_color_manager.c */ void intel_attach_color_properties_to_crtc(struct drm_device *dev, struct drm_mode_object *mode_obj); +int intel_color_manager_set_pipe_gamma(struct drm_device *dev,
struct drm_crtc_state *crtc_state,struct drm_mode_object *obj, uint32_t blob_id);#endif /* __INTEL_DRV_H__ */
2.4.5