github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 14:42:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/gvt: convert mmio table to struct intel_display

Browse Source 
Underneath, the register macros really expect a struct
intel_display. Switch to it in preparation for removing the transitional
__to_intel_display() macro.

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/ef50b08c9bf6066201c86dc7e0f08f008c7c47d5.1754499175.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2025-08-06 19:55:14 +03:00
parent 240e3c640c
commit 85cac9ff65
1 changed files with 134 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
drivers/gpu/drm/i915/intel_gvt_mmio_table.c
View File

@ -62,6 +62,7 @@
static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
{
struct drm_i915_private *dev_priv = iter->i915;
struct intel_display *display = dev_priv->display;
MMIO_RING_D(RING_IMR);
MMIO_D(SDEIMR);
@ -133,38 +134,38 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
MMIO_D(_MMIO(0x650b4));
MMIO_D(_MMIO(0xc4040));
MMIO_D(DERRMR);
MMIO_D(PIPEDSL(dev_priv, PIPE_A));
MMIO_D(PIPEDSL(dev_priv, PIPE_B));
MMIO_D(PIPEDSL(dev_priv, PIPE_C));
MMIO_D(PIPEDSL(dev_priv, _PIPE_EDP));
MMIO_D(TRANSCONF(dev_priv, TRANSCODER_A));
MMIO_D(TRANSCONF(dev_priv, TRANSCODER_B));
MMIO_D(TRANSCONF(dev_priv, TRANSCODER_C));
MMIO_D(TRANSCONF(dev_priv, TRANSCODER_EDP));
MMIO_D(PIPESTAT(dev_priv, PIPE_A));
MMIO_D(PIPESTAT(dev_priv, PIPE_B));
MMIO_D(PIPESTAT(dev_priv, PIPE_C));
MMIO_D(PIPESTAT(dev_priv, _PIPE_EDP));
MMIO_D(PIPE_FLIPCOUNT_G4X(dev_priv, PIPE_A));
MMIO_D(PIPE_FLIPCOUNT_G4X(dev_priv, PIPE_B));
MMIO_D(PIPE_FLIPCOUNT_G4X(dev_priv, PIPE_C));
MMIO_D(PIPE_FLIPCOUNT_G4X(dev_priv, _PIPE_EDP));
MMIO_D(PIPE_FRMCOUNT_G4X(dev_priv, PIPE_A));
MMIO_D(PIPE_FRMCOUNT_G4X(dev_priv, PIPE_B));
MMIO_D(PIPE_FRMCOUNT_G4X(dev_priv, PIPE_C));
MMIO_D(PIPE_FRMCOUNT_G4X(dev_priv, _PIPE_EDP));
MMIO_D(CURCNTR(dev_priv, PIPE_A));
MMIO_D(CURCNTR(dev_priv, PIPE_B));
MMIO_D(CURCNTR(dev_priv, PIPE_C));
MMIO_D(CURPOS(dev_priv, PIPE_A));
MMIO_D(CURPOS(dev_priv, PIPE_B));
MMIO_D(CURPOS(dev_priv, PIPE_C));
MMIO_D(CURBASE(dev_priv, PIPE_A));
MMIO_D(CURBASE(dev_priv, PIPE_B));
MMIO_D(CURBASE(dev_priv, PIPE_C));
MMIO_D(CUR_FBC_CTL(dev_priv, PIPE_A));
MMIO_D(CUR_FBC_CTL(dev_priv, PIPE_B));
MMIO_D(CUR_FBC_CTL(dev_priv, PIPE_C));
MMIO_D(PIPEDSL(display, PIPE_A));
MMIO_D(PIPEDSL(display, PIPE_B));
MMIO_D(PIPEDSL(display, PIPE_C));
MMIO_D(PIPEDSL(display, _PIPE_EDP));
MMIO_D(TRANSCONF(display, TRANSCODER_A));
MMIO_D(TRANSCONF(display, TRANSCODER_B));
MMIO_D(TRANSCONF(display, TRANSCODER_C));
MMIO_D(TRANSCONF(display, TRANSCODER_EDP));
MMIO_D(PIPESTAT(display, PIPE_A));
MMIO_D(PIPESTAT(display, PIPE_B));
MMIO_D(PIPESTAT(display, PIPE_C));
MMIO_D(PIPESTAT(display, _PIPE_EDP));
MMIO_D(PIPE_FLIPCOUNT_G4X(display, PIPE_A));
MMIO_D(PIPE_FLIPCOUNT_G4X(display, PIPE_B));
MMIO_D(PIPE_FLIPCOUNT_G4X(display, PIPE_C));
MMIO_D(PIPE_FLIPCOUNT_G4X(display, _PIPE_EDP));
MMIO_D(PIPE_FRMCOUNT_G4X(display, PIPE_A));
MMIO_D(PIPE_FRMCOUNT_G4X(display, PIPE_B));
MMIO_D(PIPE_FRMCOUNT_G4X(display, PIPE_C));
MMIO_D(PIPE_FRMCOUNT_G4X(display, _PIPE_EDP));
MMIO_D(CURCNTR(display, PIPE_A));
MMIO_D(CURCNTR(display, PIPE_B));
MMIO_D(CURCNTR(display, PIPE_C));
MMIO_D(CURPOS(display, PIPE_A));
MMIO_D(CURPOS(display, PIPE_B));
MMIO_D(CURPOS(display, PIPE_C));
MMIO_D(CURBASE(display, PIPE_A));
MMIO_D(CURBASE(display, PIPE_B));
MMIO_D(CURBASE(display, PIPE_C));
MMIO_D(CUR_FBC_CTL(display, PIPE_A));
MMIO_D(CUR_FBC_CTL(display, PIPE_B));
MMIO_D(CUR_FBC_CTL(display, PIPE_C));
MMIO_D(_MMIO(0x700ac));
MMIO_D(_MMIO(0x710ac));
MMIO_D(_MMIO(0x720ac));
@ -172,32 +173,32 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
MMIO_D(_MMIO(0x70094));
MMIO_D(_MMIO(0x70098));
MMIO_D(_MMIO(0x7009c));
MMIO_D(DSPCNTR(dev_priv, PIPE_A));
MMIO_D(DSPADDR(dev_priv, PIPE_A));
MMIO_D(DSPSTRIDE(dev_priv, PIPE_A));
MMIO_D(DSPPOS(dev_priv, PIPE_A));
MMIO_D(DSPSIZE(dev_priv, PIPE_A));
MMIO_D(DSPSURF(dev_priv, PIPE_A));
MMIO_D(DSPOFFSET(dev_priv, PIPE_A));
MMIO_D(DSPSURFLIVE(dev_priv, PIPE_A));
MMIO_D(DSPCNTR(display, PIPE_A));
MMIO_D(DSPADDR(display, PIPE_A));
MMIO_D(DSPSTRIDE(display, PIPE_A));
MMIO_D(DSPPOS(display, PIPE_A));
MMIO_D(DSPSIZE(display, PIPE_A));
MMIO_D(DSPSURF(display, PIPE_A));
MMIO_D(DSPOFFSET(display, PIPE_A));
MMIO_D(DSPSURFLIVE(display, PIPE_A));
MMIO_D(REG_50080(PIPE_A, PLANE_PRIMARY));
MMIO_D(DSPCNTR(dev_priv, PIPE_B));
MMIO_D(DSPADDR(dev_priv, PIPE_B));
MMIO_D(DSPSTRIDE(dev_priv, PIPE_B));
MMIO_D(DSPPOS(dev_priv, PIPE_B));
MMIO_D(DSPSIZE(dev_priv, PIPE_B));
MMIO_D(DSPSURF(dev_priv, PIPE_B));
MMIO_D(DSPOFFSET(dev_priv, PIPE_B));
MMIO_D(DSPSURFLIVE(dev_priv, PIPE_B));
MMIO_D(DSPCNTR(display, PIPE_B));
MMIO_D(DSPADDR(display, PIPE_B));
MMIO_D(DSPSTRIDE(display, PIPE_B));
MMIO_D(DSPPOS(display, PIPE_B));
MMIO_D(DSPSIZE(display, PIPE_B));
MMIO_D(DSPSURF(display, PIPE_B));
MMIO_D(DSPOFFSET(display, PIPE_B));
MMIO_D(DSPSURFLIVE(display, PIPE_B));
MMIO_D(REG_50080(PIPE_B, PLANE_PRIMARY));
MMIO_D(DSPCNTR(dev_priv, PIPE_C));
MMIO_D(DSPADDR(dev_priv, PIPE_C));
MMIO_D(DSPSTRIDE(dev_priv, PIPE_C));
MMIO_D(DSPPOS(dev_priv, PIPE_C));
MMIO_D(DSPSIZE(dev_priv, PIPE_C));
MMIO_D(DSPSURF(dev_priv, PIPE_C));
MMIO_D(DSPOFFSET(dev_priv, PIPE_C));
MMIO_D(DSPSURFLIVE(dev_priv, PIPE_C));
MMIO_D(DSPCNTR(display, PIPE_C));
MMIO_D(DSPADDR(display, PIPE_C));
MMIO_D(DSPSTRIDE(display, PIPE_C));
MMIO_D(DSPPOS(display, PIPE_C));
MMIO_D(DSPSIZE(display, PIPE_C));
MMIO_D(DSPSURF(display, PIPE_C));
MMIO_D(DSPOFFSET(display, PIPE_C));
MMIO_D(DSPSURFLIVE(display, PIPE_C));
MMIO_D(REG_50080(PIPE_C, PLANE_PRIMARY));
MMIO_D(SPRCTL(PIPE_A));
MMIO_D(SPRLINOFF(PIPE_A));
@ -238,73 +239,73 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
MMIO_D(SPRSCALE(PIPE_C));
MMIO_D(SPRSURFLIVE(PIPE_C));
MMIO_D(REG_50080(PIPE_C, PLANE_SPRITE0));
MMIO_D(TRANS_HTOTAL(dev_priv, TRANSCODER_A));
MMIO_D(TRANS_HBLANK(dev_priv, TRANSCODER_A));
MMIO_D(TRANS_HSYNC(dev_priv, TRANSCODER_A));
MMIO_D(TRANS_VTOTAL(dev_priv, TRANSCODER_A));
MMIO_D(TRANS_VBLANK(dev_priv, TRANSCODER_A));
MMIO_D(TRANS_VSYNC(dev_priv, TRANSCODER_A));
MMIO_D(BCLRPAT(dev_priv, TRANSCODER_A));
MMIO_D(TRANS_VSYNCSHIFT(dev_priv, TRANSCODER_A));
MMIO_D(PIPESRC(dev_priv, TRANSCODER_A));
MMIO_D(TRANS_HTOTAL(dev_priv, TRANSCODER_B));
MMIO_D(TRANS_HBLANK(dev_priv, TRANSCODER_B));
MMIO_D(TRANS_HSYNC(dev_priv, TRANSCODER_B));
MMIO_D(TRANS_VTOTAL(dev_priv, TRANSCODER_B));
MMIO_D(TRANS_VBLANK(dev_priv, TRANSCODER_B));
MMIO_D(TRANS_VSYNC(dev_priv, TRANSCODER_B));
MMIO_D(BCLRPAT(dev_priv, TRANSCODER_B));
MMIO_D(TRANS_VSYNCSHIFT(dev_priv, TRANSCODER_B));
MMIO_D(PIPESRC(dev_priv, TRANSCODER_B));
MMIO_D(TRANS_HTOTAL(dev_priv, TRANSCODER_C));
MMIO_D(TRANS_HBLANK(dev_priv, TRANSCODER_C));
MMIO_D(TRANS_HSYNC(dev_priv, TRANSCODER_C));
MMIO_D(TRANS_VTOTAL(dev_priv, TRANSCODER_C));
MMIO_D(TRANS_VBLANK(dev_priv, TRANSCODER_C));
MMIO_D(TRANS_VSYNC(dev_priv, TRANSCODER_C));
MMIO_D(BCLRPAT(dev_priv, TRANSCODER_C));
MMIO_D(TRANS_VSYNCSHIFT(dev_priv, TRANSCODER_C));
MMIO_D(PIPESRC(dev_priv, TRANSCODER_C));
MMIO_D(TRANS_HTOTAL(dev_priv, TRANSCODER_EDP));
MMIO_D(TRANS_HBLANK(dev_priv, TRANSCODER_EDP));
MMIO_D(TRANS_HSYNC(dev_priv, TRANSCODER_EDP));
MMIO_D(TRANS_VTOTAL(dev_priv, TRANSCODER_EDP));
MMIO_D(TRANS_VBLANK(dev_priv, TRANSCODER_EDP));
MMIO_D(TRANS_VSYNC(dev_priv, TRANSCODER_EDP));
MMIO_D(BCLRPAT(dev_priv, TRANSCODER_EDP));
MMIO_D(TRANS_VSYNCSHIFT(dev_priv, TRANSCODER_EDP));
MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_A));
MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_A));
MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_A));
MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_A));
MMIO_D(PIPE_LINK_M1(dev_priv, TRANSCODER_A));
MMIO_D(PIPE_LINK_N1(dev_priv, TRANSCODER_A));
MMIO_D(PIPE_LINK_M2(dev_priv, TRANSCODER_A));
MMIO_D(PIPE_LINK_N2(dev_priv, TRANSCODER_A));
MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_B));
MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_B));
MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_B));
MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_B));
MMIO_D(PIPE_LINK_M1(dev_priv, TRANSCODER_B));
MMIO_D(PIPE_LINK_N1(dev_priv, TRANSCODER_B));
MMIO_D(PIPE_LINK_M2(dev_priv, TRANSCODER_B));
MMIO_D(PIPE_LINK_N2(dev_priv, TRANSCODER_B));
MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_C));
MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_C));
MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_C));
MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_C));
MMIO_D(PIPE_LINK_M1(dev_priv, TRANSCODER_C));
MMIO_D(PIPE_LINK_N1(dev_priv, TRANSCODER_C));
MMIO_D(PIPE_LINK_M2(dev_priv, TRANSCODER_C));
MMIO_D(PIPE_LINK_N2(dev_priv, TRANSCODER_C));
MMIO_D(PIPE_DATA_M1(dev_priv, TRANSCODER_EDP));
MMIO_D(PIPE_DATA_N1(dev_priv, TRANSCODER_EDP));
MMIO_D(PIPE_DATA_M2(dev_priv, TRANSCODER_EDP));
MMIO_D(PIPE_DATA_N2(dev_priv, TRANSCODER_EDP));
MMIO_D(PIPE_LINK_M1(dev_priv, TRANSCODER_EDP));
MMIO_D(PIPE_LINK_N1(dev_priv, TRANSCODER_EDP));
MMIO_D(PIPE_LINK_M2(dev_priv, TRANSCODER_EDP));
MMIO_D(PIPE_LINK_N2(dev_priv, TRANSCODER_EDP));
MMIO_D(TRANS_HTOTAL(display, TRANSCODER_A));
MMIO_D(TRANS_HBLANK(display, TRANSCODER_A));
MMIO_D(TRANS_HSYNC(display, TRANSCODER_A));
MMIO_D(TRANS_VTOTAL(display, TRANSCODER_A));
MMIO_D(TRANS_VBLANK(display, TRANSCODER_A));
MMIO_D(TRANS_VSYNC(display, TRANSCODER_A));
MMIO_D(BCLRPAT(display, TRANSCODER_A));
MMIO_D(TRANS_VSYNCSHIFT(display, TRANSCODER_A));
MMIO_D(PIPESRC(display, TRANSCODER_A));
MMIO_D(TRANS_HTOTAL(display, TRANSCODER_B));
MMIO_D(TRANS_HBLANK(display, TRANSCODER_B));
MMIO_D(TRANS_HSYNC(display, TRANSCODER_B));
MMIO_D(TRANS_VTOTAL(display, TRANSCODER_B));
MMIO_D(TRANS_VBLANK(display, TRANSCODER_B));
MMIO_D(TRANS_VSYNC(display, TRANSCODER_B));
MMIO_D(BCLRPAT(display, TRANSCODER_B));
MMIO_D(TRANS_VSYNCSHIFT(display, TRANSCODER_B));
MMIO_D(PIPESRC(display, TRANSCODER_B));
MMIO_D(TRANS_HTOTAL(display, TRANSCODER_C));
MMIO_D(TRANS_HBLANK(display, TRANSCODER_C));
MMIO_D(TRANS_HSYNC(display, TRANSCODER_C));
MMIO_D(TRANS_VTOTAL(display, TRANSCODER_C));
MMIO_D(TRANS_VBLANK(display, TRANSCODER_C));
MMIO_D(TRANS_VSYNC(display, TRANSCODER_C));
MMIO_D(BCLRPAT(display, TRANSCODER_C));
MMIO_D(TRANS_VSYNCSHIFT(display, TRANSCODER_C));
MMIO_D(PIPESRC(display, TRANSCODER_C));
MMIO_D(TRANS_HTOTAL(display, TRANSCODER_EDP));
MMIO_D(TRANS_HBLANK(display, TRANSCODER_EDP));
MMIO_D(TRANS_HSYNC(display, TRANSCODER_EDP));
MMIO_D(TRANS_VTOTAL(display, TRANSCODER_EDP));
MMIO_D(TRANS_VBLANK(display, TRANSCODER_EDP));
MMIO_D(TRANS_VSYNC(display, TRANSCODER_EDP));
MMIO_D(BCLRPAT(display, TRANSCODER_EDP));
MMIO_D(TRANS_VSYNCSHIFT(display, TRANSCODER_EDP));
MMIO_D(PIPE_DATA_M1(display, TRANSCODER_A));
MMIO_D(PIPE_DATA_N1(display, TRANSCODER_A));
MMIO_D(PIPE_DATA_M2(display, TRANSCODER_A));
MMIO_D(PIPE_DATA_N2(display, TRANSCODER_A));
MMIO_D(PIPE_LINK_M1(display, TRANSCODER_A));
MMIO_D(PIPE_LINK_N1(display, TRANSCODER_A));
MMIO_D(PIPE_LINK_M2(display, TRANSCODER_A));
MMIO_D(PIPE_LINK_N2(display, TRANSCODER_A));
MMIO_D(PIPE_DATA_M1(display, TRANSCODER_B));
MMIO_D(PIPE_DATA_N1(display, TRANSCODER_B));
MMIO_D(PIPE_DATA_M2(display, TRANSCODER_B));
MMIO_D(PIPE_DATA_N2(display, TRANSCODER_B));
MMIO_D(PIPE_LINK_M1(display, TRANSCODER_B));
MMIO_D(PIPE_LINK_N1(display, TRANSCODER_B));
MMIO_D(PIPE_LINK_M2(display, TRANSCODER_B));
MMIO_D(PIPE_LINK_N2(display, TRANSCODER_B));
MMIO_D(PIPE_DATA_M1(display, TRANSCODER_C));
MMIO_D(PIPE_DATA_N1(display, TRANSCODER_C));
MMIO_D(PIPE_DATA_M2(display, TRANSCODER_C));
MMIO_D(PIPE_DATA_N2(display, TRANSCODER_C));
MMIO_D(PIPE_LINK_M1(display, TRANSCODER_C));
MMIO_D(PIPE_LINK_N1(display, TRANSCODER_C));
MMIO_D(PIPE_LINK_M2(display, TRANSCODER_C));
MMIO_D(PIPE_LINK_N2(display, TRANSCODER_C));
MMIO_D(PIPE_DATA_M1(display, TRANSCODER_EDP));
MMIO_D(PIPE_DATA_N1(display, TRANSCODER_EDP));
MMIO_D(PIPE_DATA_M2(display, TRANSCODER_EDP));
MMIO_D(PIPE_DATA_N2(display, TRANSCODER_EDP));
MMIO_D(PIPE_LINK_M1(display, TRANSCODER_EDP));
MMIO_D(PIPE_LINK_N1(display, TRANSCODER_EDP));
MMIO_D(PIPE_LINK_M2(display, TRANSCODER_EDP));
MMIO_D(PIPE_LINK_N2(display, TRANSCODER_EDP));
MMIO_D(PF_CTL(PIPE_A));
MMIO_D(PF_WIN_SZ(PIPE_A));
MMIO_D(PF_WIN_POS(PIPE_A));
@ -513,12 +514,12 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
MMIO_D(GAMMA_MODE(PIPE_A));
MMIO_D(GAMMA_MODE(PIPE_B));
MMIO_D(GAMMA_MODE(PIPE_C));
MMIO_D(TRANS_MULT(dev_priv, TRANSCODER_A));
MMIO_D(TRANS_MULT(dev_priv, TRANSCODER_B));
MMIO_D(TRANS_MULT(dev_priv, TRANSCODER_C));
MMIO_D(HSW_TVIDEO_DIP_CTL(dev_priv, TRANSCODER_A));
MMIO_D(HSW_TVIDEO_DIP_CTL(dev_priv, TRANSCODER_B));
MMIO_D(HSW_TVIDEO_DIP_CTL(dev_priv, TRANSCODER_C));
MMIO_D(TRANS_MULT(display, TRANSCODER_A));
MMIO_D(TRANS_MULT(display, TRANSCODER_B));
MMIO_D(TRANS_MULT(display, TRANSCODER_C));
MMIO_D(HSW_TVIDEO_DIP_CTL(display, TRANSCODER_A));
MMIO_D(HSW_TVIDEO_DIP_CTL(display, TRANSCODER_B));
MMIO_D(HSW_TVIDEO_DIP_CTL(display, TRANSCODER_C));
MMIO_D(SFUSE_STRAP);
MMIO_D(SBI_ADDR);
MMIO_D(SBI_DATA);
@ -1111,6 +1112,7 @@ static int iterate_skl_plus_mmio(struct intel_gvt_mmio_table_iter *iter)
static int iterate_bxt_mmio(struct intel_gvt_mmio_table_iter *iter)
{
struct drm_i915_private *dev_priv = iter->i915;
struct intel_display *display = dev_priv->display;
MMIO_F(_MMIO(0x80000), 0x3000);
MMIO_D(GEN7_SAMPLER_INSTDONE);
@ -1242,9 +1244,9 @@ static int iterate_bxt_mmio(struct intel_gvt_mmio_table_iter *iter)
MMIO_D(BXT_DSI_PLL_ENABLE);
MMIO_D(GEN9_CLKGATE_DIS_0);
MMIO_D(GEN9_CLKGATE_DIS_4);
MMIO_D(HSW_TVIDEO_DIP_GCP(dev_priv, TRANSCODER_A));
MMIO_D(HSW_TVIDEO_DIP_GCP(dev_priv, TRANSCODER_B));
MMIO_D(HSW_TVIDEO_DIP_GCP(dev_priv, TRANSCODER_C));
MMIO_D(HSW_TVIDEO_DIP_GCP(display, TRANSCODER_A));
MMIO_D(HSW_TVIDEO_DIP_GCP(display, TRANSCODER_B));
MMIO_D(HSW_TVIDEO_DIP_GCP(display, TRANSCODER_C));
MMIO_D(RC6_CTX_BASE);
MMIO_D(GEN8_PUSHBUS_CONTROL);
MMIO_D(GEN8_PUSHBUS_ENABLE);