On Tue, 05 Nov 2024, Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx> wrote:
> Avoid using struct drm_i915_private reference and use intel_display
> instead. This is in preparation for the rest of the patches in this
> series where hw support for the minimum and interim ddb allocations
> for async flip is added
This is technically correct, but it's self-contained in a single
function. I've preferred two approaches over this:
- Convert entire files (sometimes internally first, with the external
interface changes in a separate patch, depending on how big the patch
becomes).
- Convert single functions which are widely used and have struct
intel_display as parameter, to limit the size of the patch (as opposed
to doing the conversion as part of an entire file change).
I think Ville said he's had a go at converting skl_watermark.c. Ville,
do you have a patch for that?
BR,
Jani.
>
> Signed-off-by: Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/skl_watermark.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
> index 2afc95e7533c..2018abc35c8a 100644
> --- a/drivers/gpu/drm/i915/display/skl_watermark.c
> +++ b/drivers/gpu/drm/i915/display/skl_watermark.c
> @@ -1372,9 +1372,9 @@ static bool
> use_minimal_wm0_only(const struct intel_crtc_state *crtc_state,
> struct intel_plane *plane)
> {
> - struct drm_i915_private *i915 = to_i915(plane->base.dev);
> + struct intel_display *display = to_intel_display(plane);
>
> - return DISPLAY_VER(i915) >= 13 &&
> + return DISPLAY_VER(display) >= 13 &&
> crtc_state->uapi.async_flip &&
> plane->async_flip;
> }
--
Jani Nikula, Intel
