drm/i915/display: Extract glk_read_luts()
For glk, add hw read out to create hw blob of gamma lut values. v4: -No need to initialize *blob [Jani] -Removed right shifts [Jani] -Dropped dev local var [Jani] v5: -Returned blob instead of assigning it internally within the function [Ville] -Renamed glk_get_color_config() to glk_read_luts() [Ville] -Added degamma validation [Ville] v9: -80 character limit [Uma] -Made read func para as const [Ville, Uma] Signed-off-by: Swati Sharma <swati2.sharma@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/1567538578-4489-8-git-send-email-swati2.sharma@intel.com
This commit is contained in:
Родитель
6b97b118d4
Коммит
4bb6a9d5d9
|
@ -1597,6 +1597,52 @@ static void ilk_read_luts(struct intel_crtc_state *crtc_state)
|
|||
crtc_state->base.gamma_lut = ilk_read_lut_10(crtc_state);
|
||||
}
|
||||
|
||||
static struct drm_property_blob *
|
||||
glk_read_lut_10(const struct intel_crtc_state *crtc_state, u32 prec_index)
|
||||
{
|
||||
struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
|
||||
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
||||
int hw_lut_size = ivb_lut_10_size(prec_index);
|
||||
enum pipe pipe = crtc->pipe;
|
||||
struct drm_property_blob *blob;
|
||||
struct drm_color_lut *blob_data;
|
||||
u32 i, val;
|
||||
|
||||
I915_WRITE(PREC_PAL_INDEX(pipe), prec_index |
|
||||
PAL_PREC_AUTO_INCREMENT);
|
||||
|
||||
blob = drm_property_create_blob(&dev_priv->drm,
|
||||
sizeof(struct drm_color_lut) * hw_lut_size,
|
||||
NULL);
|
||||
if (IS_ERR(blob))
|
||||
return NULL;
|
||||
|
||||
blob_data = blob->data;
|
||||
|
||||
for (i = 0; i < hw_lut_size; i++) {
|
||||
val = I915_READ(PREC_PAL_DATA(pipe));
|
||||
|
||||
blob_data[i].red = intel_color_lut_pack(REG_FIELD_GET(
|
||||
PREC_PAL_DATA_RED_MASK, val), 10);
|
||||
blob_data[i].green = intel_color_lut_pack(REG_FIELD_GET(
|
||||
PREC_PAL_DATA_GREEN_MASK, val), 10);
|
||||
blob_data[i].blue = intel_color_lut_pack(REG_FIELD_GET(
|
||||
PREC_PAL_DATA_BLUE_MASK, val), 10);
|
||||
}
|
||||
|
||||
I915_WRITE(PREC_PAL_INDEX(pipe), 0);
|
||||
|
||||
return blob;
|
||||
}
|
||||
|
||||
static void glk_read_luts(struct intel_crtc_state *crtc_state)
|
||||
{
|
||||
if (crtc_state->gamma_mode == GAMMA_MODE_MODE_8BIT)
|
||||
crtc_state->base.gamma_lut = i9xx_read_lut_8(crtc_state);
|
||||
else
|
||||
crtc_state->base.gamma_lut = glk_read_lut_10(crtc_state, PAL_PREC_INDEX_VALUE(0));
|
||||
}
|
||||
|
||||
void intel_color_init(struct intel_crtc *crtc)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
||||
|
@ -1638,9 +1684,10 @@ void intel_color_init(struct intel_crtc *crtc)
|
|||
|
||||
if (INTEL_GEN(dev_priv) >= 11)
|
||||
dev_priv->display.load_luts = icl_load_luts;
|
||||
else if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
|
||||
else if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)) {
|
||||
dev_priv->display.load_luts = glk_load_luts;
|
||||
else if (INTEL_GEN(dev_priv) >= 8)
|
||||
dev_priv->display.read_luts = glk_read_luts;
|
||||
} else if (INTEL_GEN(dev_priv) >= 8)
|
||||
dev_priv->display.load_luts = bdw_load_luts;
|
||||
else if (INTEL_GEN(dev_priv) >= 7)
|
||||
dev_priv->display.load_luts = ivb_load_luts;
|
||||
|
|
|
@ -10351,6 +10351,9 @@ enum skl_power_gate {
|
|||
#define _PAL_PREC_GC_MAX_A 0x4A410
|
||||
#define _PAL_PREC_GC_MAX_B 0x4AC10
|
||||
#define _PAL_PREC_GC_MAX_C 0x4B410
|
||||
#define PREC_PAL_DATA_RED_MASK REG_GENMASK(29, 20)
|
||||
#define PREC_PAL_DATA_GREEN_MASK REG_GENMASK(19, 10)
|
||||
#define PREC_PAL_DATA_BLUE_MASK REG_GENMASK(9, 0)
|
||||
#define _PAL_PREC_EXT_GC_MAX_A 0x4A420
|
||||
#define _PAL_PREC_EXT_GC_MAX_B 0x4AC20
|
||||
#define _PAL_PREC_EXT_GC_MAX_C 0x4B420
|
||||
|
|
Загрузка…
Ссылка в новой задаче