drm/i915/cnl: Cannonlake color init.
Cannonlake has same color setup as Geminilake. Legacy color load luts doesn't work anymore on Cannonlake+. Cc: Clint Taylor <clinton.a.taylor@intel.com> Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Clinton Taylor <clinton.a.taylor@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1499374873-2454-1-git-send-email-rodrigo.vivi@intel.com
This commit is contained in:
Родитель
3d16ca5890
Коммит
6602be0e2c
|
@ -449,6 +449,7 @@ static const struct intel_device_info intel_cannonlake_info = {
|
||||||
.gen = 10,
|
.gen = 10,
|
||||||
.ddb_size = 1024,
|
.ddb_size = 1024,
|
||||||
.has_csr = 1,
|
.has_csr = 1,
|
||||||
|
.color = { .degamma_lut_size = 0, .gamma_lut_size = 1024 }
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -615,7 +615,7 @@ void intel_color_init(struct drm_crtc *crtc)
|
||||||
IS_BROXTON(dev_priv)) {
|
IS_BROXTON(dev_priv)) {
|
||||||
dev_priv->display.load_csc_matrix = i9xx_load_csc_matrix;
|
dev_priv->display.load_csc_matrix = i9xx_load_csc_matrix;
|
||||||
dev_priv->display.load_luts = broadwell_load_luts;
|
dev_priv->display.load_luts = broadwell_load_luts;
|
||||||
} else if (IS_GEMINILAKE(dev_priv)) {
|
} else if (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) {
|
||||||
dev_priv->display.load_csc_matrix = i9xx_load_csc_matrix;
|
dev_priv->display.load_csc_matrix = i9xx_load_csc_matrix;
|
||||||
dev_priv->display.load_luts = glk_load_luts;
|
dev_priv->display.load_luts = glk_load_luts;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -3311,7 +3311,7 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,
|
||||||
|
|
||||||
plane_ctl = PLANE_CTL_ENABLE;
|
plane_ctl = PLANE_CTL_ENABLE;
|
||||||
|
|
||||||
if (!IS_GEMINILAKE(dev_priv)) {
|
if (!IS_GEMINILAKE(dev_priv) && !IS_CANNONLAKE(dev_priv)) {
|
||||||
plane_ctl |=
|
plane_ctl |=
|
||||||
PLANE_CTL_PIPE_GAMMA_ENABLE |
|
PLANE_CTL_PIPE_GAMMA_ENABLE |
|
||||||
PLANE_CTL_PIPE_CSC_ENABLE |
|
PLANE_CTL_PIPE_CSC_ENABLE |
|
||||||
|
@ -3367,7 +3367,7 @@ static void skylake_update_primary_plane(struct intel_plane *plane,
|
||||||
|
|
||||||
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
||||||
|
|
||||||
if (IS_GEMINILAKE(dev_priv)) {
|
if (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) {
|
||||||
I915_WRITE_FW(PLANE_COLOR_CTL(pipe, plane_id),
|
I915_WRITE_FW(PLANE_COLOR_CTL(pipe, plane_id),
|
||||||
PLANE_COLOR_PIPE_GAMMA_ENABLE |
|
PLANE_COLOR_PIPE_GAMMA_ENABLE |
|
||||||
PLANE_COLOR_PIPE_CSC_ENABLE |
|
PLANE_COLOR_PIPE_CSC_ENABLE |
|
||||||
|
|
|
@ -262,7 +262,7 @@ skl_update_plane(struct intel_plane *plane,
|
||||||
|
|
||||||
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
||||||
|
|
||||||
if (IS_GEMINILAKE(dev_priv)) {
|
if (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) {
|
||||||
I915_WRITE_FW(PLANE_COLOR_CTL(pipe, plane_id),
|
I915_WRITE_FW(PLANE_COLOR_CTL(pipe, plane_id),
|
||||||
PLANE_COLOR_PIPE_GAMMA_ENABLE |
|
PLANE_COLOR_PIPE_GAMMA_ENABLE |
|
||||||
PLANE_COLOR_PIPE_CSC_ENABLE |
|
PLANE_COLOR_PIPE_CSC_ENABLE |
|
||||||
|
|
Загрузка…
Ссылка в новой задаче