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

drm/i915/pxp: un-inline intel_pxp_is_enabled() 



In the interest of reducing include dependencies, un-inline
intel_pxp_is_enabled().

v2: Fix build for CONFIG_DRM_I915_PXP=n

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/36bbb3708f3b1f84f0718afff94212dde93cb479.1639142167.git.jani.nikula@intel.com
parent 0cdbab89

drivers/gpu/drm/i915/pxp/intel_pxp.c

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ struct intel_gt *pxp_to_gt(const struct intel_pxp *pxp) 
	return container_of(pxp, struct intel_gt, pxp);

}



bool intel_pxp_is_enabled(const struct intel_pxp *pxp)

{

	return pxp->ce;

}



bool intel_pxp_is_active(const struct intel_pxp *pxp)

{

	return pxp->arb_is_valid;

drivers/gpu/drm/i915/pxp/intel_pxp.h

+9 −6
Original line number Diff line number Diff line
@@ -6,17 +6,15 @@ 
#ifndef __INTEL_PXP_H__

#define __INTEL_PXP_H__



#include "intel_pxp_types.h"

#include <linux/errno.h>

#include <linux/types.h>



struct intel_pxp;

struct drm_i915_gem_object;



static inline bool intel_pxp_is_enabled(const struct intel_pxp *pxp)

{

	return pxp->ce;

}



#ifdef CONFIG_DRM_I915_PXP

struct intel_gt *pxp_to_gt(const struct intel_pxp *pxp);

bool intel_pxp_is_enabled(const struct intel_pxp *pxp);

bool intel_pxp_is_active(const struct intel_pxp *pxp);



void intel_pxp_init(struct intel_pxp *pxp);
@@ -48,6 +46,11 @@ static inline int intel_pxp_start(struct intel_pxp *pxp) 
	return -ENODEV;

}



static inline bool intel_pxp_is_enabled(const struct intel_pxp *pxp)

{

	return false;

}



static inline bool intel_pxp_is_active(const struct intel_pxp *pxp)

{

	return false;