Skip to content

Commit 6b97b11

Browse files
swatish2-linuxjnikula
authored andcommitted
drm/i915/display: Extract ilk_read_luts()
For ilk, 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 ilk_get_color_config() to ilk_read_luts() [Ville] v9: -80 character limit [Uma] -Made read func para as const [Ville, Uma] -Renamed ilk_read_gamma_lut() to ilk_read_lut_10() [Uma, Ville] v10: -Made ilk_read_luts() static [Jani] -ilk_load_lut_10 has lut_size, not (lut_size - 1) [Jani] Signed-off-by: Swati Sharma <[email protected]> Reviewed-by: Jani Nikula <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 1af2238 commit 6b97b11

File tree

2 files changed

+47
-1
lines changed

2 files changed

+47
-1
lines changed

drivers/gpu/drm/i915/display/intel_color.c

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1556,6 +1556,47 @@ static void i9xx_read_luts(struct intel_crtc_state *crtc_state)
15561556
crtc_state->base.gamma_lut = i9xx_read_lut_8(crtc_state);
15571557
}
15581558

1559+
static struct drm_property_blob *
1560+
ilk_read_lut_10(const struct intel_crtc_state *crtc_state)
1561+
{
1562+
struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
1563+
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
1564+
u32 lut_size = INTEL_INFO(dev_priv)->color.gamma_lut_size;
1565+
enum pipe pipe = crtc->pipe;
1566+
struct drm_property_blob *blob;
1567+
struct drm_color_lut *blob_data;
1568+
u32 i, val;
1569+
1570+
blob = drm_property_create_blob(&dev_priv->drm,
1571+
sizeof(struct drm_color_lut) * lut_size,
1572+
NULL);
1573+
if (IS_ERR(blob))
1574+
return NULL;
1575+
1576+
blob_data = blob->data;
1577+
1578+
for (i = 0; i < lut_size; i++) {
1579+
val = I915_READ(PREC_PALETTE(pipe, i));
1580+
1581+
blob_data[i].red = intel_color_lut_pack(REG_FIELD_GET(
1582+
PREC_PALETTE_RED_MASK, val), 10);
1583+
blob_data[i].green = intel_color_lut_pack(REG_FIELD_GET(
1584+
PREC_PALETTE_GREEN_MASK, val), 10);
1585+
blob_data[i].blue = intel_color_lut_pack(REG_FIELD_GET(
1586+
PREC_PALETTE_BLUE_MASK, val), 10);
1587+
}
1588+
1589+
return blob;
1590+
}
1591+
1592+
static void ilk_read_luts(struct intel_crtc_state *crtc_state)
1593+
{
1594+
if (crtc_state->gamma_mode == GAMMA_MODE_MODE_8BIT)
1595+
crtc_state->base.gamma_lut = i9xx_read_lut_8(crtc_state);
1596+
else
1597+
crtc_state->base.gamma_lut = ilk_read_lut_10(crtc_state);
1598+
}
1599+
15591600
void intel_color_init(struct intel_crtc *crtc)
15601601
{
15611602
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
@@ -1603,8 +1644,10 @@ void intel_color_init(struct intel_crtc *crtc)
16031644
dev_priv->display.load_luts = bdw_load_luts;
16041645
else if (INTEL_GEN(dev_priv) >= 7)
16051646
dev_priv->display.load_luts = ivb_load_luts;
1606-
else
1647+
else {
16071648
dev_priv->display.load_luts = ilk_load_luts;
1649+
dev_priv->display.read_luts = ilk_read_luts;
1650+
}
16081651
}
16091652

16101653
drm_crtc_enable_color_mgmt(&crtc->base,

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7200,6 +7200,9 @@ enum {
72007200
/* ilk/snb precision palette */
72017201
#define _PREC_PALETTE_A 0x4b000
72027202
#define _PREC_PALETTE_B 0x4c000
7203+
#define PREC_PALETTE_RED_MASK REG_GENMASK(29, 20)
7204+
#define PREC_PALETTE_GREEN_MASK REG_GENMASK(19, 10)
7205+
#define PREC_PALETTE_BLUE_MASK REG_GENMASK(9, 0)
72037206
#define PREC_PALETTE(pipe, i) _MMIO(_PIPE(pipe, _PREC_PALETTE_A, _PREC_PALETTE_B) + (i) * 4)
72047207

72057208
#define _PREC_PIPEAGCMAX 0x4d000

0 commit comments

Comments
 (0)