Or attach to Pipe directly for the unsupported Plane(s).
Signed-off-by: Austin Hu <[email protected]>
---
drivers/gpu/drm/i915/display/intel_color.c | 29 ++++++++++++++++---
drivers/gpu/drm/i915/display/intel_color.h | 11 ++-----
drivers/gpu/drm/i915/display/intel_plane.c | 4 +--
.../drm/i915/display/skl_universal_plane.c | 2 +-
4 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_color.c
b/drivers/gpu/drm/i915/display/intel_color.c
index e79506554..dff33c9c1 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -4090,7 +4090,10 @@ static void glk_load_lut_3d(struct intel_dsb *dsb,
intel_de_write_dsb(display, dsb, LUT_3D_INDEX(pipe), 0);
}
-static void glk_lut_3d_commit(struct intel_dsb *dsb, struct intel_crtc *crtc,
bool enable)
+static void glk_lut_3d_commit(struct intel_dsb *dsb,
+ struct intel_crtc *crtc,
+ struct intel_plane *plane,
+ bool enable)
{
struct intel_display *display = to_intel_display(crtc);
enum pipe pipe = crtc->pipe;
@@ -4102,8 +4105,25 @@ static void glk_lut_3d_commit(struct intel_dsb *dsb,
struct intel_crtc *crtc, bo
return;
}
- if (enable)
- val = LUT_3D_ENABLE | LUT_3D_READY | LUT_3D_BIND_PLANE_1;
+ if (enable) {
+ val = LUT_3D_ENABLE | LUT_3D_READY;
+
+ switch (plane->id) {
+ case PLANE_1:
+ val |= LUT_3D_BIND_PLANE_1;
+ break;
+ case PLANE_2:
+ val |= LUT_3D_BIND_PLANE_2;
+ break;
+ case PLANE_3:
+ val |= LUT_3D_BIND_PLANE_3;
+ break;
+ default:
+ /* Attached the 3D LUT block to Pipe. */
+ val |= LUT_3D_BIND_PIPE;
+ break;
+ }
+ }
intel_de_write_dsb(display, dsb, LUT_3D_CTL(pipe), val);
}
@@ -4238,13 +4258,14 @@ static const struct intel_color_funcs ilk_color_funcs =
{
};
void intel_color_plane_commit_arm(struct intel_dsb *dsb,
+ struct intel_plane *plane,
const struct intel_plane_state *plane_state)
{
struct intel_display *display = to_intel_display(plane_state);
struct intel_crtc *crtc = to_intel_crtc(plane_state->uapi.crtc);
if (crtc && intel_color_crtc_has_3dlut(display, crtc->pipe))
- glk_lut_3d_commit(dsb, crtc, !!plane_state->hw.lut_3d);
+ glk_lut_3d_commit(dsb, crtc, plane, !!plane_state->hw.lut_3d);
}
static void
diff --git a/drivers/gpu/drm/i915/display/intel_color.h
b/drivers/gpu/drm/i915/display/intel_color.h
index c21b9bdf7..bc8192d75 100644
--- a/drivers/gpu/drm/i915/display/intel_color.h
+++ b/drivers/gpu/drm/i915/display/intel_color.h
@@ -7,15 +7,7 @@
#define __INTEL_COLOR_H__
#include <linux/types.h>
-
-struct intel_atomic_state;
-struct intel_crtc_state;
-struct intel_crtc;
-struct intel_display;
-struct intel_dsb;
-struct intel_plane_state;
-struct drm_property_blob;
-enum pipe;
+#include "intel_display_types.h"
void intel_color_init_hooks(struct intel_display *display);
int intel_color_init(struct intel_display *display);
@@ -45,6 +37,7 @@ void intel_color_assert_luts(const struct intel_crtc_state
*crtc_state);
void intel_color_plane_program_pipeline(struct intel_dsb *dsb,
const struct intel_plane_state
*plane_state);
void intel_color_plane_commit_arm(struct intel_dsb *dsb,
+ struct intel_plane *plane,
const struct intel_plane_state *plane_state);
bool intel_color_crtc_has_3dlut(struct intel_display *display, enum pipe pipe);
#endif /* __INTEL_COLOR_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_plane.c
b/drivers/gpu/drm/i915/display/intel_plane.c
index 3dc2ed521..d30457c12 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -348,11 +348,11 @@ intel_plane_colorop_replace_blob(struct intel_plane_state
*plane_state,
if (intel_colorop->id == INTEL_PLANE_CB_CSC)
return drm_property_replace_blob(&plane_state->hw.ctm, blob);
else if (intel_colorop->id == INTEL_PLANE_CB_PRE_CSC_LUT)
- return drm_property_replace_blob(&plane_state->hw.degamma_lut,
blob);
+ return drm_property_replace_blob(&plane_state->hw.degamma_lut,
blob);
else if (intel_colorop->id == INTEL_PLANE_CB_POST_CSC_LUT)
return drm_property_replace_blob(&plane_state->hw.gamma_lut,
blob);
else if (intel_colorop->id == INTEL_PLANE_CB_3DLUT)
- return drm_property_replace_blob(&plane_state->hw.lut_3d,
blob);
+ return drm_property_replace_blob(&plane_state->hw.lut_3d, blob);
return false;
}
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 746e942ca..bf1b1c426 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -1670,7 +1670,7 @@ icl_plane_update_arm(struct intel_dsb *dsb,
icl_plane_update_sel_fetch_arm(dsb, plane, crtc_state, plane_state);
- intel_color_plane_commit_arm(dsb, plane_state);
+ intel_color_plane_commit_arm(dsb, plane, plane_state);
/*
* In order to have FBC for fp16 formats pixel normalizer block must be
--
2.34.1
