| Message ID | 20240821102349.3961986-6-arun.r.murthy@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Display Global histogram | expand |
> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of > Arun R Murthy > Sent: Wednesday, August 21, 2024 3:54 PM > To: intel-gfx@lists.freedesktop.org > Cc: Murthy, Arun R <arun.r.murthy@intel.com> > Subject: [PATCHv2 5/5] drm/i915/display/histogram: Histogram changes for > Display LNL+ > > In LNL+, histogram/IE data and index registers are added which was included > in the control registers in the legacy platforms. The new registers are used > for reading histogram and writing the IET LUT data. > > v2: Removed duplicate code (Jani) > > Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com> > --- > .../gpu/drm/i915/display/intel_histogram.c | 138 ++++++++++++------ > .../gpu/drm/i915/display/intel_histogram.h | 25 ++++ > 2 files changed, 122 insertions(+), 41 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_histogram.c > b/drivers/gpu/drm/i915/display/intel_histogram.c > index 189f7ccd6df8..9c31a7d83362 100644 > --- a/drivers/gpu/drm/i915/display/intel_histogram.c > +++ b/drivers/gpu/drm/i915/display/intel_histogram.c > @@ -26,38 +26,41 @@ struct intel_histogram { > u32 bindata[HISTOGRAM_BIN_COUNT]; > }; > > -static void intel_histogram_handle_int_work(struct work_struct *work) > +static void intel_histogram_read_data(struct intel_histogram > +*histogram) > { > - struct intel_histogram *histogram = container_of(work, > - struct intel_histogram, handle_histogram_int_work.work); > struct drm_i915_private *i915 = histogram->i915; > struct intel_crtc *intel_crtc = histogram->crtc; > - char *histogram_event[] = {"HISTOGRAM=1", NULL}; > u32 dpstbin; > int i, try = 0; > > - /* Wa: 14014889975 */ > - if (IS_DISPLAY_VER(i915, 12, 13)) > +retry: > + if (DISPLAY_VER(i915) >= 20) { > + /* Set index to zero */ > + intel_de_rmw(i915, DPST_HIST_INDEX(intel_crtc->pipe), > + DPST_HIST_BIN_INDEX_MASK, > DPST_HIST_BIN_INDEX(0)); > + } else { > intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > - DPST_CTL_RESTORE, 0); > + DPST_CTL_BIN_REG_FUNC_SEL | > DPST_CTL_BIN_REG_MASK, 0); > + } > > - /* > - * TODO: PSR to be exited while reading the Histogram data > - * Set DPST_CTL Bin Reg function select to TC > - * Set DPST_CTL Bin Register Index to 0 > - */ > -retry: > - intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > - DPST_CTL_BIN_REG_FUNC_SEL | > DPST_CTL_BIN_REG_MASK, 0); > for (i = 0; i < HISTOGRAM_BIN_COUNT; i++) { > - dpstbin = intel_de_read(i915, DPST_BIN(intel_crtc->pipe)); > + dpstbin = intel_de_read(i915, DPST_HIST_BIN(intel_crtc- > >pipe)); > if (dpstbin & DPST_BIN_BUSY) { > /* > * If DPST_BIN busy bit is set, then set the > * DPST_CTL bin reg index to 0 and proceed > * from beginning. > */ > - if (try++ >= 5) { > + if (DISPLAY_VER(i915) >= 20) { > + intel_de_rmw(i915, > DPST_HIST_INDEX(intel_crtc->pipe), > + DPST_HIST_BIN_INDEX_MASK, > + DPST_HIST_BIN_INDEX(0)); > + } else { > + intel_de_rmw(i915, DPST_CTL(intel_crtc- > >pipe), > + DPST_CTL_BIN_REG_MASK, 0); > + } > + > + if (try++ == 5) { > drm_err(&i915->drm, > "Histogram block is busy, failed to > read\n"); > intel_de_rmw(i915, DPST_GUARD(intel_crtc- > >pipe), @@ -66,10 +69,37 @@ static void > intel_histogram_handle_int_work(struct work_struct *work) > } > goto retry; > } > - histogram->bindata[i] = dpstbin & DPST_BIN_DATA_MASK; > + histogram->bindata[i] = dpstbin & > DPST_HIST_BIN_DATA_MASK; > drm_dbg_atomic(&i915->drm, "Histogram[%d]=%x\n", > i, histogram->bindata[i]); > } > +} > + > +static void intel_histogram_get_data(struct intel_histogram *histogram) > +{ > + > + /* > + * TODO: PSR to be exited while reading the Histogram data > + * Set DPST_CTL Bin Reg function select to TC > + * Set DPST_CTL Bin Register Index to 0 > + */ > + intel_histogram_read_data(histogram); > +} > + > +static void intel_histogram_handle_int_work(struct work_struct *work) { > + struct intel_histogram *histogram = container_of(work, > + struct intel_histogram, handle_histogram_int_work.work); > + struct drm_i915_private *i915 = histogram->i915; > + struct intel_crtc *intel_crtc = histogram->crtc; > + char *histogram_event[] = {"HISTOGRAM=1", NULL}; > + > + /* Wa: 14014889975 */ > + if (IS_DISPLAY_VER(i915, 12, 13)) > + intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > + DPST_CTL_RESTORE, 0); > + > + intel_histogram_get_data(histogram); > > drm_property_replace_global_blob(&i915->drm, > &intel_crtc->config->histogram, > @@ -161,12 +191,19 @@ static int intel_histogram_enable(struct intel_crtc > *intel_crtc) > * enable DPST_CTL Histogram mode > * Clear DPST_CTL Bin Reg function select to TC > */ > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_IE_HIST_EN | > - DPST_CTL_HIST_MODE | > DPST_CTL_IE_TABLE_VALUE_FORMAT, > - DPST_CTL_BIN_REG_FUNC_TC | DPST_CTL_IE_HIST_EN | > - DPST_CTL_HIST_MODE_HSV | > - DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); > + if (DISPLAY_VER(i915) >= 20) > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE, > + DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE_HSV); > + else > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_BIN_REG_FUNC_SEL | > DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE | > DPST_CTL_IE_TABLE_VALUE_FORMAT, > + DPST_CTL_BIN_REG_FUNC_TC | > DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE_HSV | > + > DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); > I checked the Spec looks like this wait_for_vblank is not present. As the step 1 itself differs here and there is no need of putting in TC mode. > /* Re-Visit: check if wait for one vblank is required */ > drm_crtc_wait_one_vblank(&intel_crtc->base); > @@ -252,24 +289,43 @@ int intel_histogram_set_iet_lut(struct intel_crtc > *intel_crtc, u32 *data) > * Set DPST_CTL Bin Reg function select to IE > * Set DPST_CTL Bin Register Index to 0 > */ > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_BIN_REG_FUNC_SEL | > DPST_CTL_BIN_REG_MASK, > - DPST_CTL_BIN_REG_FUNC_IE | > DPST_CTL_BIN_REG_CLEAR); > - > - for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > - intel_de_rmw(i915, DPST_BIN(pipe), > - DPST_BIN_DATA_MASK, data[i]); > - drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", i, > data[i]); > + if (DISPLAY_VER(i915) >= 20) { > + /* Set index to zero */ > + intel_de_rmw(i915, DPST_IE_INDEX(pipe), > + DPST_IE_BIN_INDEX_MASK, > DPST_IE_BIN_INDEX(0)); > + for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > + intel_de_rmw(i915, DPST_IE_BIN(pipe), > + DPST_IE_BIN_DATA_MASK, > + DPST_IE_BIN_DATA(data[i])); > + drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", > + i, data[i]); > + } > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_ENHANCEMENT_MODE_MASK | > + DPST_CTL_IE_MODI_TABLE_EN, > + DPST_CTL_EN_MULTIPLICATIVE | > + DPST_CTL_IE_MODI_TABLE_EN); > + } else { > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_BIN_REG_FUNC_SEL | > DPST_CTL_BIN_REG_MASK, > + DPST_CTL_BIN_REG_FUNC_IE | > DPST_CTL_BIN_REG_CLEAR); > + for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > + intel_de_rmw(i915, DPST_BIN(pipe), > + DPST_BIN_DATA_MASK, data[i]); > + drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", > + i, data[i]); > + } > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_ENHANCEMENT_MODE_MASK | > + DPST_CTL_IE_MODI_TABLE_EN, > + DPST_CTL_EN_MULTIPLICATIVE | > + DPST_CTL_IE_MODI_TABLE_EN); > + > + /* Once IE is applied, change DPST CTL to TC */ > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_BIN_REG_FUNC_SEL, > + DPST_CTL_BIN_REG_FUNC_TC); > } > - > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_ENHANCEMENT_MODE_MASK | > DPST_CTL_IE_MODI_TABLE_EN, > - DPST_CTL_EN_MULTIPLICATIVE | > DPST_CTL_IE_MODI_TABLE_EN); > - > - /* Once IE is applied, change DPST CTL to TC */ > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_BIN_REG_FUNC_SEL, > DPST_CTL_BIN_REG_FUNC_TC); > - > return 0; > } > > diff --git a/drivers/gpu/drm/i915/display/intel_histogram.h > b/drivers/gpu/drm/i915/display/intel_histogram.h > index 5e24d3c5c28b..436e0b8e9ffd 100644 > --- a/drivers/gpu/drm/i915/display/intel_histogram.h > +++ b/drivers/gpu/drm/i915/display/intel_histogram.h > @@ -48,8 +48,33 @@ enum pipe; > #define _DPST_BIN_B 0x491C4 > #define DPST_BIN(pipe) > _MMIO_PIPE(pipe, _DPST_BIN_A, _DPST_BIN_B) > #define DPST_BIN_DATA_MASK > REG_GENMASK(23, 0) > +#define DPST_BIN_DATA > REG_FIELD_PREP(DPST_BIN_DATA_MASK, val) > #define DPST_BIN_BUSY REG_BIT(31) > > +#define _DPST_HIST_INDEX_A 0x490D8 > +#define _DPST_HIST_INDEX_B 0x491D8 > +#define DPST_HIST_INDEX(pipe) > _MMIO_PIPE(pipe, _DPST_HIST_INDEX_A, _DPST_HIST_INDEX_B) > +#define DPST_HIST_BIN_INDEX_MASK > REG_GENMASK(4, 0) > +#define DPST_HIST_BIN_INDEX(val) > REG_FIELD_PREP(DPST_HIST_BIN_INDEX_MASK, val) > + > +#define _DPST_HIST_BIN_A 0x490C4 > +#define _DPST_HIST_BIN_B 0x491C4 > +#define DPST_HIST_BIN(pipe) > _MMIO_PIPE(pipe, _DPST_HIST_BIN_A, _DPST_HIST_BIN_B) > +#define DPST_HIST_BIN_BUSY REG_BIT(31) > +#define DPST_HIST_BIN_DATA_MASK > REG_GENMASK(30, 0) > + > +#define _DPST_IE_BIN_A 0x490CC > +#define _DPST_IE_BIN_B 0x491CC > +#define DPST_IE_BIN(pipe) _MMIO_PIPE(pipe, > _DPST_IE_BIN_A, _DPST_IE_BIN_B) > +#define DPST_IE_BIN_DATA_MASK > REG_GENMASK(9, 0) > +#define DPST_IE_BIN_DATA(val) > REG_FIELD_PREP(DPST_IE_BIN_DATA_MASK, val) > + > +#define _DPST_IE_INDEX_A 0x490DC > +#define _DPST_IE_INDEX_B 0x491DC > +#define DPST_IE_INDEX(pipe) > _MMIO_PIPE(pipe, _DPST_IE_INDEX_A, _DPST_IE_INDEX_B) > +#define DPST_IE_BIN_INDEX_MASK > REG_GENMASK(6, 0) > +#define DPST_IE_BIN_INDEX(val) > REG_FIELD_PREP(DPST_IE_BIN_INDEX_MASK, val) > + > #define INTEL_HISTOGRAM_PIPEA 0x90000000 > #define INTEL_HISTOGRAM_PIPEB 0x90000002 > #define INTEL_HISTOGRAM_EVENT(pipe) PIPE(pipe, \ > -- > 2.25.1
> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Arun R > Murthy > Sent: Wednesday, August 21, 2024 3:54 PM > To: intel-gfx@lists.freedesktop.org > Cc: Murthy, Arun R <arun.r.murthy@intel.com> > Subject: [PATCHv2 5/5] drm/i915/display/histogram: Histogram changes for > Display LNL+ Drm/i915/histogram should suffice Lets not use LNL+ use Display 20+ > > In LNL+, histogram/IE data and index registers are added which was included in Same here > the control registers in the legacy platforms. The new registers are used for > reading histogram and writing the IET LUT data. > > v2: Removed duplicate code (Jani) > > Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com> > --- > .../gpu/drm/i915/display/intel_histogram.c | 138 ++++++++++++------ > .../gpu/drm/i915/display/intel_histogram.h | 25 ++++ > 2 files changed, 122 insertions(+), 41 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_histogram.c > b/drivers/gpu/drm/i915/display/intel_histogram.c > index 189f7ccd6df8..9c31a7d83362 100644 > --- a/drivers/gpu/drm/i915/display/intel_histogram.c > +++ b/drivers/gpu/drm/i915/display/intel_histogram.c > @@ -26,38 +26,41 @@ struct intel_histogram { > u32 bindata[HISTOGRAM_BIN_COUNT]; > }; > > -static void intel_histogram_handle_int_work(struct work_struct *work) > +static void intel_histogram_read_data(struct intel_histogram > +*histogram) > { > - struct intel_histogram *histogram = container_of(work, > - struct intel_histogram, handle_histogram_int_work.work); > struct drm_i915_private *i915 = histogram->i915; > struct intel_crtc *intel_crtc = histogram->crtc; > - char *histogram_event[] = {"HISTOGRAM=1", NULL}; > u32 dpstbin; > int i, try = 0; > > - /* Wa: 14014889975 */ > - if (IS_DISPLAY_VER(i915, 12, 13)) Looks messy will be cleaner when you move WA to 1 function as mentioned in previous patch review > +retry: > + if (DISPLAY_VER(i915) >= 20) { > + /* Set index to zero */ > + intel_de_rmw(i915, DPST_HIST_INDEX(intel_crtc->pipe), > + DPST_HIST_BIN_INDEX_MASK, > DPST_HIST_BIN_INDEX(0)); > + } else { > intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > - DPST_CTL_RESTORE, 0); > + DPST_CTL_BIN_REG_FUNC_SEL | > DPST_CTL_BIN_REG_MASK, 0); > + } > > - /* > - * TODO: PSR to be exited while reading the Histogram data > - * Set DPST_CTL Bin Reg function select to TC > - * Set DPST_CTL Bin Register Index to 0 > - */ > -retry: > - intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_BIN_REG_MASK, > 0); > for (i = 0; i < HISTOGRAM_BIN_COUNT; i++) { > - dpstbin = intel_de_read(i915, DPST_BIN(intel_crtc->pipe)); > + dpstbin = intel_de_read(i915, DPST_HIST_BIN(intel_crtc->pipe)); > if (dpstbin & DPST_BIN_BUSY) { > /* > * If DPST_BIN busy bit is set, then set the > * DPST_CTL bin reg index to 0 and proceed > * from beginning. > */ > - if (try++ >= 5) { > + if (DISPLAY_VER(i915) >= 20) { > + intel_de_rmw(i915, > DPST_HIST_INDEX(intel_crtc->pipe), > + DPST_HIST_BIN_INDEX_MASK, > + DPST_HIST_BIN_INDEX(0)); > + } else { > + intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > + DPST_CTL_BIN_REG_MASK, 0); > + } > + > + if (try++ == 5) { > drm_err(&i915->drm, > "Histogram block is busy, failed to > read\n"); > intel_de_rmw(i915, DPST_GUARD(intel_crtc- > >pipe), @@ -66,10 +69,37 @@ static void > intel_histogram_handle_int_work(struct work_struct *work) > } > goto retry; > } > - histogram->bindata[i] = dpstbin & DPST_BIN_DATA_MASK; > + histogram->bindata[i] = dpstbin & DPST_HIST_BIN_DATA_MASK; > drm_dbg_atomic(&i915->drm, "Histogram[%d]=%x\n", > i, histogram->bindata[i]); > } > +} > + > +static void intel_histogram_get_data(struct intel_histogram *histogram) > +{ > + > + /* > + * TODO: PSR to be exited while reading the Histogram data > + * Set DPST_CTL Bin Reg function select to TC > + * Set DPST_CTL Bin Register Index to 0 > + */ > + intel_histogram_read_data(histogram); > +} Maybe add read data and get data at the first patch will make this patch much more Cleaner and pleasing shouldn't really have any effect on build or functionality. > + > +static void intel_histogram_handle_int_work(struct work_struct *work) { > + struct intel_histogram *histogram = container_of(work, > + struct intel_histogram, handle_histogram_int_work.work); > + struct drm_i915_private *i915 = histogram->i915; > + struct intel_crtc *intel_crtc = histogram->crtc; > + char *histogram_event[] = {"HISTOGRAM=1", NULL}; > + > + /* Wa: 14014889975 */ > + if (IS_DISPLAY_VER(i915, 12, 13)) > + intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > + DPST_CTL_RESTORE, 0); > + > + intel_histogram_get_data(histogram); > > drm_property_replace_global_blob(&i915->drm, > &intel_crtc->config->histogram, > @@ -161,12 +191,19 @@ static int intel_histogram_enable(struct intel_crtc > *intel_crtc) > * enable DPST_CTL Histogram mode > * Clear DPST_CTL Bin Reg function select to TC > */ > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_IE_HIST_EN | > - DPST_CTL_HIST_MODE | > DPST_CTL_IE_TABLE_VALUE_FORMAT, > - DPST_CTL_BIN_REG_FUNC_TC | DPST_CTL_IE_HIST_EN | > - DPST_CTL_HIST_MODE_HSV | > - DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); > + if (DISPLAY_VER(i915) >= 20) > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE, > + DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE_HSV); > + else > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_BIN_REG_FUNC_SEL | > DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE | > DPST_CTL_IE_TABLE_VALUE_FORMAT, > + DPST_CTL_BIN_REG_FUNC_TC | > DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE_HSV | > + DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); > > /* Re-Visit: check if wait for one vblank is required */ > drm_crtc_wait_one_vblank(&intel_crtc->base); > @@ -252,24 +289,43 @@ int intel_histogram_set_iet_lut(struct intel_crtc > *intel_crtc, u32 *data) > * Set DPST_CTL Bin Reg function select to IE > * Set DPST_CTL Bin Register Index to 0 > */ > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_BIN_REG_MASK, > - DPST_CTL_BIN_REG_FUNC_IE | DPST_CTL_BIN_REG_CLEAR); > - > - for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > - intel_de_rmw(i915, DPST_BIN(pipe), > - DPST_BIN_DATA_MASK, data[i]); > - drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", i, data[i]); > + if (DISPLAY_VER(i915) >= 20) { > + /* Set index to zero */ > + intel_de_rmw(i915, DPST_IE_INDEX(pipe), > + DPST_IE_BIN_INDEX_MASK, DPST_IE_BIN_INDEX(0)); > + for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > + intel_de_rmw(i915, DPST_IE_BIN(pipe), > + DPST_IE_BIN_DATA_MASK, > + DPST_IE_BIN_DATA(data[i])); > + drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", > + i, data[i]); > + } > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_ENHANCEMENT_MODE_MASK | > + DPST_CTL_IE_MODI_TABLE_EN, > + DPST_CTL_EN_MULTIPLICATIVE | > + DPST_CTL_IE_MODI_TABLE_EN); > + } else { > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_BIN_REG_FUNC_SEL | > DPST_CTL_BIN_REG_MASK, > + DPST_CTL_BIN_REG_FUNC_IE | > DPST_CTL_BIN_REG_CLEAR); > + for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > + intel_de_rmw(i915, DPST_BIN(pipe), > + DPST_BIN_DATA_MASK, data[i]); > + drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", > + i, data[i]); > + } > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_ENHANCEMENT_MODE_MASK | > + DPST_CTL_IE_MODI_TABLE_EN, > + DPST_CTL_EN_MULTIPLICATIVE | > + DPST_CTL_IE_MODI_TABLE_EN); > + > + /* Once IE is applied, change DPST CTL to TC */ > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_BIN_REG_FUNC_SEL, > + DPST_CTL_BIN_REG_FUNC_TC); > } > - > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_ENHANCEMENT_MODE_MASK | > DPST_CTL_IE_MODI_TABLE_EN, > - DPST_CTL_EN_MULTIPLICATIVE | > DPST_CTL_IE_MODI_TABLE_EN); > - > - /* Once IE is applied, change DPST CTL to TC */ > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_BIN_REG_FUNC_SEL, > DPST_CTL_BIN_REG_FUNC_TC); > - > return 0; > } > > diff --git a/drivers/gpu/drm/i915/display/intel_histogram.h > b/drivers/gpu/drm/i915/display/intel_histogram.h > index 5e24d3c5c28b..436e0b8e9ffd 100644 > --- a/drivers/gpu/drm/i915/display/intel_histogram.h > +++ b/drivers/gpu/drm/i915/display/intel_histogram.h > @@ -48,8 +48,33 @@ enum pipe; > #define _DPST_BIN_B 0x491C4 > #define DPST_BIN(pipe) _MMIO_PIPE(pipe, > _DPST_BIN_A, _DPST_BIN_B) > #define DPST_BIN_DATA_MASK REG_GENMASK(23, 0) > +#define DPST_BIN_DATA > REG_FIELD_PREP(DPST_BIN_DATA_MASK, val) > #define DPST_BIN_BUSY REG_BIT(31) > > +#define _DPST_HIST_INDEX_A 0x490D8 > +#define _DPST_HIST_INDEX_B 0x491D8 > +#define DPST_HIST_INDEX(pipe) > _MMIO_PIPE(pipe, _DPST_HIST_INDEX_A, _DPST_HIST_INDEX_B) > +#define DPST_HIST_BIN_INDEX_MASK REG_GENMASK(4, 0) > +#define DPST_HIST_BIN_INDEX(val) > REG_FIELD_PREP(DPST_HIST_BIN_INDEX_MASK, val) > + > +#define _DPST_HIST_BIN_A 0x490C4 > +#define _DPST_HIST_BIN_B 0x491C4 > +#define DPST_HIST_BIN(pipe) _MMIO_PIPE(pipe, > _DPST_HIST_BIN_A, _DPST_HIST_BIN_B) > +#define DPST_HIST_BIN_BUSY REG_BIT(31) > +#define DPST_HIST_BIN_DATA_MASK > REG_GENMASK(30, 0) > + > +#define _DPST_IE_BIN_A 0x490CC > +#define _DPST_IE_BIN_B 0x491CC > +#define DPST_IE_BIN(pipe) _MMIO_PIPE(pipe, > _DPST_IE_BIN_A, _DPST_IE_BIN_B) > +#define DPST_IE_BIN_DATA_MASK > REG_GENMASK(9, 0) > +#define DPST_IE_BIN_DATA(val) > REG_FIELD_PREP(DPST_IE_BIN_DATA_MASK, val) > + > +#define _DPST_IE_INDEX_A 0x490DC > +#define _DPST_IE_INDEX_B 0x491DC > +#define DPST_IE_INDEX(pipe) _MMIO_PIPE(pipe, > _DPST_IE_INDEX_A, _DPST_IE_INDEX_B) > +#define DPST_IE_BIN_INDEX_MASK > REG_GENMASK(6, 0) > +#define DPST_IE_BIN_INDEX(val) > REG_FIELD_PREP(DPST_IE_BIN_INDEX_MASK, val) > + One more reason registers should have its own file Regards, Suraj Kandpal > #define INTEL_HISTOGRAM_PIPEA 0x90000000 > #define INTEL_HISTOGRAM_PIPEB 0x90000002 > #define INTEL_HISTOGRAM_EVENT(pipe) PIPE(pipe, \ > -- > 2.25.1
> > @@ -161,12 +191,19 @@ static int intel_histogram_enable(struct > > intel_crtc > > *intel_crtc) > > * enable DPST_CTL Histogram mode > > * Clear DPST_CTL Bin Reg function select to TC > > */ > > - intel_de_rmw(i915, DPST_CTL(pipe), > > - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_IE_HIST_EN | > > - DPST_CTL_HIST_MODE | > > DPST_CTL_IE_TABLE_VALUE_FORMAT, > > - DPST_CTL_BIN_REG_FUNC_TC | DPST_CTL_IE_HIST_EN | > > - DPST_CTL_HIST_MODE_HSV | > > - DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); > > + if (DISPLAY_VER(i915) >= 20) > > + intel_de_rmw(i915, DPST_CTL(pipe), > > + DPST_CTL_IE_HIST_EN | > > + DPST_CTL_HIST_MODE, > > + DPST_CTL_IE_HIST_EN | > > + DPST_CTL_HIST_MODE_HSV); > > + else > > + intel_de_rmw(i915, DPST_CTL(pipe), > > + DPST_CTL_BIN_REG_FUNC_SEL | > > DPST_CTL_IE_HIST_EN | > > + DPST_CTL_HIST_MODE | > > DPST_CTL_IE_TABLE_VALUE_FORMAT, > > + DPST_CTL_BIN_REG_FUNC_TC | > > DPST_CTL_IE_HIST_EN | > > + DPST_CTL_HIST_MODE_HSV | > > + > > DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); > > > I checked the Spec looks like this wait_for_vblank is not present. As the step 1 > itself differs here and there is no need of putting in TC mode. > This is required to get the histogram enable and then after enabling histogram, the guardband values are to be written. Thanks and Regards, Arun R Murthy --------------------
On Wed, 21 Aug 2024, Arun R Murthy <arun.r.murthy@intel.com> wrote: > In LNL+, histogram/IE data and index registers are added which was > included in the control registers in the legacy platforms. The new > registers are used for reading histogram and writing the IET LUT data. > > v2: Removed duplicate code (Jani) > > Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com> > --- > .../gpu/drm/i915/display/intel_histogram.c | 138 ++++++++++++------ > .../gpu/drm/i915/display/intel_histogram.h | 25 ++++ > 2 files changed, 122 insertions(+), 41 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_histogram.c b/drivers/gpu/drm/i915/display/intel_histogram.c > index 189f7ccd6df8..9c31a7d83362 100644 > --- a/drivers/gpu/drm/i915/display/intel_histogram.c > +++ b/drivers/gpu/drm/i915/display/intel_histogram.c > @@ -26,38 +26,41 @@ struct intel_histogram { > u32 bindata[HISTOGRAM_BIN_COUNT]; > }; > > -static void intel_histogram_handle_int_work(struct work_struct *work) > +static void intel_histogram_read_data(struct intel_histogram *histogram) Please refactor the stuff in patches 1-4 so the LNL changes just drop in cleanly, so we don't have to refactor stuff here anymore. > { > - struct intel_histogram *histogram = container_of(work, > - struct intel_histogram, handle_histogram_int_work.work); > struct drm_i915_private *i915 = histogram->i915; > struct intel_crtc *intel_crtc = histogram->crtc; > - char *histogram_event[] = {"HISTOGRAM=1", NULL}; > u32 dpstbin; > int i, try = 0; > > - /* Wa: 14014889975 */ > - if (IS_DISPLAY_VER(i915, 12, 13)) > +retry: > + if (DISPLAY_VER(i915) >= 20) { > + /* Set index to zero */ > + intel_de_rmw(i915, DPST_HIST_INDEX(intel_crtc->pipe), > + DPST_HIST_BIN_INDEX_MASK, DPST_HIST_BIN_INDEX(0)); > + } else { > intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > - DPST_CTL_RESTORE, 0); > + DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_BIN_REG_MASK, 0); > + } > > - /* > - * TODO: PSR to be exited while reading the Histogram data > - * Set DPST_CTL Bin Reg function select to TC > - * Set DPST_CTL Bin Register Index to 0 > - */ > -retry: > - intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_BIN_REG_MASK, 0); > for (i = 0; i < HISTOGRAM_BIN_COUNT; i++) { > - dpstbin = intel_de_read(i915, DPST_BIN(intel_crtc->pipe)); > + dpstbin = intel_de_read(i915, DPST_HIST_BIN(intel_crtc->pipe)); > if (dpstbin & DPST_BIN_BUSY) { > /* > * If DPST_BIN busy bit is set, then set the > * DPST_CTL bin reg index to 0 and proceed > * from beginning. > */ > - if (try++ >= 5) { > + if (DISPLAY_VER(i915) >= 20) { > + intel_de_rmw(i915, DPST_HIST_INDEX(intel_crtc->pipe), > + DPST_HIST_BIN_INDEX_MASK, > + DPST_HIST_BIN_INDEX(0)); > + } else { > + intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > + DPST_CTL_BIN_REG_MASK, 0); > + } > + > + if (try++ == 5) { > drm_err(&i915->drm, > "Histogram block is busy, failed to read\n"); > intel_de_rmw(i915, DPST_GUARD(intel_crtc->pipe), > @@ -66,10 +69,37 @@ static void intel_histogram_handle_int_work(struct work_struct *work) > } > goto retry; > } > - histogram->bindata[i] = dpstbin & DPST_BIN_DATA_MASK; > + histogram->bindata[i] = dpstbin & DPST_HIST_BIN_DATA_MASK; > drm_dbg_atomic(&i915->drm, "Histogram[%d]=%x\n", > i, histogram->bindata[i]); > } > +} > + > +static void intel_histogram_get_data(struct intel_histogram *histogram) > +{ > + > + /* > + * TODO: PSR to be exited while reading the Histogram data > + * Set DPST_CTL Bin Reg function select to TC > + * Set DPST_CTL Bin Register Index to 0 > + */ > + intel_histogram_read_data(histogram); > +} > + > +static void intel_histogram_handle_int_work(struct work_struct *work) > +{ > + struct intel_histogram *histogram = container_of(work, > + struct intel_histogram, handle_histogram_int_work.work); > + struct drm_i915_private *i915 = histogram->i915; > + struct intel_crtc *intel_crtc = histogram->crtc; > + char *histogram_event[] = {"HISTOGRAM=1", NULL}; > + > + /* Wa: 14014889975 */ > + if (IS_DISPLAY_VER(i915, 12, 13)) > + intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > + DPST_CTL_RESTORE, 0); > + > + intel_histogram_get_data(histogram); > > drm_property_replace_global_blob(&i915->drm, > &intel_crtc->config->histogram, > @@ -161,12 +191,19 @@ static int intel_histogram_enable(struct intel_crtc *intel_crtc) > * enable DPST_CTL Histogram mode > * Clear DPST_CTL Bin Reg function select to TC > */ > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_IE_HIST_EN | > - DPST_CTL_HIST_MODE | DPST_CTL_IE_TABLE_VALUE_FORMAT, > - DPST_CTL_BIN_REG_FUNC_TC | DPST_CTL_IE_HIST_EN | > - DPST_CTL_HIST_MODE_HSV | > - DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); > + if (DISPLAY_VER(i915) >= 20) > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE, > + DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE_HSV); > + else > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE | DPST_CTL_IE_TABLE_VALUE_FORMAT, > + DPST_CTL_BIN_REG_FUNC_TC | DPST_CTL_IE_HIST_EN | > + DPST_CTL_HIST_MODE_HSV | > + DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); > > /* Re-Visit: check if wait for one vblank is required */ > drm_crtc_wait_one_vblank(&intel_crtc->base); > @@ -252,24 +289,43 @@ int intel_histogram_set_iet_lut(struct intel_crtc *intel_crtc, u32 *data) > * Set DPST_CTL Bin Reg function select to IE > * Set DPST_CTL Bin Register Index to 0 > */ > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_BIN_REG_MASK, > - DPST_CTL_BIN_REG_FUNC_IE | DPST_CTL_BIN_REG_CLEAR); > - > - for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > - intel_de_rmw(i915, DPST_BIN(pipe), > - DPST_BIN_DATA_MASK, data[i]); > - drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", i, data[i]); > + if (DISPLAY_VER(i915) >= 20) { > + /* Set index to zero */ > + intel_de_rmw(i915, DPST_IE_INDEX(pipe), > + DPST_IE_BIN_INDEX_MASK, DPST_IE_BIN_INDEX(0)); > + for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > + intel_de_rmw(i915, DPST_IE_BIN(pipe), > + DPST_IE_BIN_DATA_MASK, > + DPST_IE_BIN_DATA(data[i])); > + drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", > + i, data[i]); > + } > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_ENHANCEMENT_MODE_MASK | > + DPST_CTL_IE_MODI_TABLE_EN, > + DPST_CTL_EN_MULTIPLICATIVE | > + DPST_CTL_IE_MODI_TABLE_EN); > + } else { > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_BIN_REG_MASK, > + DPST_CTL_BIN_REG_FUNC_IE | DPST_CTL_BIN_REG_CLEAR); > + for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > + intel_de_rmw(i915, DPST_BIN(pipe), > + DPST_BIN_DATA_MASK, data[i]); > + drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", > + i, data[i]); > + } > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_ENHANCEMENT_MODE_MASK | > + DPST_CTL_IE_MODI_TABLE_EN, > + DPST_CTL_EN_MULTIPLICATIVE | > + DPST_CTL_IE_MODI_TABLE_EN); > + > + /* Once IE is applied, change DPST CTL to TC */ > + intel_de_rmw(i915, DPST_CTL(pipe), > + DPST_CTL_BIN_REG_FUNC_SEL, > + DPST_CTL_BIN_REG_FUNC_TC); > } > - > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_ENHANCEMENT_MODE_MASK | DPST_CTL_IE_MODI_TABLE_EN, > - DPST_CTL_EN_MULTIPLICATIVE | DPST_CTL_IE_MODI_TABLE_EN); > - > - /* Once IE is applied, change DPST CTL to TC */ > - intel_de_rmw(i915, DPST_CTL(pipe), > - DPST_CTL_BIN_REG_FUNC_SEL, DPST_CTL_BIN_REG_FUNC_TC); > - > return 0; > } > > diff --git a/drivers/gpu/drm/i915/display/intel_histogram.h b/drivers/gpu/drm/i915/display/intel_histogram.h > index 5e24d3c5c28b..436e0b8e9ffd 100644 > --- a/drivers/gpu/drm/i915/display/intel_histogram.h > +++ b/drivers/gpu/drm/i915/display/intel_histogram.h > @@ -48,8 +48,33 @@ enum pipe; > #define _DPST_BIN_B 0x491C4 > #define DPST_BIN(pipe) _MMIO_PIPE(pipe, _DPST_BIN_A, _DPST_BIN_B) > #define DPST_BIN_DATA_MASK REG_GENMASK(23, 0) > +#define DPST_BIN_DATA REG_FIELD_PREP(DPST_BIN_DATA_MASK, val) > #define DPST_BIN_BUSY REG_BIT(31) > > +#define _DPST_HIST_INDEX_A 0x490D8 > +#define _DPST_HIST_INDEX_B 0x491D8 > +#define DPST_HIST_INDEX(pipe) _MMIO_PIPE(pipe, _DPST_HIST_INDEX_A, _DPST_HIST_INDEX_B) > +#define DPST_HIST_BIN_INDEX_MASK REG_GENMASK(4, 0) > +#define DPST_HIST_BIN_INDEX(val) REG_FIELD_PREP(DPST_HIST_BIN_INDEX_MASK, val) > + > +#define _DPST_HIST_BIN_A 0x490C4 > +#define _DPST_HIST_BIN_B 0x491C4 > +#define DPST_HIST_BIN(pipe) _MMIO_PIPE(pipe, _DPST_HIST_BIN_A, _DPST_HIST_BIN_B) > +#define DPST_HIST_BIN_BUSY REG_BIT(31) > +#define DPST_HIST_BIN_DATA_MASK REG_GENMASK(30, 0) > + > +#define _DPST_IE_BIN_A 0x490CC > +#define _DPST_IE_BIN_B 0x491CC > +#define DPST_IE_BIN(pipe) _MMIO_PIPE(pipe, _DPST_IE_BIN_A, _DPST_IE_BIN_B) > +#define DPST_IE_BIN_DATA_MASK REG_GENMASK(9, 0) > +#define DPST_IE_BIN_DATA(val) REG_FIELD_PREP(DPST_IE_BIN_DATA_MASK, val) > + > +#define _DPST_IE_INDEX_A 0x490DC > +#define _DPST_IE_INDEX_B 0x491DC > +#define DPST_IE_INDEX(pipe) _MMIO_PIPE(pipe, _DPST_IE_INDEX_A, _DPST_IE_INDEX_B) > +#define DPST_IE_BIN_INDEX_MASK REG_GENMASK(6, 0) > +#define DPST_IE_BIN_INDEX(val) REG_FIELD_PREP(DPST_IE_BIN_INDEX_MASK, val) > + > #define INTEL_HISTOGRAM_PIPEA 0x90000000 > #define INTEL_HISTOGRAM_PIPEB 0x90000002 > #define INTEL_HISTOGRAM_EVENT(pipe) PIPE(pipe, \
> > diff --git a/drivers/gpu/drm/i915/display/intel_histogram.c > > b/drivers/gpu/drm/i915/display/intel_histogram.c > > index 189f7ccd6df8..9c31a7d83362 100644 > > --- a/drivers/gpu/drm/i915/display/intel_histogram.c > > +++ b/drivers/gpu/drm/i915/display/intel_histogram.c > > @@ -26,38 +26,41 @@ struct intel_histogram { > > u32 bindata[HISTOGRAM_BIN_COUNT]; > > }; > > > > -static void intel_histogram_handle_int_work(struct work_struct *work) > > +static void intel_histogram_read_data(struct intel_histogram > > +*histogram) > > Please refactor the stuff in patches 1-4 so the LNL changes just drop in cleanly, > so we don't have to refactor stuff here anymore. > Done Thanks and Regards, Arun R Murthy --------------------
> -----Original Message----- > From: Kandpal, Suraj <suraj.kandpal@intel.com> > Sent: Wednesday, September 11, 2024 4:20 PM > To: Murthy, Arun R <arun.r.murthy@intel.com>; intel-gfx@lists.freedesktop.org > Cc: Murthy, Arun R <arun.r.murthy@intel.com> > Subject: RE: [PATCHv2 5/5] drm/i915/display/histogram: Histogram changes for > Display LNL+ > > > > > -----Original Message----- > > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of > > Arun R Murthy > > Sent: Wednesday, August 21, 2024 3:54 PM > > To: intel-gfx@lists.freedesktop.org > > Cc: Murthy, Arun R <arun.r.murthy@intel.com> > > Subject: [PATCHv2 5/5] drm/i915/display/histogram: Histogram changes > > for Display LNL+ > > Drm/i915/histogram should suffice > Lets not use LNL+ use Display 20+ > Done > > > > In LNL+, histogram/IE data and index registers are added which was > > included in > > Same here Done > > > the control registers in the legacy platforms. The new registers are > > used for reading histogram and writing the IET LUT data. > > > > v2: Removed duplicate code (Jani) > > > > Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com> > > --- > > .../gpu/drm/i915/display/intel_histogram.c | 138 ++++++++++++------ > > .../gpu/drm/i915/display/intel_histogram.h | 25 ++++ > > 2 files changed, 122 insertions(+), 41 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_histogram.c > > b/drivers/gpu/drm/i915/display/intel_histogram.c > > index 189f7ccd6df8..9c31a7d83362 100644 > > --- a/drivers/gpu/drm/i915/display/intel_histogram.c > > +++ b/drivers/gpu/drm/i915/display/intel_histogram.c > > @@ -26,38 +26,41 @@ struct intel_histogram { > > u32 bindata[HISTOGRAM_BIN_COUNT]; > > }; > > > > -static void intel_histogram_handle_int_work(struct work_struct *work) > > +static void intel_histogram_read_data(struct intel_histogram > > +*histogram) > > { > > - struct intel_histogram *histogram = container_of(work, > > - struct intel_histogram, handle_histogram_int_work.work); > > struct drm_i915_private *i915 = histogram->i915; > > struct intel_crtc *intel_crtc = histogram->crtc; > > - char *histogram_event[] = {"HISTOGRAM=1", NULL}; > > u32 dpstbin; > > int i, try = 0; > > > > - /* Wa: 14014889975 */ > > - if (IS_DISPLAY_VER(i915, 12, 13)) > > Looks messy will be cleaner when you move WA to 1 function as mentioned in > previous patch review > > > +retry: > > + if (DISPLAY_VER(i915) >= 20) { > > + /* Set index to zero */ > > + intel_de_rmw(i915, DPST_HIST_INDEX(intel_crtc->pipe), > > + DPST_HIST_BIN_INDEX_MASK, > > DPST_HIST_BIN_INDEX(0)); > > + } else { > > intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > > - DPST_CTL_RESTORE, 0); > > + DPST_CTL_BIN_REG_FUNC_SEL | > > DPST_CTL_BIN_REG_MASK, 0); > > + } > > > > - /* > > - * TODO: PSR to be exited while reading the Histogram data > > - * Set DPST_CTL Bin Reg function select to TC > > - * Set DPST_CTL Bin Register Index to 0 > > - */ > > -retry: > > - intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > > - DPST_CTL_BIN_REG_FUNC_SEL | > DPST_CTL_BIN_REG_MASK, > > 0); > > for (i = 0; i < HISTOGRAM_BIN_COUNT; i++) { > > - dpstbin = intel_de_read(i915, DPST_BIN(intel_crtc->pipe)); > > + dpstbin = intel_de_read(i915, DPST_HIST_BIN(intel_crtc- > >pipe)); > > if (dpstbin & DPST_BIN_BUSY) { > > /* > > * If DPST_BIN busy bit is set, then set the > > * DPST_CTL bin reg index to 0 and proceed > > * from beginning. > > */ > > - if (try++ >= 5) { > > + if (DISPLAY_VER(i915) >= 20) { > > + intel_de_rmw(i915, > > DPST_HIST_INDEX(intel_crtc->pipe), > > + DPST_HIST_BIN_INDEX_MASK, > > + DPST_HIST_BIN_INDEX(0)); > > + } else { > > + intel_de_rmw(i915, DPST_CTL(intel_crtc- > >pipe), > > + DPST_CTL_BIN_REG_MASK, 0); > > + } > > + > > + if (try++ == 5) { > > drm_err(&i915->drm, > > "Histogram block is busy, failed to > read\n"); > > intel_de_rmw(i915, DPST_GUARD(intel_crtc- > > >pipe), @@ -66,10 +69,37 @@ static void > > intel_histogram_handle_int_work(struct work_struct *work) > > } > > goto retry; > > } > > - histogram->bindata[i] = dpstbin & DPST_BIN_DATA_MASK; > > + histogram->bindata[i] = dpstbin & > DPST_HIST_BIN_DATA_MASK; > > drm_dbg_atomic(&i915->drm, "Histogram[%d]=%x\n", > > i, histogram->bindata[i]); > > } > > +} > > + > > +static void intel_histogram_get_data(struct intel_histogram > > +*histogram) { > > + > > + /* > > + * TODO: PSR to be exited while reading the Histogram data > > + * Set DPST_CTL Bin Reg function select to TC > > + * Set DPST_CTL Bin Register Index to 0 > > + */ > > + intel_histogram_read_data(histogram); > > +} > > Maybe add read data and get data at the first patch will make this patch much > more Cleaner and pleasing shouldn't really have any effect on build or > functionality. > Done > > + > > +static void intel_histogram_handle_int_work(struct work_struct *work) { > > + struct intel_histogram *histogram = container_of(work, > > + struct intel_histogram, handle_histogram_int_work.work); > > + struct drm_i915_private *i915 = histogram->i915; > > + struct intel_crtc *intel_crtc = histogram->crtc; > > + char *histogram_event[] = {"HISTOGRAM=1", NULL}; > > + > > + /* Wa: 14014889975 */ > > + if (IS_DISPLAY_VER(i915, 12, 13)) > > + intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), > > + DPST_CTL_RESTORE, 0); > > + > > + intel_histogram_get_data(histogram); > > > > drm_property_replace_global_blob(&i915->drm, > > &intel_crtc->config->histogram, > > @@ -161,12 +191,19 @@ static int intel_histogram_enable(struct > > intel_crtc > > *intel_crtc) > > * enable DPST_CTL Histogram mode > > * Clear DPST_CTL Bin Reg function select to TC > > */ > > - intel_de_rmw(i915, DPST_CTL(pipe), > > - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_IE_HIST_EN | > > - DPST_CTL_HIST_MODE | > > DPST_CTL_IE_TABLE_VALUE_FORMAT, > > - DPST_CTL_BIN_REG_FUNC_TC | DPST_CTL_IE_HIST_EN | > > - DPST_CTL_HIST_MODE_HSV | > > - DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); > > + if (DISPLAY_VER(i915) >= 20) > > + intel_de_rmw(i915, DPST_CTL(pipe), > > + DPST_CTL_IE_HIST_EN | > > + DPST_CTL_HIST_MODE, > > + DPST_CTL_IE_HIST_EN | > > + DPST_CTL_HIST_MODE_HSV); > > + else > > + intel_de_rmw(i915, DPST_CTL(pipe), > > + DPST_CTL_BIN_REG_FUNC_SEL | > > DPST_CTL_IE_HIST_EN | > > + DPST_CTL_HIST_MODE | > > DPST_CTL_IE_TABLE_VALUE_FORMAT, > > + DPST_CTL_BIN_REG_FUNC_TC | > > DPST_CTL_IE_HIST_EN | > > + DPST_CTL_HIST_MODE_HSV | > > + > DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); > > > > /* Re-Visit: check if wait for one vblank is required */ > > drm_crtc_wait_one_vblank(&intel_crtc->base); > > @@ -252,24 +289,43 @@ int intel_histogram_set_iet_lut(struct > > intel_crtc *intel_crtc, u32 *data) > > * Set DPST_CTL Bin Reg function select to IE > > * Set DPST_CTL Bin Register Index to 0 > > */ > > - intel_de_rmw(i915, DPST_CTL(pipe), > > - DPST_CTL_BIN_REG_FUNC_SEL | > DPST_CTL_BIN_REG_MASK, > > - DPST_CTL_BIN_REG_FUNC_IE | > DPST_CTL_BIN_REG_CLEAR); > > - > > - for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > > - intel_de_rmw(i915, DPST_BIN(pipe), > > - DPST_BIN_DATA_MASK, data[i]); > > - drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", i, data[i]); > > + if (DISPLAY_VER(i915) >= 20) { > > + /* Set index to zero */ > > + intel_de_rmw(i915, DPST_IE_INDEX(pipe), > > + DPST_IE_BIN_INDEX_MASK, > DPST_IE_BIN_INDEX(0)); > > + for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > > + intel_de_rmw(i915, DPST_IE_BIN(pipe), > > + DPST_IE_BIN_DATA_MASK, > > + DPST_IE_BIN_DATA(data[i])); > > + drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", > > + i, data[i]); > > + } > > + intel_de_rmw(i915, DPST_CTL(pipe), > > + DPST_CTL_ENHANCEMENT_MODE_MASK | > > + DPST_CTL_IE_MODI_TABLE_EN, > > + DPST_CTL_EN_MULTIPLICATIVE | > > + DPST_CTL_IE_MODI_TABLE_EN); > > + } else { > > + intel_de_rmw(i915, DPST_CTL(pipe), > > + DPST_CTL_BIN_REG_FUNC_SEL | > > DPST_CTL_BIN_REG_MASK, > > + DPST_CTL_BIN_REG_FUNC_IE | > > DPST_CTL_BIN_REG_CLEAR); > > + for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { > > + intel_de_rmw(i915, DPST_BIN(pipe), > > + DPST_BIN_DATA_MASK, data[i]); > > + drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", > > + i, data[i]); > > + } > > + intel_de_rmw(i915, DPST_CTL(pipe), > > + DPST_CTL_ENHANCEMENT_MODE_MASK | > > + DPST_CTL_IE_MODI_TABLE_EN, > > + DPST_CTL_EN_MULTIPLICATIVE | > > + DPST_CTL_IE_MODI_TABLE_EN); > > + > > + /* Once IE is applied, change DPST CTL to TC */ > > + intel_de_rmw(i915, DPST_CTL(pipe), > > + DPST_CTL_BIN_REG_FUNC_SEL, > > + DPST_CTL_BIN_REG_FUNC_TC); > > } > > - > > - intel_de_rmw(i915, DPST_CTL(pipe), > > - DPST_CTL_ENHANCEMENT_MODE_MASK | > > DPST_CTL_IE_MODI_TABLE_EN, > > - DPST_CTL_EN_MULTIPLICATIVE | > > DPST_CTL_IE_MODI_TABLE_EN); > > - > > - /* Once IE is applied, change DPST CTL to TC */ > > - intel_de_rmw(i915, DPST_CTL(pipe), > > - DPST_CTL_BIN_REG_FUNC_SEL, > > DPST_CTL_BIN_REG_FUNC_TC); > > - > > return 0; > > } > > > > diff --git a/drivers/gpu/drm/i915/display/intel_histogram.h > > b/drivers/gpu/drm/i915/display/intel_histogram.h > > index 5e24d3c5c28b..436e0b8e9ffd 100644 > > --- a/drivers/gpu/drm/i915/display/intel_histogram.h > > +++ b/drivers/gpu/drm/i915/display/intel_histogram.h > > @@ -48,8 +48,33 @@ enum pipe; > > #define _DPST_BIN_B 0x491C4 > > #define DPST_BIN(pipe) > _MMIO_PIPE(pipe, > > _DPST_BIN_A, _DPST_BIN_B) > > #define DPST_BIN_DATA_MASK > REG_GENMASK(23, 0) > > +#define DPST_BIN_DATA > > REG_FIELD_PREP(DPST_BIN_DATA_MASK, val) > > #define DPST_BIN_BUSY REG_BIT(31) > > > > +#define _DPST_HIST_INDEX_A 0x490D8 > > +#define _DPST_HIST_INDEX_B 0x491D8 > > +#define DPST_HIST_INDEX(pipe) > > _MMIO_PIPE(pipe, _DPST_HIST_INDEX_A, _DPST_HIST_INDEX_B) > > +#define DPST_HIST_BIN_INDEX_MASK > REG_GENMASK(4, 0) > > +#define DPST_HIST_BIN_INDEX(val) > > REG_FIELD_PREP(DPST_HIST_BIN_INDEX_MASK, val) > > + > > +#define _DPST_HIST_BIN_A 0x490C4 > > +#define _DPST_HIST_BIN_B 0x491C4 > > +#define DPST_HIST_BIN(pipe) _MMIO_PIPE(pipe, > > _DPST_HIST_BIN_A, _DPST_HIST_BIN_B) > > +#define DPST_HIST_BIN_BUSY REG_BIT(31) > > +#define DPST_HIST_BIN_DATA_MASK > > REG_GENMASK(30, 0) > > + > > +#define _DPST_IE_BIN_A 0x490CC > > +#define _DPST_IE_BIN_B 0x491CC > > +#define DPST_IE_BIN(pipe) _MMIO_PIPE(pipe, > > _DPST_IE_BIN_A, _DPST_IE_BIN_B) > > +#define DPST_IE_BIN_DATA_MASK > > REG_GENMASK(9, 0) > > +#define DPST_IE_BIN_DATA(val) > > REG_FIELD_PREP(DPST_IE_BIN_DATA_MASK, val) > > + > > +#define _DPST_IE_INDEX_A 0x490DC > > +#define _DPST_IE_INDEX_B 0x491DC > > +#define DPST_IE_INDEX(pipe) _MMIO_PIPE(pipe, > > _DPST_IE_INDEX_A, _DPST_IE_INDEX_B) > > +#define DPST_IE_BIN_INDEX_MASK > > REG_GENMASK(6, 0) > > +#define DPST_IE_BIN_INDEX(val) > > REG_FIELD_PREP(DPST_IE_BIN_INDEX_MASK, val) > > + > > One more reason registers should have its own file > Done Thanks and Regards, Arun R Murthy --------------------
diff --git a/drivers/gpu/drm/i915/display/intel_histogram.c b/drivers/gpu/drm/i915/display/intel_histogram.c index 189f7ccd6df8..9c31a7d83362 100644 --- a/drivers/gpu/drm/i915/display/intel_histogram.c +++ b/drivers/gpu/drm/i915/display/intel_histogram.c @@ -26,38 +26,41 @@ struct intel_histogram { u32 bindata[HISTOGRAM_BIN_COUNT]; }; -static void intel_histogram_handle_int_work(struct work_struct *work) +static void intel_histogram_read_data(struct intel_histogram *histogram) { - struct intel_histogram *histogram = container_of(work, - struct intel_histogram, handle_histogram_int_work.work); struct drm_i915_private *i915 = histogram->i915; struct intel_crtc *intel_crtc = histogram->crtc; - char *histogram_event[] = {"HISTOGRAM=1", NULL}; u32 dpstbin; int i, try = 0; - /* Wa: 14014889975 */ - if (IS_DISPLAY_VER(i915, 12, 13)) +retry: + if (DISPLAY_VER(i915) >= 20) { + /* Set index to zero */ + intel_de_rmw(i915, DPST_HIST_INDEX(intel_crtc->pipe), + DPST_HIST_BIN_INDEX_MASK, DPST_HIST_BIN_INDEX(0)); + } else { intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), - DPST_CTL_RESTORE, 0); + DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_BIN_REG_MASK, 0); + } - /* - * TODO: PSR to be exited while reading the Histogram data - * Set DPST_CTL Bin Reg function select to TC - * Set DPST_CTL Bin Register Index to 0 - */ -retry: - intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_BIN_REG_MASK, 0); for (i = 0; i < HISTOGRAM_BIN_COUNT; i++) { - dpstbin = intel_de_read(i915, DPST_BIN(intel_crtc->pipe)); + dpstbin = intel_de_read(i915, DPST_HIST_BIN(intel_crtc->pipe)); if (dpstbin & DPST_BIN_BUSY) { /* * If DPST_BIN busy bit is set, then set the * DPST_CTL bin reg index to 0 and proceed * from beginning. */ - if (try++ >= 5) { + if (DISPLAY_VER(i915) >= 20) { + intel_de_rmw(i915, DPST_HIST_INDEX(intel_crtc->pipe), + DPST_HIST_BIN_INDEX_MASK, + DPST_HIST_BIN_INDEX(0)); + } else { + intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), + DPST_CTL_BIN_REG_MASK, 0); + } + + if (try++ == 5) { drm_err(&i915->drm, "Histogram block is busy, failed to read\n"); intel_de_rmw(i915, DPST_GUARD(intel_crtc->pipe), @@ -66,10 +69,37 @@ static void intel_histogram_handle_int_work(struct work_struct *work) } goto retry; } - histogram->bindata[i] = dpstbin & DPST_BIN_DATA_MASK; + histogram->bindata[i] = dpstbin & DPST_HIST_BIN_DATA_MASK; drm_dbg_atomic(&i915->drm, "Histogram[%d]=%x\n", i, histogram->bindata[i]); } +} + +static void intel_histogram_get_data(struct intel_histogram *histogram) +{ + + /* + * TODO: PSR to be exited while reading the Histogram data + * Set DPST_CTL Bin Reg function select to TC + * Set DPST_CTL Bin Register Index to 0 + */ + intel_histogram_read_data(histogram); +} + +static void intel_histogram_handle_int_work(struct work_struct *work) +{ + struct intel_histogram *histogram = container_of(work, + struct intel_histogram, handle_histogram_int_work.work); + struct drm_i915_private *i915 = histogram->i915; + struct intel_crtc *intel_crtc = histogram->crtc; + char *histogram_event[] = {"HISTOGRAM=1", NULL}; + + /* Wa: 14014889975 */ + if (IS_DISPLAY_VER(i915, 12, 13)) + intel_de_rmw(i915, DPST_CTL(intel_crtc->pipe), + DPST_CTL_RESTORE, 0); + + intel_histogram_get_data(histogram); drm_property_replace_global_blob(&i915->drm, &intel_crtc->config->histogram, @@ -161,12 +191,19 @@ static int intel_histogram_enable(struct intel_crtc *intel_crtc) * enable DPST_CTL Histogram mode * Clear DPST_CTL Bin Reg function select to TC */ - intel_de_rmw(i915, DPST_CTL(pipe), - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_IE_HIST_EN | - DPST_CTL_HIST_MODE | DPST_CTL_IE_TABLE_VALUE_FORMAT, - DPST_CTL_BIN_REG_FUNC_TC | DPST_CTL_IE_HIST_EN | - DPST_CTL_HIST_MODE_HSV | - DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); + if (DISPLAY_VER(i915) >= 20) + intel_de_rmw(i915, DPST_CTL(pipe), + DPST_CTL_IE_HIST_EN | + DPST_CTL_HIST_MODE, + DPST_CTL_IE_HIST_EN | + DPST_CTL_HIST_MODE_HSV); + else + intel_de_rmw(i915, DPST_CTL(pipe), + DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_IE_HIST_EN | + DPST_CTL_HIST_MODE | DPST_CTL_IE_TABLE_VALUE_FORMAT, + DPST_CTL_BIN_REG_FUNC_TC | DPST_CTL_IE_HIST_EN | + DPST_CTL_HIST_MODE_HSV | + DPST_CTL_IE_TABLE_VALUE_FORMAT_1INT_9FRAC); /* Re-Visit: check if wait for one vblank is required */ drm_crtc_wait_one_vblank(&intel_crtc->base); @@ -252,24 +289,43 @@ int intel_histogram_set_iet_lut(struct intel_crtc *intel_crtc, u32 *data) * Set DPST_CTL Bin Reg function select to IE * Set DPST_CTL Bin Register Index to 0 */ - intel_de_rmw(i915, DPST_CTL(pipe), - DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_BIN_REG_MASK, - DPST_CTL_BIN_REG_FUNC_IE | DPST_CTL_BIN_REG_CLEAR); - - for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { - intel_de_rmw(i915, DPST_BIN(pipe), - DPST_BIN_DATA_MASK, data[i]); - drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", i, data[i]); + if (DISPLAY_VER(i915) >= 20) { + /* Set index to zero */ + intel_de_rmw(i915, DPST_IE_INDEX(pipe), + DPST_IE_BIN_INDEX_MASK, DPST_IE_BIN_INDEX(0)); + for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { + intel_de_rmw(i915, DPST_IE_BIN(pipe), + DPST_IE_BIN_DATA_MASK, + DPST_IE_BIN_DATA(data[i])); + drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", + i, data[i]); + } + intel_de_rmw(i915, DPST_CTL(pipe), + DPST_CTL_ENHANCEMENT_MODE_MASK | + DPST_CTL_IE_MODI_TABLE_EN, + DPST_CTL_EN_MULTIPLICATIVE | + DPST_CTL_IE_MODI_TABLE_EN); + } else { + intel_de_rmw(i915, DPST_CTL(pipe), + DPST_CTL_BIN_REG_FUNC_SEL | DPST_CTL_BIN_REG_MASK, + DPST_CTL_BIN_REG_FUNC_IE | DPST_CTL_BIN_REG_CLEAR); + for (i = 0; i < HISTOGRAM_IET_LENGTH; i++) { + intel_de_rmw(i915, DPST_BIN(pipe), + DPST_BIN_DATA_MASK, data[i]); + drm_dbg_atomic(&i915->drm, "iet_lut[%d]=%x\n", + i, data[i]); + } + intel_de_rmw(i915, DPST_CTL(pipe), + DPST_CTL_ENHANCEMENT_MODE_MASK | + DPST_CTL_IE_MODI_TABLE_EN, + DPST_CTL_EN_MULTIPLICATIVE | + DPST_CTL_IE_MODI_TABLE_EN); + + /* Once IE is applied, change DPST CTL to TC */ + intel_de_rmw(i915, DPST_CTL(pipe), + DPST_CTL_BIN_REG_FUNC_SEL, + DPST_CTL_BIN_REG_FUNC_TC); } - - intel_de_rmw(i915, DPST_CTL(pipe), - DPST_CTL_ENHANCEMENT_MODE_MASK | DPST_CTL_IE_MODI_TABLE_EN, - DPST_CTL_EN_MULTIPLICATIVE | DPST_CTL_IE_MODI_TABLE_EN); - - /* Once IE is applied, change DPST CTL to TC */ - intel_de_rmw(i915, DPST_CTL(pipe), - DPST_CTL_BIN_REG_FUNC_SEL, DPST_CTL_BIN_REG_FUNC_TC); - return 0; } diff --git a/drivers/gpu/drm/i915/display/intel_histogram.h b/drivers/gpu/drm/i915/display/intel_histogram.h index 5e24d3c5c28b..436e0b8e9ffd 100644 --- a/drivers/gpu/drm/i915/display/intel_histogram.h +++ b/drivers/gpu/drm/i915/display/intel_histogram.h @@ -48,8 +48,33 @@ enum pipe; #define _DPST_BIN_B 0x491C4 #define DPST_BIN(pipe) _MMIO_PIPE(pipe, _DPST_BIN_A, _DPST_BIN_B) #define DPST_BIN_DATA_MASK REG_GENMASK(23, 0) +#define DPST_BIN_DATA REG_FIELD_PREP(DPST_BIN_DATA_MASK, val) #define DPST_BIN_BUSY REG_BIT(31) +#define _DPST_HIST_INDEX_A 0x490D8 +#define _DPST_HIST_INDEX_B 0x491D8 +#define DPST_HIST_INDEX(pipe) _MMIO_PIPE(pipe, _DPST_HIST_INDEX_A, _DPST_HIST_INDEX_B) +#define DPST_HIST_BIN_INDEX_MASK REG_GENMASK(4, 0) +#define DPST_HIST_BIN_INDEX(val) REG_FIELD_PREP(DPST_HIST_BIN_INDEX_MASK, val) + +#define _DPST_HIST_BIN_A 0x490C4 +#define _DPST_HIST_BIN_B 0x491C4 +#define DPST_HIST_BIN(pipe) _MMIO_PIPE(pipe, _DPST_HIST_BIN_A, _DPST_HIST_BIN_B) +#define DPST_HIST_BIN_BUSY REG_BIT(31) +#define DPST_HIST_BIN_DATA_MASK REG_GENMASK(30, 0) + +#define _DPST_IE_BIN_A 0x490CC +#define _DPST_IE_BIN_B 0x491CC +#define DPST_IE_BIN(pipe) _MMIO_PIPE(pipe, _DPST_IE_BIN_A, _DPST_IE_BIN_B) +#define DPST_IE_BIN_DATA_MASK REG_GENMASK(9, 0) +#define DPST_IE_BIN_DATA(val) REG_FIELD_PREP(DPST_IE_BIN_DATA_MASK, val) + +#define _DPST_IE_INDEX_A 0x490DC +#define _DPST_IE_INDEX_B 0x491DC +#define DPST_IE_INDEX(pipe) _MMIO_PIPE(pipe, _DPST_IE_INDEX_A, _DPST_IE_INDEX_B) +#define DPST_IE_BIN_INDEX_MASK REG_GENMASK(6, 0) +#define DPST_IE_BIN_INDEX(val) REG_FIELD_PREP(DPST_IE_BIN_INDEX_MASK, val) + #define INTEL_HISTOGRAM_PIPEA 0x90000000 #define INTEL_HISTOGRAM_PIPEB 0x90000002 #define INTEL_HISTOGRAM_EVENT(pipe) PIPE(pipe, \
In LNL+, histogram/IE data and index registers are added which was included in the control registers in the legacy platforms. The new registers are used for reading histogram and writing the IET LUT data. v2: Removed duplicate code (Jani) Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com> --- .../gpu/drm/i915/display/intel_histogram.c | 138 ++++++++++++------ .../gpu/drm/i915/display/intel_histogram.h | 25 ++++ 2 files changed, 122 insertions(+), 41 deletions(-)