mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 01:55:51 +02:00
drm/{i915, xe}: convert VLV sideband display wrappers into real functions
Convert the VLV sideband static inline wrappers into real functions. This will help the follow-up work of moving the VLV sideband to the display parent interface. The downside is that we'll have to build vlv_sideband.c as part of xe build, to avoid a plethora of stubs. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patch.msgid.link/57740dc3a820cb5fc1cfcd28e4be58b2cb48020d.1774957233.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula
parent
3b6e473cdc
commit
e4de0fadeb
|
|
@ -8,6 +8,71 @@
|
|||
#include "intel_dpio_phy.h"
|
||||
#include "vlv_sideband.h"
|
||||
|
||||
void vlv_bunit_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_BUNIT));
|
||||
}
|
||||
|
||||
u32 vlv_bunit_read(struct drm_device *drm, u32 reg)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_BUNIT, reg);
|
||||
}
|
||||
|
||||
void vlv_bunit_write(struct drm_device *drm, u32 reg, u32 val)
|
||||
{
|
||||
vlv_iosf_sb_write(drm, VLV_IOSF_SB_BUNIT, reg, val);
|
||||
}
|
||||
|
||||
void vlv_bunit_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_BUNIT));
|
||||
}
|
||||
|
||||
void vlv_cck_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_CCK));
|
||||
}
|
||||
|
||||
u32 vlv_cck_read(struct drm_device *drm, u32 reg)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_CCK, reg);
|
||||
}
|
||||
|
||||
void vlv_cck_write(struct drm_device *drm, u32 reg, u32 val)
|
||||
{
|
||||
vlv_iosf_sb_write(drm, VLV_IOSF_SB_CCK, reg, val);
|
||||
}
|
||||
|
||||
void vlv_cck_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_CCK));
|
||||
}
|
||||
|
||||
void vlv_ccu_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_CCU));
|
||||
}
|
||||
|
||||
u32 vlv_ccu_read(struct drm_device *drm, u32 reg)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_CCU, reg);
|
||||
}
|
||||
|
||||
void vlv_ccu_write(struct drm_device *drm, u32 reg, u32 val)
|
||||
{
|
||||
vlv_iosf_sb_write(drm, VLV_IOSF_SB_CCU, reg, val);
|
||||
}
|
||||
|
||||
void vlv_ccu_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_CCU));
|
||||
}
|
||||
|
||||
void vlv_dpio_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
|
||||
}
|
||||
|
||||
static enum vlv_iosf_sb_unit vlv_dpio_phy_to_unit(struct intel_display *display,
|
||||
enum dpio_phy phy)
|
||||
{
|
||||
|
|
@ -48,3 +113,63 @@ void vlv_dpio_write(struct drm_device *drm,
|
|||
|
||||
vlv_iosf_sb_write(drm, unit, reg, val);
|
||||
}
|
||||
|
||||
void vlv_dpio_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
|
||||
}
|
||||
|
||||
void vlv_flisdsi_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_FLISDSI));
|
||||
}
|
||||
|
||||
u32 vlv_flisdsi_read(struct drm_device *drm, u32 reg)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_FLISDSI, reg);
|
||||
}
|
||||
|
||||
void vlv_flisdsi_write(struct drm_device *drm, u32 reg, u32 val)
|
||||
{
|
||||
vlv_iosf_sb_write(drm, VLV_IOSF_SB_FLISDSI, reg, val);
|
||||
}
|
||||
|
||||
void vlv_flisdsi_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_FLISDSI));
|
||||
}
|
||||
|
||||
void vlv_nc_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_NC));
|
||||
}
|
||||
|
||||
u32 vlv_nc_read(struct drm_device *drm, u8 addr)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_NC, addr);
|
||||
}
|
||||
|
||||
void vlv_nc_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_NC));
|
||||
}
|
||||
|
||||
void vlv_punit_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_PUNIT));
|
||||
}
|
||||
|
||||
u32 vlv_punit_read(struct drm_device *drm, u32 addr)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_PUNIT, addr);
|
||||
}
|
||||
|
||||
int vlv_punit_write(struct drm_device *drm, u32 addr, u32 val)
|
||||
{
|
||||
return vlv_iosf_sb_write(drm, VLV_IOSF_SB_PUNIT, addr, val);
|
||||
}
|
||||
|
||||
void vlv_punit_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_PUNIT));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
#ifndef _VLV_SIDEBAND_H_
|
||||
#define _VLV_SIDEBAND_H_
|
||||
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#include "vlv_iosf_sb.h"
|
||||
|
|
@ -13,144 +12,38 @@
|
|||
enum dpio_phy;
|
||||
struct drm_device;
|
||||
|
||||
static inline void vlv_bunit_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_BUNIT));
|
||||
}
|
||||
void vlv_bunit_get(struct drm_device *drm);
|
||||
u32 vlv_bunit_read(struct drm_device *drm, u32 reg);
|
||||
void vlv_bunit_write(struct drm_device *drm, u32 reg, u32 val);
|
||||
void vlv_bunit_put(struct drm_device *drm);
|
||||
|
||||
static inline u32 vlv_bunit_read(struct drm_device *drm, u32 reg)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_BUNIT, reg);
|
||||
}
|
||||
void vlv_cck_get(struct drm_device *drm);
|
||||
u32 vlv_cck_read(struct drm_device *drm, u32 reg);
|
||||
void vlv_cck_write(struct drm_device *drm, u32 reg, u32 val);
|
||||
void vlv_cck_put(struct drm_device *drm);
|
||||
|
||||
static inline void vlv_bunit_write(struct drm_device *drm, u32 reg, u32 val)
|
||||
{
|
||||
vlv_iosf_sb_write(drm, VLV_IOSF_SB_BUNIT, reg, val);
|
||||
}
|
||||
void vlv_ccu_get(struct drm_device *drm);
|
||||
u32 vlv_ccu_read(struct drm_device *drm, u32 reg);
|
||||
void vlv_ccu_write(struct drm_device *drm, u32 reg, u32 val);
|
||||
void vlv_ccu_put(struct drm_device *drm);
|
||||
|
||||
static inline void vlv_bunit_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_BUNIT));
|
||||
}
|
||||
|
||||
static inline void vlv_cck_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_CCK));
|
||||
}
|
||||
|
||||
static inline u32 vlv_cck_read(struct drm_device *drm, u32 reg)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_CCK, reg);
|
||||
}
|
||||
|
||||
static inline void vlv_cck_write(struct drm_device *drm, u32 reg, u32 val)
|
||||
{
|
||||
vlv_iosf_sb_write(drm, VLV_IOSF_SB_CCK, reg, val);
|
||||
}
|
||||
|
||||
static inline void vlv_cck_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_CCK));
|
||||
}
|
||||
|
||||
static inline void vlv_ccu_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_CCU));
|
||||
}
|
||||
|
||||
static inline u32 vlv_ccu_read(struct drm_device *drm, u32 reg)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_CCU, reg);
|
||||
}
|
||||
|
||||
static inline void vlv_ccu_write(struct drm_device *drm, u32 reg, u32 val)
|
||||
{
|
||||
vlv_iosf_sb_write(drm, VLV_IOSF_SB_CCU, reg, val);
|
||||
}
|
||||
|
||||
static inline void vlv_ccu_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_CCU));
|
||||
}
|
||||
|
||||
static inline void vlv_dpio_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
|
||||
}
|
||||
|
||||
#ifdef I915
|
||||
void vlv_dpio_get(struct drm_device *drm);
|
||||
u32 vlv_dpio_read(struct drm_device *drm, enum dpio_phy phy, int reg);
|
||||
void vlv_dpio_write(struct drm_device *drm,
|
||||
enum dpio_phy phy, int reg, u32 val);
|
||||
#else
|
||||
static inline u32 vlv_dpio_read(struct drm_device *drm, int phy, int reg)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
static inline void vlv_dpio_write(struct drm_device *drm,
|
||||
int phy, int reg, u32 val)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
void vlv_dpio_write(struct drm_device *drm, enum dpio_phy phy, int reg, u32 val);
|
||||
void vlv_dpio_put(struct drm_device *drm);
|
||||
|
||||
static inline void vlv_dpio_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
|
||||
}
|
||||
void vlv_flisdsi_get(struct drm_device *drm);
|
||||
u32 vlv_flisdsi_read(struct drm_device *drm, u32 reg);
|
||||
void vlv_flisdsi_write(struct drm_device *drm, u32 reg, u32 val);
|
||||
void vlv_flisdsi_put(struct drm_device *drm);
|
||||
|
||||
static inline void vlv_flisdsi_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_FLISDSI));
|
||||
}
|
||||
void vlv_nc_get(struct drm_device *drm);
|
||||
u32 vlv_nc_read(struct drm_device *drm, u8 addr);
|
||||
void vlv_nc_put(struct drm_device *drm);
|
||||
|
||||
static inline u32 vlv_flisdsi_read(struct drm_device *drm, u32 reg)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_FLISDSI, reg);
|
||||
}
|
||||
|
||||
static inline void vlv_flisdsi_write(struct drm_device *drm, u32 reg, u32 val)
|
||||
{
|
||||
vlv_iosf_sb_write(drm, VLV_IOSF_SB_FLISDSI, reg, val);
|
||||
}
|
||||
|
||||
static inline void vlv_flisdsi_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_FLISDSI));
|
||||
}
|
||||
|
||||
static inline void vlv_nc_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_NC));
|
||||
}
|
||||
|
||||
static inline u32 vlv_nc_read(struct drm_device *drm, u8 addr)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_NC, addr);
|
||||
}
|
||||
|
||||
static inline void vlv_nc_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_NC));
|
||||
}
|
||||
|
||||
static inline void vlv_punit_get(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_PUNIT));
|
||||
}
|
||||
|
||||
static inline u32 vlv_punit_read(struct drm_device *drm, u32 addr)
|
||||
{
|
||||
return vlv_iosf_sb_read(drm, VLV_IOSF_SB_PUNIT, addr);
|
||||
}
|
||||
|
||||
static inline int vlv_punit_write(struct drm_device *drm, u32 addr, u32 val)
|
||||
{
|
||||
return vlv_iosf_sb_write(drm, VLV_IOSF_SB_PUNIT, addr, val);
|
||||
}
|
||||
|
||||
static inline void vlv_punit_put(struct drm_device *drm)
|
||||
{
|
||||
vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_PUNIT));
|
||||
}
|
||||
void vlv_punit_get(struct drm_device *drm);
|
||||
u32 vlv_punit_read(struct drm_device *drm, u32 addr);
|
||||
int vlv_punit_write(struct drm_device *drm, u32 addr, u32 val);
|
||||
void vlv_punit_put(struct drm_device *drm);
|
||||
|
||||
#endif /* _VLV_SIDEBAND_H_ */
|
||||
|
|
|
|||
|
|
@ -330,7 +330,8 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
|
|||
i915-display/skl_prefill.o \
|
||||
i915-display/skl_scaler.o \
|
||||
i915-display/skl_universal_plane.o \
|
||||
i915-display/skl_watermark.o
|
||||
i915-display/skl_watermark.o \
|
||||
i915-display/vlv_sideband.o
|
||||
|
||||
ifeq ($(CONFIG_ACPI),y)
|
||||
xe-$(CONFIG_DRM_XE_DISPLAY) += \
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user