Commit dc5f903b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: add VMA to parent interface 



It's unclear what the direction of the VMA abstraction in the parent
interface should be, but convert i915_vma_fence_id() to parent interface
for starters. This paves the way for making struct i915_vma opaque
towards display.

Reviewed-by: default avatarMichał Grzelak <michal.grzelak@intel.com>
Link: https://patch.msgid.link/036f4b2d20cc1b0a7ab814beb5bb914c53b6eb53.1772212579.git.jani.nikula@intel.com


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

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

+2 −3
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include <drm/drm_fourcc.h>

#include <drm/drm_print.h>



#include "i915_vma.h"

#include "i9xx_plane_regs.h"

#include "intel_de.h"

#include "intel_display_device.h"
@@ -1463,7 +1462,7 @@ static void intel_fbc_update_state(struct intel_atomic_state *state, 
		    !intel_fbc_has_fences(display));



	if (plane_state->flags & PLANE_HAS_FENCE)

		fbc_state->fence_id =  i915_vma_fence_id(plane_state->ggtt_vma);

		fbc_state->fence_id = intel_parent_vma_fence_id(display, plane_state->ggtt_vma);

	else

		fbc_state->fence_id = -1;
@@ -1490,7 +1489,7 @@ static bool intel_fbc_is_fence_ok(const struct intel_plane_state *plane_state) 
	 */

	return DISPLAY_VER(display) >= 9 ||

		(plane_state->flags & PLANE_HAS_FENCE &&

		 i915_vma_fence_id(plane_state->ggtt_vma) != -1);

		 intel_parent_vma_fence_id(display, plane_state->ggtt_vma) != -1);

}



static bool intel_fbc_is_cfb_ok(const struct intel_plane_state *plane_state)

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

+9 −0
Original line number Diff line number Diff line
@@ -317,6 +317,15 @@ void intel_parent_stolen_node_free(struct intel_display *display, const struct i 
	display->parent->stolen->node_free(node);

}



/* vma */

int intel_parent_vma_fence_id(struct intel_display *display, const struct i915_vma *vma)

{

	if (!display->parent->vma)

		return -1;



	return display->parent->vma->fence_id(vma);

}



/* generic */

void intel_parent_fence_priority_display(struct intel_display *display, struct dma_fence *fence)

{

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

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ u64 intel_parent_stolen_node_size(struct intel_display *display, const struct in 
struct intel_stolen_node *intel_parent_stolen_node_alloc(struct intel_display *display);

void intel_parent_stolen_node_free(struct intel_display *display, const struct intel_stolen_node *node);



/* vma */

int intel_parent_vma_fence_id(struct intel_display *display, const struct i915_vma *vma);



/* generic */

bool intel_parent_has_auxccs(struct intel_display *display);

bool intel_parent_has_fenced_regions(struct intel_display *display);

drivers/gpu/drm/i915/i915_driver.c

+1 −0
Original line number Diff line number Diff line
@@ -775,6 +775,7 @@ static const struct intel_display_parent_interface parent = { 
	.rpm = &i915_display_rpm_interface,

	.rps = &i915_display_rps_interface,

	.stolen = &i915_display_stolen_interface,

	.vma = &i915_display_vma_interface,



	.fence_priority_display = fence_priority_display,

	.has_auxccs = has_auxccs,

drivers/gpu/drm/i915/i915_vma.c

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include <drm/drm_gem.h>

#include <drm/drm_print.h>

#include <drm/intel/display_parent_interface.h>



#include "display/intel_fb.h"

#include "display/intel_frontbuffer.h"
@@ -2332,3 +2333,12 @@ int __init i915_vma_module_init(void) 


	return 0;

}



static int i915_vma_fence_id(const struct i915_vma *vma)

{

	return vma->fence ? vma->fence->id : -1;

}



const struct intel_display_vma_interface i915_display_vma_interface = {

	.fence_id = i915_vma_fence_id,

};