Commit 4226479f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dpt: pass opaque struct intel_dpt around instead of i915_address_space 



struct i915_address_space is used in an opaque fashion in the display
parent interface, but it's just one include away from being
non-opaque. And anyway the name is rather specific.

Switch to using the struct intel_dpt instead, which embeds struct
i915_address_space anyway. With the definition hidden in i915_dpt.c,
this can't be accidentally made non-opaque, and the type seems rather
more generic anyway.

We do have to add a new helper i915_dpt_to_vm(), as there's one case in
intel_fb_pin_to_dpt() that requires direct access to struct
i915_address_space. But this just underlines the point about opacity.

Reviewed-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Link: https://patch.msgid.link/daa39178c0b0305b010564952d691f06e3cd63ca.1772030909.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent a8ea895d

drivers/gpu/drm/i915/display/intel_display_types.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ struct intel_framebuffer { 
		struct intel_fb_view remapped_view;

	};



	struct i915_address_space *dpt_vm;

	struct intel_dpt *dpt;



	unsigned int min_alignment;

	unsigned int vtd_guard;

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

+4 −4
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ void intel_dpt_suspend(struct intel_display *display) 
	drm_for_each_fb(drm_fb, display->drm) {

		struct intel_framebuffer *fb = to_intel_framebuffer(drm_fb);



		if (fb->dpt_vm)

			intel_parent_dpt_suspend(display, fb->dpt_vm);

		if (fb->dpt)

			intel_parent_dpt_suspend(display, fb->dpt);

	}



	mutex_unlock(&display->drm->mode_config.fb_lock);
@@ -87,8 +87,8 @@ void intel_dpt_resume(struct intel_display *display) 
	drm_for_each_fb(drm_fb, display->drm) {

		struct intel_framebuffer *fb = to_intel_framebuffer(drm_fb);



		if (fb->dpt_vm)

			intel_parent_dpt_resume(display, fb->dpt_vm);

		if (fb->dpt)

			intel_parent_dpt_resume(display, fb->dpt);

	}

	mutex_unlock(&display->drm->mode_config.fb_lock);

}

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

+7 −7
Original line number Diff line number Diff line
@@ -2109,7 +2109,7 @@ static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb) 
	drm_framebuffer_cleanup(fb);



	if (intel_fb_uses_dpt(fb))

		intel_parent_dpt_destroy(display, intel_fb->dpt_vm);

		intel_parent_dpt_destroy(display, intel_fb->dpt);



	intel_fb_bo_framebuffer_fini(intel_fb_bo(fb));
@@ -2305,20 +2305,20 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 


	if (intel_fb_uses_dpt(fb)) {

		struct drm_gem_object *obj = intel_fb_bo(&intel_fb->base);

		struct i915_address_space *vm;

		struct intel_dpt *dpt;

		size_t size = 0;



		if (intel_fb_needs_pot_stride_remap(intel_fb))

			size = intel_remapped_info_size(&intel_fb->remapped_view.gtt.remapped);



		vm = intel_parent_dpt_create(display, obj, size);

		if (IS_ERR(vm)) {

		dpt = intel_parent_dpt_create(display, obj, size);

		if (IS_ERR(dpt)) {

			drm_dbg_kms(display->drm, "failed to create DPT\n");

			ret = PTR_ERR(vm);

			ret = PTR_ERR(dpt);

			goto err_frontbuffer_put;

		}



		intel_fb->dpt_vm = vm;

		intel_fb->dpt = dpt;

	}



	ret = drm_framebuffer_init(display->drm, fb, &intel_fb_funcs);
@@ -2331,7 +2331,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb, 


err_free_dpt:

	if (intel_fb_uses_dpt(fb))

		intel_parent_dpt_destroy(display, intel_fb->dpt_vm);

		intel_parent_dpt_destroy(display, intel_fb->dpt);

err_bo_framebuffer_fini:

	intel_fb_bo_framebuffer_fini(obj);

err_frontbuffer_put:

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

+6 −5
Original line number Diff line number Diff line
@@ -27,13 +27,14 @@ intel_fb_pin_to_dpt(const struct drm_framebuffer *fb, 
		    const struct i915_gtt_view *view,

		    unsigned int alignment,

		    unsigned long *out_flags,

		    struct i915_address_space *vm)

		    struct intel_dpt *dpt)

{

	struct drm_device *dev = fb->dev;

	struct intel_display *display = to_intel_display(dev);

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_gem_object *_obj = intel_fb_bo(fb);

	struct drm_i915_gem_object *obj = to_intel_bo(_obj);

	struct i915_address_space *vm = i915_dpt_to_vm(dpt);

	struct i915_gem_ww_ctx ww;

	struct i915_vma *vma;

	int ret;
@@ -284,7 +285,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state, 
	} else {

		unsigned int alignment = intel_plane_fb_min_alignment(plane_state);



		vma = i915_dpt_pin_to_ggtt(fb->dpt_vm, alignment / 512);

		vma = i915_dpt_pin_to_ggtt(fb->dpt, alignment / 512);

		if (IS_ERR(vma))

			return PTR_ERR(vma);
@@ -292,9 +293,9 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state, 


		vma = intel_fb_pin_to_dpt(&fb->base, &plane_state->view.gtt,

					  alignment, &plane_state->flags,

					  fb->dpt_vm);

					  fb->dpt);

		if (IS_ERR(vma)) {

			i915_dpt_unpin_from_ggtt(fb->dpt_vm);

			i915_dpt_unpin_from_ggtt(fb->dpt);

			plane_state->ggtt_vma = NULL;

			return PTR_ERR(vma);

		}
@@ -346,7 +347,7 @@ void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state) 


		vma = fetch_and_zero(&old_plane_state->ggtt_vma);

		if (vma)

			i915_dpt_unpin_from_ggtt(fb->dpt_vm);

			i915_dpt_unpin_from_ggtt(fb->dpt);

	}

}

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

+8 −9
Original line number Diff line number Diff line
@@ -24,9 +24,8 @@ 
#include "intel_parent.h"



/* dpt */

struct i915_address_space *intel_parent_dpt_create(struct intel_display *display,

						   struct drm_gem_object *obj,

						   size_t size)

struct intel_dpt *intel_parent_dpt_create(struct intel_display *display,

					  struct drm_gem_object *obj, size_t size)

{

	if (display->parent->dpt)

		return display->parent->dpt->create(obj, size);
@@ -34,22 +33,22 @@ struct i915_address_space *intel_parent_dpt_create(struct intel_display *display 
	return NULL;

}



void intel_parent_dpt_destroy(struct intel_display *display, struct i915_address_space *vm)

void intel_parent_dpt_destroy(struct intel_display *display, struct intel_dpt *dpt)

{

	if (display->parent->dpt)

		display->parent->dpt->destroy(vm);

		display->parent->dpt->destroy(dpt);

}



void intel_parent_dpt_suspend(struct intel_display *display, struct i915_address_space *vm)

void intel_parent_dpt_suspend(struct intel_display *display, struct intel_dpt *dpt)

{

	if (display->parent->dpt)

		display->parent->dpt->suspend(vm);

		display->parent->dpt->suspend(dpt);

}



void intel_parent_dpt_resume(struct intel_display *display, struct i915_address_space *vm)

void intel_parent_dpt_resume(struct intel_display *display, struct intel_dpt *dpt)

{

	if (display->parent->dpt)

		display->parent->dpt->resume(vm);

		display->parent->dpt->resume(dpt);

}



/* hdcp */