66#ifndef __INTEL_DE_H__
77#define __INTEL_DE_H__
88
9- #include "intel_display_conversion.h"
109#include "intel_display_core.h"
1110#include "intel_dmc_wl.h"
1211#include "intel_dsb.h"
@@ -19,7 +18,7 @@ static inline struct intel_uncore *__to_uncore(struct intel_display *display)
1918}
2019
2120static inline u32
22- __intel_de_read (struct intel_display * display , i915_reg_t reg )
21+ intel_de_read (struct intel_display * display , i915_reg_t reg )
2322{
2423 u32 val ;
2524
@@ -31,7 +30,6 @@ __intel_de_read(struct intel_display *display, i915_reg_t reg)
3130
3231 return val ;
3332}
34- #define intel_de_read (p ,...) __intel_de_read(__to_intel_display(p), __VA_ARGS__)
3533
3634static inline u8
3735intel_de_read8 (struct intel_display * display , i915_reg_t reg )
@@ -66,26 +64,24 @@ intel_de_read64_2x32(struct intel_display *display,
6664}
6765
6866static inline void
69- __intel_de_posting_read (struct intel_display * display , i915_reg_t reg )
67+ intel_de_posting_read (struct intel_display * display , i915_reg_t reg )
7068{
7169 intel_dmc_wl_get (display , reg );
7270
7371 intel_uncore_posting_read (__to_uncore (display ), reg );
7472
7573 intel_dmc_wl_put (display , reg );
7674}
77- #define intel_de_posting_read (p ,...) __intel_de_posting_read(__to_intel_display(p), __VA_ARGS__)
7875
7976static inline void
80- __intel_de_write (struct intel_display * display , i915_reg_t reg , u32 val )
77+ intel_de_write (struct intel_display * display , i915_reg_t reg , u32 val )
8178{
8279 intel_dmc_wl_get (display , reg );
8380
8481 intel_uncore_write (__to_uncore (display ), reg , val );
8582
8683 intel_dmc_wl_put (display , reg );
8784}
88- #define intel_de_write (p ,...) __intel_de_write(__to_intel_display(p), __VA_ARGS__)
8985
9086static inline u32
9187__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,
9591}
9692
9793static inline u32
98- __intel_de_rmw (struct intel_display * display , i915_reg_t reg , u32 clear ,
99- u32 set )
94+ intel_de_rmw (struct intel_display * display , i915_reg_t reg , u32 clear , u32 set )
10095{
10196 u32 val ;
10297
@@ -108,7 +103,6 @@ __intel_de_rmw(struct intel_display *display, i915_reg_t reg, u32 clear,
108103
109104 return val ;
110105}
111- #define intel_de_rmw (p ,...) __intel_de_rmw(__to_intel_display(p), __VA_ARGS__)
112106
113107static inline int
114108__intel_de_wait_for_register_nowl (struct intel_display * display ,
0 commit comments