Commit 308fcf7d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/de: drop drm_i915_private compat wrappers from intel_de_*() 



All the users of intel_de_*() functions now pass in struct
intel_display, and we can remove the __to_intel_display() _Generic()
compat wrappers.

Reviewed-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://lore.kernel.org/r/3aac42eab7b03c791afee940d0a647770afc99c5.1746175756.git.jani.nikula@intel.com


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

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

+4 −10
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#ifndef __INTEL_DE_H__

#define __INTEL_DE_H__



#include "intel_display_conversion.h"

#include "intel_display_core.h"

#include "intel_dmc_wl.h"

#include "intel_dsb.h"
@@ -19,7 +18,7 @@ static inline struct intel_uncore *__to_uncore(struct intel_display *display) 
}



static inline u32

__intel_de_read(struct intel_display *display, i915_reg_t reg)

intel_de_read(struct intel_display *display, i915_reg_t reg)

{

	u32 val;
@@ -31,7 +30,6 @@ __intel_de_read(struct intel_display *display, i915_reg_t reg) 


	return val;

}

#define intel_de_read(p,...) __intel_de_read(__to_intel_display(p), __VA_ARGS__)



static inline u8

intel_de_read8(struct intel_display *display, i915_reg_t reg)
@@ -66,7 +64,7 @@ intel_de_read64_2x32(struct intel_display *display, 
}



static inline void

__intel_de_posting_read(struct intel_display *display, i915_reg_t reg)

intel_de_posting_read(struct intel_display *display, i915_reg_t reg)

{

	intel_dmc_wl_get(display, reg);
@@ -74,10 +72,9 @@ __intel_de_posting_read(struct intel_display *display, i915_reg_t reg) 


	intel_dmc_wl_put(display, reg);

}

#define intel_de_posting_read(p,...) __intel_de_posting_read(__to_intel_display(p), __VA_ARGS__)



static inline void

__intel_de_write(struct intel_display *display, i915_reg_t reg, u32 val)

intel_de_write(struct intel_display *display, i915_reg_t reg, u32 val)

{

	intel_dmc_wl_get(display, reg);
@@ -85,7 +82,6 @@ __intel_de_write(struct intel_display *display, i915_reg_t reg, u32 val) 


	intel_dmc_wl_put(display, reg);

}

#define intel_de_write(p,...) __intel_de_write(__to_intel_display(p), __VA_ARGS__)



static inline u32

__intel_de_rmw_nowl(struct intel_display *display, i915_reg_t reg,
@@ -95,8 +91,7 @@ __intel_de_rmw_nowl(struct intel_display *display, i915_reg_t reg, 
}



static inline u32

__intel_de_rmw(struct intel_display *display, i915_reg_t reg, u32 clear,

	       u32 set)

intel_de_rmw(struct intel_display *display, i915_reg_t reg, u32 clear, u32 set)

{

	u32 val;
@@ -108,7 +103,6 @@ __intel_de_rmw(struct intel_display *display, i915_reg_t reg, u32 clear, 


	return val;

}

#define intel_de_rmw(p,...) __intel_de_rmw(__to_intel_display(p), __VA_ARGS__)



static inline int

__intel_de_wait_for_register_nowl(struct intel_display *display,