| Message ID | 20250113104936.1338290-4-nemesa.garg@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Introduce drm sharpness property | expand |
On 1/13/2025 4:19 PM, Nemesa Garg wrote: > Write the scaler registers for sharpness. Here you are enabling the scaler for sharpness, so subject name configure the scaler doesnt seem right. The configuring is done in Patch#4. > > Signed-off-by: Nemesa Garg <nemesa.garg@intel.com> > --- > drivers/gpu/drm/i915/display/intel_casf.c | 2 + > drivers/gpu/drm/i915/display/skl_scaler.c | 45 +++++++++++++++++++++++ > drivers/gpu/drm/i915/display/skl_scaler.h | 1 + > 3 files changed, 48 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_casf.c b/drivers/gpu/drm/i915/display/intel_casf.c > index b507401457bf..773abaad74ca 100644 > --- a/drivers/gpu/drm/i915/display/intel_casf.c > +++ b/drivers/gpu/drm/i915/display/intel_casf.c > @@ -97,6 +97,8 @@ static void intel_casf_write_coeff(struct intel_crtc_state *crtc_state) > void intel_casf_enable(struct intel_crtc_state *crtc_state) > { > intel_casf_write_coeff(crtc_state); > + > + skl_scaler_setup_casf(crtc_state); > } > > static void convert_sharpness_coef_binary(struct scaler_filter_coeff *coeff, > diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c > index a11e09a15e23..0718210de910 100644 > --- a/drivers/gpu/drm/i915/display/skl_scaler.c > +++ b/drivers/gpu/drm/i915/display/skl_scaler.c > @@ -132,6 +132,13 @@ static void skl_scaler_max_dst_size(struct intel_crtc *crtc, > } > } > > +#define SCALER_FILTER_SELECT \ > + (PS_FILTER_PROGRAMMED | \ > + PS_Y_VERT_FILTER_SELECT(1) | \ > + PS_Y_HORZ_FILTER_SELECT(0) | \ > + PS_UV_VERT_FILTER_SELECT(1) | \ > + PS_UV_HORZ_FILTER_SELECT(0)) > + > static int > skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach, > unsigned int scaler_user, int *scaler_id, > @@ -667,6 +674,44 @@ static void skl_scaler_setup_filter(struct intel_display *display, enum pipe pip > } > } > > +void skl_scaler_setup_casf(struct intel_crtc_state *crtc_state) > +{ > + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); > + struct intel_display *display = to_intel_display(crtc); > + struct drm_display_mode *adjusted_mode = > + &crtc_state->hw.adjusted_mode; > + struct intel_crtc_scaler_state *scaler_state = > + &crtc_state->scaler_state; > + struct drm_rect src, dest; > + int id, width, height; > + int x, y; > + enum pipe pipe = crtc->pipe; > + u32 ps_ctrl; > + > + width = adjusted_mode->crtc_hdisplay; > + height = adjusted_mode->crtc_vdisplay; > + > + x = y = 0; > + drm_rect_init(&dest, x, y, width, height); > + > + width = drm_rect_width(&dest); > + height = drm_rect_height(&dest); > + id = scaler_state->scaler_id; > + > + drm_rect_init(&src, 0, 0, > + drm_rect_width(&crtc_state->pipe_src) << 16, > + drm_rect_height(&crtc_state->pipe_src) << 16); > + > + ps_ctrl = PS_SCALER_EN | PS_BINDING_PIPE | scaler_state->scalers[id].mode | > + SCALER_FILTER_SELECT; > + > + intel_de_write_fw(display, SKL_PS_CTRL(pipe, id), ps_ctrl); Should we not disable the SKL_PS_CTL when sharpness is disabled? Regards, Ankit > + intel_de_write_fw(display, SKL_PS_WIN_POS(pipe, id), > + PS_WIN_XPOS(x) | PS_WIN_YPOS(y)); > + intel_de_write_fw(display, SKL_PS_WIN_SZ(pipe, id), > + PS_WIN_XSIZE(width) | PS_WIN_YSIZE(height)); > +} > + > void skl_pfit_enable(const struct intel_crtc_state *crtc_state) > { > struct intel_display *display = to_intel_display(crtc_state); > diff --git a/drivers/gpu/drm/i915/display/skl_scaler.h b/drivers/gpu/drm/i915/display/skl_scaler.h > index 4d2e2dbb1666..e1fe6a2d6c32 100644 > --- a/drivers/gpu/drm/i915/display/skl_scaler.h > +++ b/drivers/gpu/drm/i915/display/skl_scaler.h > @@ -28,5 +28,6 @@ void skl_detach_scalers(const struct intel_crtc_state *crtc_state); > void skl_scaler_disable(const struct intel_crtc_state *old_crtc_state); > > void skl_scaler_get_config(struct intel_crtc_state *crtc_state); > +void skl_scaler_setup_casf(struct intel_crtc_state *crtc_state); > > #endif
> -----Original Message----- > From: Nautiyal, Ankit K <ankit.k.nautiyal@intel.com> > Sent: Wednesday, February 5, 2025 1:44 PM > To: Garg, Nemesa <nemesa.garg@intel.com>; intel-gfx@lists.freedesktop.org; > intel-xe@lists.freedesktop.org > Subject: Re: [PATCH 3/6] drm/i915/display: Configure the scaler > > > > On 1/13/2025 4:19 PM, Nemesa Garg wrote: > > Write the scaler registers for sharpness. > > Here you are enabling the scaler for sharpness, so subject name configure the > scaler doesnt seem right. > > The configuring is done in Patch#4. > > > > > > Signed-off-by: Nemesa Garg <nemesa.garg@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_casf.c | 2 + > > drivers/gpu/drm/i915/display/skl_scaler.c | 45 +++++++++++++++++++++++ > > drivers/gpu/drm/i915/display/skl_scaler.h | 1 + > > 3 files changed, 48 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_casf.c > > b/drivers/gpu/drm/i915/display/intel_casf.c > > index b507401457bf..773abaad74ca 100644 > > --- a/drivers/gpu/drm/i915/display/intel_casf.c > > +++ b/drivers/gpu/drm/i915/display/intel_casf.c > > @@ -97,6 +97,8 @@ static void intel_casf_write_coeff(struct intel_crtc_state > *crtc_state) > > void intel_casf_enable(struct intel_crtc_state *crtc_state) > > { > > intel_casf_write_coeff(crtc_state); > > + > > + skl_scaler_setup_casf(crtc_state); > > } > > > > static void convert_sharpness_coef_binary(struct scaler_filter_coeff > > *coeff, diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c > > b/drivers/gpu/drm/i915/display/skl_scaler.c > > index a11e09a15e23..0718210de910 100644 > > --- a/drivers/gpu/drm/i915/display/skl_scaler.c > > +++ b/drivers/gpu/drm/i915/display/skl_scaler.c > > @@ -132,6 +132,13 @@ static void skl_scaler_max_dst_size(struct intel_crtc > *crtc, > > } > > } > > > > +#define SCALER_FILTER_SELECT \ > > + (PS_FILTER_PROGRAMMED | \ > > + PS_Y_VERT_FILTER_SELECT(1) | \ > > + PS_Y_HORZ_FILTER_SELECT(0) | \ > > + PS_UV_VERT_FILTER_SELECT(1) | \ > > + PS_UV_HORZ_FILTER_SELECT(0)) > > + > > static int > > skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach, > > unsigned int scaler_user, int *scaler_id, @@ -667,6 +674,44 > @@ > > static void skl_scaler_setup_filter(struct intel_display *display, enum pipe > pip > > } > > } > > > > +void skl_scaler_setup_casf(struct intel_crtc_state *crtc_state) { > > + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); > > + struct intel_display *display = to_intel_display(crtc); > > + struct drm_display_mode *adjusted_mode = > > + &crtc_state->hw.adjusted_mode; > > + struct intel_crtc_scaler_state *scaler_state = > > + &crtc_state->scaler_state; > > + struct drm_rect src, dest; > > + int id, width, height; > > + int x, y; > > + enum pipe pipe = crtc->pipe; > > + u32 ps_ctrl; > > + > > + width = adjusted_mode->crtc_hdisplay; > > + height = adjusted_mode->crtc_vdisplay; > > + > > + x = y = 0; > > + drm_rect_init(&dest, x, y, width, height); > > + > > + width = drm_rect_width(&dest); > > + height = drm_rect_height(&dest); > > + id = scaler_state->scaler_id; > > + > > + drm_rect_init(&src, 0, 0, > > + drm_rect_width(&crtc_state->pipe_src) << 16, > > + drm_rect_height(&crtc_state->pipe_src) << 16); > > + > > + ps_ctrl = PS_SCALER_EN | PS_BINDING_PIPE | scaler_state- > >scalers[id].mode | > > + SCALER_FILTER_SELECT; > > + > > + intel_de_write_fw(display, SKL_PS_CTRL(pipe, id), ps_ctrl); > > > Should we not disable the SKL_PS_CTL when sharpness is disabled? > > Regards, > > Ankit > We don’t need to explicitly disable this register because I am setting the flag need_scaler = false in skl_update_scaler which will make the scaler_id -1 and it will disable the scaler eventually. > > + intel_de_write_fw(display, SKL_PS_WIN_POS(pipe, id), > > + PS_WIN_XPOS(x) | PS_WIN_YPOS(y)); > > + intel_de_write_fw(display, SKL_PS_WIN_SZ(pipe, id), > > + PS_WIN_XSIZE(width) | PS_WIN_YSIZE(height)); } > > + > > void skl_pfit_enable(const struct intel_crtc_state *crtc_state) > > { > > struct intel_display *display = to_intel_display(crtc_state); diff > > --git a/drivers/gpu/drm/i915/display/skl_scaler.h > > b/drivers/gpu/drm/i915/display/skl_scaler.h > > index 4d2e2dbb1666..e1fe6a2d6c32 100644 > > --- a/drivers/gpu/drm/i915/display/skl_scaler.h > > +++ b/drivers/gpu/drm/i915/display/skl_scaler.h > > @@ -28,5 +28,6 @@ void skl_detach_scalers(const struct intel_crtc_state > *crtc_state); > > void skl_scaler_disable(const struct intel_crtc_state > > *old_crtc_state); > > > > void skl_scaler_get_config(struct intel_crtc_state *crtc_state); > > +void skl_scaler_setup_casf(struct intel_crtc_state *crtc_state); > > > > #endif
diff --git a/drivers/gpu/drm/i915/display/intel_casf.c b/drivers/gpu/drm/i915/display/intel_casf.c index b507401457bf..773abaad74ca 100644 --- a/drivers/gpu/drm/i915/display/intel_casf.c +++ b/drivers/gpu/drm/i915/display/intel_casf.c @@ -97,6 +97,8 @@ static void intel_casf_write_coeff(struct intel_crtc_state *crtc_state) void intel_casf_enable(struct intel_crtc_state *crtc_state) { intel_casf_write_coeff(crtc_state); + + skl_scaler_setup_casf(crtc_state); } static void convert_sharpness_coef_binary(struct scaler_filter_coeff *coeff, diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c index a11e09a15e23..0718210de910 100644 --- a/drivers/gpu/drm/i915/display/skl_scaler.c +++ b/drivers/gpu/drm/i915/display/skl_scaler.c @@ -132,6 +132,13 @@ static void skl_scaler_max_dst_size(struct intel_crtc *crtc, } } +#define SCALER_FILTER_SELECT \ + (PS_FILTER_PROGRAMMED | \ + PS_Y_VERT_FILTER_SELECT(1) | \ + PS_Y_HORZ_FILTER_SELECT(0) | \ + PS_UV_VERT_FILTER_SELECT(1) | \ + PS_UV_HORZ_FILTER_SELECT(0)) + static int skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach, unsigned int scaler_user, int *scaler_id, @@ -667,6 +674,44 @@ static void skl_scaler_setup_filter(struct intel_display *display, enum pipe pip } } +void skl_scaler_setup_casf(struct intel_crtc_state *crtc_state) +{ + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); + struct intel_display *display = to_intel_display(crtc); + struct drm_display_mode *adjusted_mode = + &crtc_state->hw.adjusted_mode; + struct intel_crtc_scaler_state *scaler_state = + &crtc_state->scaler_state; + struct drm_rect src, dest; + int id, width, height; + int x, y; + enum pipe pipe = crtc->pipe; + u32 ps_ctrl; + + width = adjusted_mode->crtc_hdisplay; + height = adjusted_mode->crtc_vdisplay; + + x = y = 0; + drm_rect_init(&dest, x, y, width, height); + + width = drm_rect_width(&dest); + height = drm_rect_height(&dest); + id = scaler_state->scaler_id; + + drm_rect_init(&src, 0, 0, + drm_rect_width(&crtc_state->pipe_src) << 16, + drm_rect_height(&crtc_state->pipe_src) << 16); + + ps_ctrl = PS_SCALER_EN | PS_BINDING_PIPE | scaler_state->scalers[id].mode | + SCALER_FILTER_SELECT; + + intel_de_write_fw(display, SKL_PS_CTRL(pipe, id), ps_ctrl); + intel_de_write_fw(display, SKL_PS_WIN_POS(pipe, id), + PS_WIN_XPOS(x) | PS_WIN_YPOS(y)); + intel_de_write_fw(display, SKL_PS_WIN_SZ(pipe, id), + PS_WIN_XSIZE(width) | PS_WIN_YSIZE(height)); +} + void skl_pfit_enable(const struct intel_crtc_state *crtc_state) { struct intel_display *display = to_intel_display(crtc_state); diff --git a/drivers/gpu/drm/i915/display/skl_scaler.h b/drivers/gpu/drm/i915/display/skl_scaler.h index 4d2e2dbb1666..e1fe6a2d6c32 100644 --- a/drivers/gpu/drm/i915/display/skl_scaler.h +++ b/drivers/gpu/drm/i915/display/skl_scaler.h @@ -28,5 +28,6 @@ void skl_detach_scalers(const struct intel_crtc_state *crtc_state); void skl_scaler_disable(const struct intel_crtc_state *old_crtc_state); void skl_scaler_get_config(struct intel_crtc_state *crtc_state); +void skl_scaler_setup_casf(struct intel_crtc_state *crtc_state); #endif
Write the scaler registers for sharpness. Signed-off-by: Nemesa Garg <nemesa.garg@intel.com> --- drivers/gpu/drm/i915/display/intel_casf.c | 2 + drivers/gpu/drm/i915/display/skl_scaler.c | 45 +++++++++++++++++++++++ drivers/gpu/drm/i915/display/skl_scaler.h | 1 + 3 files changed, 48 insertions(+)