Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55b8f2a7 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Make INTEL_GEN only take dev_priv 



Saves 968 bytes of .rodata strings.

v2: Add parantheses around dev_priv. (Ville Syrjala)
v3: Rebase.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarDavid Weinehall <david.weinehall@linux.intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 11a914c2

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2600,8 +2600,8 @@ struct drm_i915_cmd_table { 
	__p; \

})

#define INTEL_INFO(p)	(&__I915__(p)->info)

#define INTEL_GEN(p)	(INTEL_INFO(p)->gen)



#define INTEL_GEN(dev_priv)	((dev_priv)->info.gen)

#define INTEL_DEVID(dev_priv)	((dev_priv)->info.device_id)



#define REVID_FOREVER		0xff

drivers/gpu/drm/i915/i915_gem_render_state.c

+3 −3
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ render_state_get_rodata(const struct drm_i915_gem_request *req) 


static int render_state_setup(struct render_state *so)

{

	struct drm_device *dev = so->vma->vm->dev;

	struct drm_i915_private *dev_priv = to_i915(so->vma->vm->dev);

	const struct intel_renderstate_rodata *rodata = so->rodata;

	const bool has_64bit_reloc = INTEL_GEN(dev) >= 8;

	const bool has_64bit_reloc = INTEL_GEN(dev_priv) >= 8;

	unsigned int i = 0, reloc_index = 0;

	struct page *page;

	u32 *d;
@@ -115,7 +115,7 @@ static int render_state_setup(struct render_state *so) 


	so->aux_batch_offset = i * sizeof(u32);



	if (HAS_POOLED_EU(dev)) {

	if (HAS_POOLED_EU(dev_priv)) {

		/*

		 * We always program 3x6 pool config but depending upon which

		 * subslice is disabled HW drops down to appropriate config

drivers/gpu/drm/i915/i915_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -2748,7 +2748,7 @@ static int ironlake_enable_vblank(struct drm_device *dev, unsigned int pipe) 
{

	struct drm_i915_private *dev_priv = to_i915(dev);

	unsigned long irqflags;

	uint32_t bit = INTEL_GEN(dev) >= 7 ?

	uint32_t bit = INTEL_GEN(dev_priv) >= 7 ?

		DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);



	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
@@ -2798,7 +2798,7 @@ static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe) 
{

	struct drm_i915_private *dev_priv = to_i915(dev);

	unsigned long irqflags;

	uint32_t bit = INTEL_GEN(dev) >= 7 ?

	uint32_t bit = INTEL_GEN(dev_priv) >= 7 ?

		DE_PIPE_VBLANK_IVB(pipe) : DE_PIPE_VBLANK(pipe);



	spin_lock_irqsave(&dev_priv->irq_lock, irqflags);

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -12450,7 +12450,7 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, 
	struct drm_framebuffer *fb = plane_state->fb;

	int ret;



	if (INTEL_GEN(dev) >= 9 && plane->type != DRM_PLANE_TYPE_CURSOR) {

	if (INTEL_GEN(dev_priv) >= 9 && plane->type != DRM_PLANE_TYPE_CURSOR) {

		ret = skl_update_scaler_plane(

			to_intel_crtc_state(crtc_state),

			to_intel_plane_state(plane_state));

drivers/gpu/drm/i915/intel_sprite.c

+4 −4
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ intel_check_sprite_plane(struct drm_plane *plane, 
			 struct intel_crtc_state *crtc_state,

			 struct intel_plane_state *state)

{

	struct drm_device *dev = plane->dev;

	struct drm_i915_private *dev_priv = to_i915(plane->dev);

	struct drm_crtc *crtc = state->base.crtc;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct intel_plane *intel_plane = to_intel_plane(plane);
@@ -797,7 +797,7 @@ intel_check_sprite_plane(struct drm_plane *plane, 
	}



	/* setup can_scale, min_scale, max_scale */

	if (INTEL_INFO(dev)->gen >= 9) {

	if (INTEL_GEN(dev_priv) >= 9) {

		/* use scaler when colorkey is not required */

		if (state->ckey.flags == I915_SET_COLORKEY_NONE) {

			can_scale = 1;
@@ -913,7 +913,7 @@ intel_check_sprite_plane(struct drm_plane *plane, 


		width_bytes = ((src_x * cpp) & 63) + src_w * cpp;



		if (INTEL_INFO(dev)->gen < 9 && (src_w > 2048 || src_h > 2048 ||

		if (INTEL_GEN(dev_priv) < 9 && (src_w > 2048 || src_h > 2048 ||

		    width_bytes > 4096 || fb->pitches[0] > 4096)) {

			DRM_DEBUG_KMS("Source dimensions exceed hardware limits\n");

			return -EINVAL;
@@ -932,7 +932,7 @@ intel_check_sprite_plane(struct drm_plane *plane, 
	dst->y1 = crtc_y;

	dst->y2 = crtc_y + crtc_h;



	if (INTEL_GEN(dev) >= 9) {

	if (INTEL_GEN(dev_priv) >= 9) {

		ret = skl_check_plane_surface(state);

		if (ret)

			return ret;