On Mon, Feb 22, 2016 at 02:18:07PM +0000, Lionel Landwerlin wrote:
> The moves a couple of functions programming the gamma LUT and CSC
> units into their own file.
>
> On generations prior to Haswell there is only a gamma LUT. From
> haswell on there is also a new enhanced color correction unit that
> isn't used yet. This is why we need to set the GAMMA_MODE register,
> either we're using the legacy 8bits LUT or enhanced LUTs (of 10 or
> 12bits).
>
> The CSC unit is only available from Haswell on.
>
> We also need to make a special case for CherryView which is recognized
> as a gen 8 but doesn't have the same enhanced color correction unit
> from Haswell on.
>
> v2: Fix access to GAMMA_MODE register on older generations than
> Haswell (from Matt Roper's comments)
>
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Matt Roper <matthew.d.roper at intel.com>
> ---
> drivers/gpu/drm/i915/Makefile | 1 +
> drivers/gpu/drm/i915/i915_drv.h | 2 +
> drivers/gpu/drm/i915/intel_color.c | 195
> +++++++++++++++++++++++++++++++++++
> drivers/gpu/drm/i915/intel_display.c | 163 +++--------------------------
> drivers/gpu/drm/i915/intel_drv.h | 10 ++
> 5 files changed, 220 insertions(+), 151 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/intel_color.c
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 0851de07..0516300 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -55,6 +55,7 @@ i915-y += intel_audio.o \
> intel_atomic.o \
> intel_atomic_plane.o \
> intel_bios.o \
> + intel_color.o \
> intel_display.o \
> intel_fbc.o \
> intel_fifo_underrun.o \
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 6644c2e..6634c09 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -659,6 +659,8 @@ struct drm_i915_display_funcs {
> /* render clock increase/decrease */
> /* display clock increase/decrease */
> /* pll clock increase/decrease */
> +
> + void (*load_luts)(struct drm_crtc *crtc);
> };
>
> enum forcewake_domain_id {
> diff --git a/drivers/gpu/drm/i915/intel_color.c
> b/drivers/gpu/drm/i915/intel_color.c
> new file mode 100644
> index 0000000..cce0155
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/intel_color.c
> @@ -0,0 +1,195 @@
> +/*
> + * Copyright © 2016 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> + * DEALINGS IN THE SOFTWARE.
> + *
> + */
> +
> +#include "intel_drv.h"
> +
> +/*
> + * Set up the pipe CSC unit.
> + *
> + * Currently only full range RGB to limited range RGB conversion
> + * is supported, but eventually this should handle various
> + * RGB<->YCbCr scenarios as well.
> + */
> +static void i9xx_load_csc_matrix(struct drm_crtc *crtc)
> +{
> + struct drm_device *dev = crtc->dev;
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> + int pipe = intel_crtc->pipe;
> + uint16_t coeff = 0x7800; /* 1.0 */
> +
> + /*
> + * TODO: Check what kind of values actually come out of the pipe
> + * with these coeff/postoff values and adjust to get the best
> + * accuracy. Perhaps we even need to take the bpc value into
> + * consideration.
> + */
> +
> + if (intel_crtc->config->limited_color_range)
> + coeff = ((235 - 16) * (1 << 12) / 255) & 0xff8; /* 0.xxx... */
> +
> + /*
> + * GY/GU and RY/RU should be the other way around according
> + * to BSpec, but reality doesn't agree. Just set them up in
> + * a way that results in the correct picture.
> + */
> + I915_WRITE(PIPE_CSC_COEFF_RY_GY(pipe), coeff << 16);
> + I915_WRITE(PIPE_CSC_COEFF_BY(pipe), 0);
> +
> + I915_WRITE(PIPE_CSC_COEFF_RU_GU(pipe), coeff);
> + I915_WRITE(PIPE_CSC_COEFF_BU(pipe), 0);
> +
> + I915_WRITE(PIPE_CSC_COEFF_RV_GV(pipe), 0);
> + I915_WRITE(PIPE_CSC_COEFF_BV(pipe), coeff << 16);
> +
> + I915_WRITE(PIPE_CSC_PREOFF_HI(pipe), 0);
> + I915_WRITE(PIPE_CSC_PREOFF_ME(pipe), 0);
> + I915_WRITE(PIPE_CSC_PREOFF_LO(pipe), 0);
> +
> + if (INTEL_INFO(dev)->gen > 6) {
> + uint16_t postoff = 0;
> +
> + if (intel_crtc->config->limited_color_range)
> + postoff = (16 * (1 << 12) / 255) & 0x1fff;
> +
> + I915_WRITE(PIPE_CSC_POSTOFF_HI(pipe), postoff);
> + I915_WRITE(PIPE_CSC_POSTOFF_ME(pipe), postoff);
> + I915_WRITE(PIPE_CSC_POSTOFF_LO(pipe), postoff);
> +
> + I915_WRITE(PIPE_CSC_MODE(pipe), 0);
> + } else {
> + uint32_t mode = CSC_MODE_YUV_TO_RGB;
> +
> + if (intel_crtc->config->limited_color_range)
> + mode |= CSC_BLACK_SCREEN_OFFSET;
> +
> + I915_WRITE(PIPE_CSC_MODE(pipe), mode);
> + }
> +}
> +
> +void intel_color_set_csc(struct drm_crtc *crtc)
> +{
> + i9xx_load_csc_matrix(crtc);
> +}
> +
> +/* Loads the palette/gamma unit for the CRTC with the prepared values. */
> +static void i9xx_load_luts(struct drm_crtc *crtc)
> +{
> + struct drm_device *dev = crtc->dev;
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> + enum pipe pipe = intel_crtc->pipe;
> + int i;
> +
> + if (HAS_GMCH_DISPLAY(dev)) {
> + if (intel_crtc->config->has_dsi_encoder)
> + assert_dsi_pll_enabled(dev_priv);
> + else
> + assert_pll_enabled(dev_priv, pipe);
> + }
> +
> + for (i = 0; i < 256; i++) {
> + uint32_t word = (intel_crtc->lut_r[i] << 16) |
> + (intel_crtc->lut_g[i] << 8) |
> + intel_crtc->lut_b[i];
> + if (HAS_GMCH_DISPLAY(dev))
> + I915_WRITE(PALETTE(pipe, i), word);
> + else
> + I915_WRITE(LGC_PALETTE(pipe, i), word);
> + }
> +}
> +
> +/* Loads the legacy palette/gamma unit for the CRTC on Haswell+. */
> +static void haswell_load_luts(struct drm_crtc *crtc)
> +{
> + struct drm_device *dev = crtc->dev;
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> + bool reenable_ips = false;
> +
> + /*
> + * Workaround : Do not read or write the pipe palette/gamma data while
> + * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS enabled.
> + */
> + if (IS_HASWELL(dev) && intel_crtc->config->ips_enabled &&
> + ((I915_READ(GAMMA_MODE(intel_crtc->pipe)) & GAMMA_MODE_MODE_MASK) ==
> + GAMMA_MODE_MODE_SPLIT)) {
> + hsw_disable_ips(intel_crtc);
> + reenable_ips = true;
> + }
> + I915_WRITE(GAMMA_MODE(intel_crtc->pipe), GAMMA_MODE_MODE_8BIT);
> +
> + i9xx_load_luts(crtc);
> +
> + if (reenable_ips)
> + hsw_enable_ips(intel_crtc);
> +}
> +
> +void intel_color_load_luts(struct drm_crtc *crtc)
> +{
> + struct drm_device *dev = crtc->dev;
> + struct drm_i915_private *dev_priv = dev->dev_private;
> +
> + /* The clocks have to be on to load the palette. */
> + if (!crtc->state->active)
> + return;
> +
> + dev_priv->display.load_luts(crtc);
> +}
> +
> +void intel_color_legacy_gamma_set(struct drm_crtc *crtc, u16 *red, u16
> *green,
> + u16 *blue, uint32_t start, uint32_t size)
> +{
> + int end = (start + size > 256) ? 256 : start + size, i;
> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> +
> + for (i = start; i < end; i++) {
> + intel_crtc->lut_r[i] = red[i] >> 8;
> + intel_crtc->lut_g[i] = green[i] >> 8;
> + intel_crtc->lut_b[i] = blue[i] >> 8;
> + }
> +
> + intel_color_load_luts(crtc);
> +}
> +
> +void intel_color_init(struct drm_crtc *crtc)
> +{
> + struct drm_device *dev = crtc->dev;
> + struct drm_i915_private *dev_priv = dev->dev_private;
> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> + int i;
> +
> + drm_mode_crtc_set_gamma_size(crtc, 256);
> + for (i = 0; i < 256; i++) {
> + intel_crtc->lut_r[i] = i;
> + intel_crtc->lut_g[i] = i;
> + intel_crtc->lut_b[i] = i;
> + }
> +
> + if (IS_HASWELL(dev) ||
> + (INTEL_INFO(dev)->gen >= 8 && !IS_CHERRYVIEW(dev)))
> + dev_priv->display.load_luts = haswell_load_luts;
> + else
> + dev_priv->display.load_luts = i9xx_load_luts;
> +}
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index deee560..acbb1d9 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -101,7 +101,6 @@ static void intel_cpu_transcoder_set_m_n(struct
> intel_crtc *crtc,
> struct intel_link_m_n *m2_n2);
> static void ironlake_set_pipeconf(struct drm_crtc *crtc);
> static void haswell_set_pipeconf(struct drm_crtc *crtc);
> -static void intel_set_pipe_csc(struct drm_crtc *crtc);
> static void vlv_prepare_pll(struct intel_crtc *crtc,
> const struct intel_crtc_state *pipe_config);
> static void chv_prepare_pll(struct intel_crtc *crtc,
> @@ -1165,7 +1164,7 @@ void assert_pll(struct drm_i915_private *dev_priv,
> }
>
> /* XXX: the dsi pll is shared between MIPI DSI ports */
> -static void assert_dsi_pll(struct drm_i915_private *dev_priv, bool state)
> +void assert_dsi_pll(struct drm_i915_private *dev_priv, bool state)
> {
> u32 val;
> bool cur_state;
> @@ -1179,8 +1178,6 @@ static void assert_dsi_pll(struct drm_i915_private
> *dev_priv, bool state)
> "DSI PLL state assertion failure (expected %s, current %s)\n",
> onoff(state), onoff(cur_state));
> }
> -#define assert_dsi_pll_enabled(d) assert_dsi_pll(d, true)
> -#define assert_dsi_pll_disabled(d) assert_dsi_pll(d, false)
>
> struct intel_shared_dpll *
> intel_crtc_to_shared_dpll(struct intel_crtc *crtc)
> @@ -3315,7 +3312,7 @@ static void intel_update_pipe_config(struct intel_crtc
> *crtc,
> pipe_config->pipe_src_w, pipe_config->pipe_src_h);
>
> if (HAS_DDI(dev))
> - intel_set_pipe_csc(&crtc->base);
> + intel_color_set_csc(&crtc->base);
>
> /*
> * Update pipe size and adjust fitter if needed: the reason for this is
> @@ -4626,55 +4623,6 @@ void hsw_disable_ips(struct intel_crtc *crtc)
> intel_wait_for_vblank(dev, crtc->pipe);
> }
>
> -/** Loads the palette/gamma unit for the CRTC with the prepared values */
> -static void intel_crtc_load_lut(struct drm_crtc *crtc)
> -{
> - struct drm_device *dev = crtc->dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> - enum pipe pipe = intel_crtc->pipe;
> - int i;
> - bool reenable_ips = false;
> -
> - /* The clocks have to be on to load the palette. */
> - if (!crtc->state->active)
> - return;
> -
> - if (HAS_GMCH_DISPLAY(dev_priv->dev)) {
> - if (intel_crtc->config->has_dsi_encoder)
> - assert_dsi_pll_enabled(dev_priv);
> - else
> - assert_pll_enabled(dev_priv, pipe);
> - }
> -
> - /* Workaround : Do not read or write the pipe palette/gamma data while
> - * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS enabled.
> - */
> - if (IS_HASWELL(dev) && intel_crtc->config->ips_enabled &&
> - ((I915_READ(GAMMA_MODE(pipe)) & GAMMA_MODE_MODE_MASK) ==
> - GAMMA_MODE_MODE_SPLIT)) {
> - hsw_disable_ips(intel_crtc);
> - reenable_ips = true;
> - }
> -
> - for (i = 0; i < 256; i++) {
> - i915_reg_t palreg;
> -
> - if (HAS_GMCH_DISPLAY(dev))
> - palreg = PALETTE(pipe, i);
> - else
> - palreg = LGC_PALETTE(pipe, i);
> -
> - I915_WRITE(palreg,
> - (intel_crtc->lut_r[i] << 16) |
> - (intel_crtc->lut_g[i] << 8) |
> - intel_crtc->lut_b[i]);
> - }
> -
> - if (reenable_ips)
> - hsw_enable_ips(intel_crtc);
> -}
> -
> static void intel_crtc_dpms_overlay_disable(struct intel_crtc *intel_crtc)
> {
> if (intel_crtc->overlay) {
> @@ -4923,7 +4871,7 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
> * On ILK+ LUT must be loaded before the pipe is running but with
> * clocks enabled
> */
> - intel_crtc_load_lut(crtc);
> + intel_color_load_luts(crtc);
>
> intel_update_watermarks(crtc);
> intel_enable_pipe(intel_crtc);
> @@ -4989,7 +4937,7 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
>
> haswell_set_pipeconf(crtc);
>
> - intel_set_pipe_csc(crtc);
> + intel_color_set_csc(crtc);
>
> intel_crtc->active = true;
>
> @@ -5018,7 +4966,7 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
> * On ILK+ LUT must be loaded before the pipe is running but with
> * clocks enabled
> */
> - intel_crtc_load_lut(crtc);
> + intel_color_load_luts(crtc);
>
> intel_ddi_set_pipe_settings(crtc);
> if (!intel_crtc->config->has_dsi_encoder)
> @@ -6229,7 +6177,7 @@ static void valleyview_crtc_enable(struct drm_crtc
> *crtc)
>
> i9xx_pfit_enable(intel_crtc);
>
> - intel_crtc_load_lut(crtc);
> + intel_color_load_luts(crtc);
>
> intel_enable_pipe(intel_crtc);
>
> @@ -6282,7 +6230,7 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
>
> i9xx_pfit_enable(intel_crtc);
>
> - intel_crtc_load_lut(crtc);
> + intel_color_load_luts(crtc);
>
> intel_update_watermarks(crtc);
> intel_enable_pipe(intel_crtc);
> @@ -8737,70 +8685,6 @@ static void ironlake_set_pipeconf(struct drm_crtc
> *crtc)
> POSTING_READ(PIPECONF(pipe));
> }
>
> -/*
> - * Set up the pipe CSC unit.
> - *
> - * Currently only full range RGB to limited range RGB conversion
> - * is supported, but eventually this should handle various
> - * RGB<->YCbCr scenarios as well.
> - */
> -static void intel_set_pipe_csc(struct drm_crtc *crtc)
> -{
> - struct drm_device *dev = crtc->dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> - int pipe = intel_crtc->pipe;
> - uint16_t coeff = 0x7800; /* 1.0 */
> -
> - /*
> - * TODO: Check what kind of values actually come out of the pipe
> - * with these coeff/postoff values and adjust to get the best
> - * accuracy. Perhaps we even need to take the bpc value into
> - * consideration.
> - */
> -
> - if (intel_crtc->config->limited_color_range)
> - coeff = ((235 - 16) * (1 << 12) / 255) & 0xff8; /* 0.xxx... */
> -
> - /*
> - * GY/GU and RY/RU should be the other way around according
> - * to BSpec, but reality doesn't agree. Just set them up in
> - * a way that results in the correct picture.
> - */
> - I915_WRITE(PIPE_CSC_COEFF_RY_GY(pipe), coeff << 16);
> - I915_WRITE(PIPE_CSC_COEFF_BY(pipe), 0);
> -
> - I915_WRITE(PIPE_CSC_COEFF_RU_GU(pipe), coeff);
> - I915_WRITE(PIPE_CSC_COEFF_BU(pipe), 0);
> -
> - I915_WRITE(PIPE_CSC_COEFF_RV_GV(pipe), 0);
> - I915_WRITE(PIPE_CSC_COEFF_BV(pipe), coeff << 16);
> -
> - I915_WRITE(PIPE_CSC_PREOFF_HI(pipe), 0);
> - I915_WRITE(PIPE_CSC_PREOFF_ME(pipe), 0);
> - I915_WRITE(PIPE_CSC_PREOFF_LO(pipe), 0);
> -
> - if (INTEL_INFO(dev)->gen > 6) {
> - uint16_t postoff = 0;
> -
> - if (intel_crtc->config->limited_color_range)
> - postoff = (16 * (1 << 12) / 255) & 0x1fff;
> -
> - I915_WRITE(PIPE_CSC_POSTOFF_HI(pipe), postoff);
> - I915_WRITE(PIPE_CSC_POSTOFF_ME(pipe), postoff);
> - I915_WRITE(PIPE_CSC_POSTOFF_LO(pipe), postoff);
> -
> - I915_WRITE(PIPE_CSC_MODE(pipe), 0);
> - } else {
> - uint32_t mode = CSC_MODE_YUV_TO_RGB;
> -
> - if (intel_crtc->config->limited_color_range)
> - mode |= CSC_BLACK_SCREEN_OFFSET;
> -
> - I915_WRITE(PIPE_CSC_MODE(pipe), mode);
> - }
> -}
> -
> static void haswell_set_pipeconf(struct drm_crtc *crtc)
> {
> struct drm_device *dev = crtc->dev;
> @@ -8823,9 +8707,6 @@ static void haswell_set_pipeconf(struct drm_crtc *crtc)
> I915_WRITE(PIPECONF(cpu_transcoder), val);
> POSTING_READ(PIPECONF(cpu_transcoder));
>
> - I915_WRITE(GAMMA_MODE(intel_crtc->pipe), GAMMA_MODE_MODE_8BIT);
> - POSTING_READ(GAMMA_MODE(intel_crtc->pipe));
> -
> if (IS_BROADWELL(dev) || INTEL_INFO(dev)->gen >= 9) {
> val = 0;
>
> @@ -10238,21 +10119,6 @@ static bool cursor_size_ok(struct drm_device *dev,
> return true;
> }
>
> -static void intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
> - u16 *blue, uint32_t start, uint32_t size)
> -{
> - int end = (start + size > 256) ? 256 : start + size, i;
> - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> -
> - for (i = start; i < end; i++) {
> - intel_crtc->lut_r[i] = red[i] >> 8;
> - intel_crtc->lut_g[i] = green[i] >> 8;
> - intel_crtc->lut_b[i] = blue[i] >> 8;
> - }
> -
> - intel_crtc_load_lut(crtc);
> -}
> -
> /* VESA 640x480x72Hz mode to set on the pipe */
> static struct drm_display_mode load_detect_mode = {
> DRM_MODE("640x480", DRM_MODE_TYPE_DEFAULT, 31500, 640, 664,
> @@ -12001,7 +11867,7 @@ static int intel_crtc_atomic_check(struct drm_crtc
> *crtc,
>
> static const struct drm_crtc_helper_funcs intel_helper_funcs = {
> .mode_set_base_atomic = intel_pipe_set_base_atomic,
> - .load_lut = intel_crtc_load_lut,
> + .load_lut = intel_color_load_luts,
> .atomic_begin = intel_begin_crtc_commit,
> .atomic_flush = intel_finish_crtc_commit,
> .atomic_check = intel_crtc_atomic_check,
> @@ -13621,7 +13487,7 @@ out:
> #undef for_each_intel_crtc_masked
>
> static const struct drm_crtc_funcs intel_crtc_funcs = {
> - .gamma_set = intel_crtc_gamma_set,
> + .gamma_set = intel_color_legacy_gamma_set,
> .set_config = drm_atomic_helper_set_config,
> .destroy = intel_crtc_destroy,
> .page_flip = intel_crtc_page_flip,
> @@ -14228,7 +14094,7 @@ static void intel_crtc_init(struct drm_device *dev,
> int pipe)
> struct intel_crtc_state *crtc_state = NULL;
> struct drm_plane *primary = NULL;
> struct drm_plane *cursor = NULL;
> - int i, ret;
> + int ret;
>
> intel_crtc = kzalloc(sizeof(*intel_crtc), GFP_KERNEL);
> if (intel_crtc == NULL)
> @@ -14264,13 +14130,6 @@ static void intel_crtc_init(struct drm_device *dev,
> int pipe)
> if (ret)
> goto fail;
>
> - drm_mode_crtc_set_gamma_size(&intel_crtc->base, 256);
> - for (i = 0; i < 256; i++) {
> - intel_crtc->lut_r[i] = i;
> - intel_crtc->lut_g[i] = i;
> - intel_crtc->lut_b[i] = i;
> - }
> -
> /*
> * On gen2/3 only plane A can do fbc, but the panel fitter and lvds port
> * is hooked to pipe B. Hence we want plane A feeding pipe B.
> @@ -14295,6 +14154,8 @@ static void intel_crtc_init(struct drm_device *dev,
> int pipe)
>
> drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);
>
> + intel_color_init(&intel_crtc->base);
> +
> WARN_ON(drm_crtc_index(&intel_crtc->base) != intel_crtc->pipe);
> return;
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index 285b057..40fc486 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1164,6 +1164,9 @@ void assert_pll(struct drm_i915_private *dev_priv,
> enum pipe pipe, bool state);
> #define assert_pll_enabled(d, p) assert_pll(d, p, true)
> #define assert_pll_disabled(d, p) assert_pll(d, p, false)
> +void assert_dsi_pll(struct drm_i915_private *dev_priv, bool state);
> +#define assert_dsi_pll_enabled(d) assert_dsi_pll(d, true)
> +#define assert_dsi_pll_disabled(d) assert_dsi_pll(d, false)
> void assert_fdi_rx_pll(struct drm_i915_private *dev_priv,
> enum pipe pipe, bool state);
> #define assert_fdi_rx_pll_enabled(d, p) assert_fdi_rx_pll(d, p, true)
> @@ -1616,4 +1619,11 @@ void intel_plane_destroy_state(struct drm_plane *plane,
> struct drm_plane_state *state);
> extern const struct drm_plane_helper_funcs intel_plane_helper_funcs;
>
> +/* intel_color.c */
> +void intel_color_init(struct drm_crtc *crtc);
> +void intel_color_set_csc(struct drm_crtc *crtc);
> +void intel_color_load_luts(struct drm_crtc *crtc);
> +void intel_color_legacy_gamma_set(struct drm_crtc *crtc, u16 *red, u16
> *green,
> + u16 *blue, uint32_t start, uint32_t size);
> +
> #endif /* __INTEL_DRV_H__ */
> --
> 2.7.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
