Skip to content

L
linux
Commit 5efb3e28 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files
Options

drm/i915/chv: Add cursor pipe offsets 

Unsurprisingly the cursor C regiters are also at a weird offset on CHV.
Add more pipe offsets to handle them.

This also gets rid of most of the differences between the i9xx vs. ivb
cursor code. We can unify the remaining code as well, but I'll leave
that for another patch.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAntti Koskipää <antti.koskipaa@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c0c35329
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 45 deletions
drivers/gpu/drm/i915/i915_debugfs.c
View file @ 5efb3e28
...@@ -2304,10 +2304,8 @@ static bool cursor_active(struct drm_device *dev, int pipe) ...@@ -2304,10 +2304,8 @@ static bool cursor_active(struct drm_device *dev, int pipe)
if (IS_845G(dev) || IS_I865G(dev)) if (IS_845G(dev) || IS_I865G(dev))
state = I915_READ(_CURACNTR) & CURSOR_ENABLE; state = I915_READ(_CURACNTR) & CURSOR_ENABLE;
else if (INTEL_INFO(dev)->gen <= 6 || IS_VALLEYVIEW(dev))
state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE;
else else
state = I915_READ(CURCNTR_IVB(pipe)) & CURSOR_MODE; state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE;
return state; return state;
} }
...@@ -2317,10 +2315,7 @@ static bool cursor_position(struct drm_device *dev, int pipe, int *x, int *y) ...@@ -2317,10 +2315,7 @@ static bool cursor_position(struct drm_device *dev, int pipe, int *x, int *y)
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
u32 pos; u32 pos;
if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev) || IS_BROADWELL(dev)) pos = I915_READ(CURPOS(pipe));
pos = I915_READ(CURPOS_IVB(pipe));
else
pos = I915_READ(CURPOS(pipe));
*x = (pos >> CURSOR_X_SHIFT) & CURSOR_POS_MASK; *x = (pos >> CURSOR_X_SHIFT) & CURSOR_POS_MASK;
if (pos & (CURSOR_POS_SIGN << CURSOR_X_SHIFT)) if (pos & (CURSOR_POS_SIGN << CURSOR_X_SHIFT))
......
drivers/gpu/drm/i915/i915_drv.c
View file @ 5efb3e28
...@@ -61,11 +61,18 @@ static struct drm_driver driver; ...@@ -61,11 +61,18 @@ static struct drm_driver driver;
.palette_offsets = { PALETTE_A_OFFSET, PALETTE_B_OFFSET, \ .palette_offsets = { PALETTE_A_OFFSET, PALETTE_B_OFFSET, \
CHV_PALETTE_C_OFFSET } CHV_PALETTE_C_OFFSET }
#define CURSOR_OFFSETS \
.cursor_offsets = { CURSOR_A_OFFSET, CURSOR_B_OFFSET, CHV_CURSOR_C_OFFSET }
#define IVB_CURSOR_OFFSETS \
.cursor_offsets = { CURSOR_A_OFFSET, IVB_CURSOR_B_OFFSET, IVB_CURSOR_C_OFFSET }
static const struct intel_device_info intel_i830_info = { static const struct intel_device_info intel_i830_info = {
.gen = 2, .is_mobile = 1, .cursor_needs_physical = 1, .num_pipes = 2, .gen = 2, .is_mobile = 1, .cursor_needs_physical = 1, .num_pipes = 2,
.has_overlay = 1, .overlay_needs_physical = 1, .has_overlay = 1, .overlay_needs_physical = 1,
.ring_mask = RENDER_RING, .ring_mask = RENDER_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_845g_info = { static const struct intel_device_info intel_845g_info = {
...@@ -73,6 +80,7 @@ static const struct intel_device_info intel_845g_info = { ...@@ -73,6 +80,7 @@ static const struct intel_device_info intel_845g_info = {
.has_overlay = 1, .overlay_needs_physical = 1, .has_overlay = 1, .overlay_needs_physical = 1,
.ring_mask = RENDER_RING, .ring_mask = RENDER_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_i85x_info = { static const struct intel_device_info intel_i85x_info = {
...@@ -82,6 +90,7 @@ static const struct intel_device_info intel_i85x_info = { ...@@ -82,6 +90,7 @@ static const struct intel_device_info intel_i85x_info = {
.has_fbc = 1, .has_fbc = 1,
.ring_mask = RENDER_RING, .ring_mask = RENDER_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_i865g_info = { static const struct intel_device_info intel_i865g_info = {
...@@ -89,6 +98,7 @@ static const struct intel_device_info intel_i865g_info = { ...@@ -89,6 +98,7 @@ static const struct intel_device_info intel_i865g_info = {
.has_overlay = 1, .overlay_needs_physical = 1, .has_overlay = 1, .overlay_needs_physical = 1,
.ring_mask = RENDER_RING, .ring_mask = RENDER_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_i915g_info = { static const struct intel_device_info intel_i915g_info = {
...@@ -96,6 +106,7 @@ static const struct intel_device_info intel_i915g_info = { ...@@ -96,6 +106,7 @@ static const struct intel_device_info intel_i915g_info = {
.has_overlay = 1, .overlay_needs_physical = 1, .has_overlay = 1, .overlay_needs_physical = 1,
.ring_mask = RENDER_RING, .ring_mask = RENDER_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_i915gm_info = { static const struct intel_device_info intel_i915gm_info = {
.gen = 3, .is_mobile = 1, .num_pipes = 2, .gen = 3, .is_mobile = 1, .num_pipes = 2,
...@@ -105,12 +116,14 @@ static const struct intel_device_info intel_i915gm_info = { ...@@ -105,12 +116,14 @@ static const struct intel_device_info intel_i915gm_info = {
.has_fbc = 1, .has_fbc = 1,
.ring_mask = RENDER_RING, .ring_mask = RENDER_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_i945g_info = { static const struct intel_device_info intel_i945g_info = {
.gen = 3, .has_hotplug = 1, .cursor_needs_physical = 1, .num_pipes = 2, .gen = 3, .has_hotplug = 1, .cursor_needs_physical = 1, .num_pipes = 2,
.has_overlay = 1, .overlay_needs_physical = 1, .has_overlay = 1, .overlay_needs_physical = 1,
.ring_mask = RENDER_RING, .ring_mask = RENDER_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_i945gm_info = { static const struct intel_device_info intel_i945gm_info = {
.gen = 3, .is_i945gm = 1, .is_mobile = 1, .num_pipes = 2, .gen = 3, .is_i945gm = 1, .is_mobile = 1, .num_pipes = 2,
...@@ -120,6 +133,7 @@ static const struct intel_device_info intel_i945gm_info = { ...@@ -120,6 +133,7 @@ static const struct intel_device_info intel_i945gm_info = {
.has_fbc = 1, .has_fbc = 1,
.ring_mask = RENDER_RING, .ring_mask = RENDER_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_i965g_info = { static const struct intel_device_info intel_i965g_info = {
...@@ -128,6 +142,7 @@ static const struct intel_device_info intel_i965g_info = { ...@@ -128,6 +142,7 @@ static const struct intel_device_info intel_i965g_info = {
.has_overlay = 1, .has_overlay = 1,
.ring_mask = RENDER_RING, .ring_mask = RENDER_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_i965gm_info = { static const struct intel_device_info intel_i965gm_info = {
...@@ -137,6 +152,7 @@ static const struct intel_device_info intel_i965gm_info = { ...@@ -137,6 +152,7 @@ static const struct intel_device_info intel_i965gm_info = {
.supports_tv = 1, .supports_tv = 1,
.ring_mask = RENDER_RING, .ring_mask = RENDER_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_g33_info = { static const struct intel_device_info intel_g33_info = {
...@@ -145,6 +161,7 @@ static const struct intel_device_info intel_g33_info = { ...@@ -145,6 +161,7 @@ static const struct intel_device_info intel_g33_info = {
.has_overlay = 1, .has_overlay = 1,
.ring_mask = RENDER_RING, .ring_mask = RENDER_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_g45_info = { static const struct intel_device_info intel_g45_info = {
...@@ -152,6 +169,7 @@ static const struct intel_device_info intel_g45_info = { ...@@ -152,6 +169,7 @@ static const struct intel_device_info intel_g45_info = {
.has_pipe_cxsr = 1, .has_hotplug = 1, .has_pipe_cxsr = 1, .has_hotplug = 1,
.ring_mask = RENDER_RING | BSD_RING, .ring_mask = RENDER_RING | BSD_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_gm45_info = { static const struct intel_device_info intel_gm45_info = {
...@@ -161,6 +179,7 @@ static const struct intel_device_info intel_gm45_info = { ...@@ -161,6 +179,7 @@ static const struct intel_device_info intel_gm45_info = {
.supports_tv = 1, .supports_tv = 1,
.ring_mask = RENDER_RING | BSD_RING, .ring_mask = RENDER_RING | BSD_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_pineview_info = { static const struct intel_device_info intel_pineview_info = {
...@@ -168,6 +187,7 @@ static const struct intel_device_info intel_pineview_info = { ...@@ -168,6 +187,7 @@ static const struct intel_device_info intel_pineview_info = {
.need_gfx_hws = 1, .has_hotplug = 1, .need_gfx_hws = 1, .has_hotplug = 1,
.has_overlay = 1, .has_overlay = 1,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_ironlake_d_info = { static const struct intel_device_info intel_ironlake_d_info = {
...@@ -175,6 +195,7 @@ static const struct intel_device_info intel_ironlake_d_info = { ...@@ -175,6 +195,7 @@ static const struct intel_device_info intel_ironlake_d_info = {
.need_gfx_hws = 1, .has_hotplug = 1, .need_gfx_hws = 1, .has_hotplug = 1,
.ring_mask = RENDER_RING | BSD_RING, .ring_mask = RENDER_RING | BSD_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_ironlake_m_info = { static const struct intel_device_info intel_ironlake_m_info = {
...@@ -183,6 +204,7 @@ static const struct intel_device_info intel_ironlake_m_info = { ...@@ -183,6 +204,7 @@ static const struct intel_device_info intel_ironlake_m_info = {
.has_fbc = 1, .has_fbc = 1,
.ring_mask = RENDER_RING | BSD_RING, .ring_mask = RENDER_RING | BSD_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_sandybridge_d_info = { static const struct intel_device_info intel_sandybridge_d_info = {
...@@ -192,6 +214,7 @@ static const struct intel_device_info intel_sandybridge_d_info = { ...@@ -192,6 +214,7 @@ static const struct intel_device_info intel_sandybridge_d_info = {
.ring_mask = RENDER_RING | BSD_RING | BLT_RING, .ring_mask = RENDER_RING | BSD_RING | BLT_RING,
.has_llc = 1, .has_llc = 1,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_sandybridge_m_info = { static const struct intel_device_info intel_sandybridge_m_info = {
...@@ -201,6 +224,7 @@ static const struct intel_device_info intel_sandybridge_m_info = { ...@@ -201,6 +224,7 @@ static const struct intel_device_info intel_sandybridge_m_info = {
.ring_mask = RENDER_RING | BSD_RING | BLT_RING, .ring_mask = RENDER_RING | BSD_RING | BLT_RING,
.has_llc = 1, .has_llc = 1,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
#define GEN7_FEATURES \ #define GEN7_FEATURES \
...@@ -214,6 +238,7 @@ static const struct intel_device_info intel_ivybridge_d_info = { ...@@ -214,6 +238,7 @@ static const struct intel_device_info intel_ivybridge_d_info = {
GEN7_FEATURES, GEN7_FEATURES,
.is_ivybridge = 1, .is_ivybridge = 1,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
IVB_CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_ivybridge_m_info = { static const struct intel_device_info intel_ivybridge_m_info = {
...@@ -221,6 +246,7 @@ static const struct intel_device_info intel_ivybridge_m_info = { ...@@ -221,6 +246,7 @@ static const struct intel_device_info intel_ivybridge_m_info = {
.is_ivybridge = 1, .is_ivybridge = 1,
.is_mobile = 1, .is_mobile = 1,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
IVB_CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_ivybridge_q_info = { static const struct intel_device_info intel_ivybridge_q_info = {
...@@ -228,6 +254,7 @@ static const struct intel_device_info intel_ivybridge_q_info = { ...@@ -228,6 +254,7 @@ static const struct intel_device_info intel_ivybridge_q_info = {
.is_ivybridge = 1, .is_ivybridge = 1,
.num_pipes = 0, /* legal, last one wins */ .num_pipes = 0, /* legal, last one wins */
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
IVB_CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_valleyview_m_info = { static const struct intel_device_info intel_valleyview_m_info = {
...@@ -239,6 +266,7 @@ static const struct intel_device_info intel_valleyview_m_info = { ...@@ -239,6 +266,7 @@ static const struct intel_device_info intel_valleyview_m_info = {
.has_fbc = 0, /* legal, last one wins */ .has_fbc = 0, /* legal, last one wins */
.has_llc = 0, /* legal, last one wins */ .has_llc = 0, /* legal, last one wins */
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_valleyview_d_info = { static const struct intel_device_info intel_valleyview_d_info = {
...@@ -249,6 +277,7 @@ static const struct intel_device_info intel_valleyview_d_info = { ...@@ -249,6 +277,7 @@ static const struct intel_device_info intel_valleyview_d_info = {
.has_fbc = 0, /* legal, last one wins */ .has_fbc = 0, /* legal, last one wins */
.has_llc = 0, /* legal, last one wins */ .has_llc = 0, /* legal, last one wins */
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_haswell_d_info = { static const struct intel_device_info intel_haswell_d_info = {
...@@ -258,6 +287,7 @@ static const struct intel_device_info intel_haswell_d_info = { ...@@ -258,6 +287,7 @@ static const struct intel_device_info intel_haswell_d_info = {
.has_fpga_dbg = 1, .has_fpga_dbg = 1,
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
IVB_CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_haswell_m_info = { static const struct intel_device_info intel_haswell_m_info = {
...@@ -268,6 +298,7 @@ static const struct intel_device_info intel_haswell_m_info = { ...@@ -268,6 +298,7 @@ static const struct intel_device_info intel_haswell_m_info = {
.has_fpga_dbg = 1, .has_fpga_dbg = 1,
.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
IVB_CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_broadwell_d_info = { static const struct intel_device_info intel_broadwell_d_info = {
...@@ -278,6 +309,7 @@ static const struct intel_device_info intel_broadwell_d_info = { ...@@ -278,6 +309,7 @@ static const struct intel_device_info intel_broadwell_d_info = {
.has_ddi = 1, .has_ddi = 1,
.has_fbc = 1, .has_fbc = 1,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
IVB_CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_broadwell_m_info = { static const struct intel_device_info intel_broadwell_m_info = {
...@@ -308,6 +340,7 @@ static const struct intel_device_info intel_broadwell_gt3m_info = { ...@@ -308,6 +340,7 @@ static const struct intel_device_info intel_broadwell_gt3m_info = {
.has_ddi = 1, .has_ddi = 1,
.has_fbc = 1, .has_fbc = 1,
GEN_DEFAULT_PIPEOFFSETS, GEN_DEFAULT_PIPEOFFSETS,
IVB_CURSOR_OFFSETS,
}; };
static const struct intel_device_info intel_cherryview_info = { static const struct intel_device_info intel_cherryview_info = {
...@@ -318,6 +351,7 @@ static const struct intel_device_info intel_cherryview_info = { ...@@ -318,6 +351,7 @@ static const struct intel_device_info intel_cherryview_info = {
.is_valleyview = 1, .is_valleyview = 1,
.display_mmio_offset = VLV_DISPLAY_BASE, .display_mmio_offset = VLV_DISPLAY_BASE,
GEN_CHV_PIPEOFFSETS, GEN_CHV_PIPEOFFSETS,
CURSOR_OFFSETS,
}; };
/* /*
......
drivers/gpu/drm/i915/i915_drv.h
View file @ 5efb3e28
...@@ -566,6 +566,7 @@ struct intel_device_info { ...@@ -566,6 +566,7 @@ struct intel_device_info {
int dpll_offsets[I915_MAX_PIPES]; int dpll_offsets[I915_MAX_PIPES];
int dpll_md_offsets[I915_MAX_PIPES]; int dpll_md_offsets[I915_MAX_PIPES];
int palette_offsets[I915_MAX_PIPES]; int palette_offsets[I915_MAX_PIPES];
int cursor_offsets[I915_MAX_PIPES];
}; };
#undef DEFINE_FLAG #undef DEFINE_FLAG
......
drivers/gpu/drm/i915/i915_reg.h
View file @ 5efb3e28
...@@ -3833,7 +3833,7 @@ enum punit_power_well { ...@@ -3833,7 +3833,7 @@ enum punit_power_well {
#define PIPE_FRMCOUNT_GM45(pipe) _PIPE2(pipe, _PIPEA_FRMCOUNT_GM45) #define PIPE_FRMCOUNT_GM45(pipe) _PIPE2(pipe, _PIPEA_FRMCOUNT_GM45)
/* Cursor A & B regs */ /* Cursor A & B regs */
#define _CURACNTR (dev_priv->info.display_mmio_offset + 0x70080) #define _CURACNTR 0x70080
/* Old style CUR*CNTR flags (desktop 8xx) */ /* Old style CUR*CNTR flags (desktop 8xx) */
#define CURSOR_ENABLE 0x80000000 #define CURSOR_ENABLE 0x80000000
#define CURSOR_GAMMA_ENABLE 0x40000000 #define CURSOR_GAMMA_ENABLE 0x40000000
...@@ -3860,28 +3860,34 @@ enum punit_power_well { ...@@ -3860,28 +3860,34 @@ enum punit_power_well {
#define MCURSOR_PIPE_B (1 << 28) #define MCURSOR_PIPE_B (1 << 28)
#define MCURSOR_GAMMA_ENABLE (1 << 26) #define MCURSOR_GAMMA_ENABLE (1 << 26)
#define CURSOR_TRICKLE_FEED_DISABLE (1 << 14) #define CURSOR_TRICKLE_FEED_DISABLE (1 << 14)
#define _CURABASE (dev_priv->info.display_mmio_offset + 0x70084) #define _CURABASE 0x70084
#define _CURAPOS (dev_priv->info.display_mmio_offset + 0x70088) #define _CURAPOS 0x70088
#define CURSOR_POS_MASK 0x007FF #define CURSOR_POS_MASK 0x007FF
#define CURSOR_POS_SIGN 0x8000 #define CURSOR_POS_SIGN 0x8000
#define CURSOR_X_SHIFT 0 #define CURSOR_X_SHIFT 0
#define CURSOR_Y_SHIFT 16 #define CURSOR_Y_SHIFT 16
#define CURSIZE 0x700a0 #define CURSIZE 0x700a0
#define _CURBCNTR (dev_priv->info.display_mmio_offset + 0x700c0) #define _CURBCNTR 0x700c0
#define _CURBBASE (dev_priv->info.display_mmio_offset + 0x700c4) #define _CURBBASE 0x700c4
#define _CURBPOS (dev_priv->info.display_mmio_offset + 0x700c8) #define _CURBPOS 0x700c8
#define _CURBCNTR_IVB 0x71080 #define _CURBCNTR_IVB 0x71080
#define _CURBBASE_IVB 0x71084 #define _CURBBASE_IVB 0x71084
#define _CURBPOS_IVB 0x71088 #define _CURBPOS_IVB 0x71088
#define CURCNTR(pipe) _PIPE(pipe, _CURACNTR, _CURBCNTR) #define _CURSOR2(pipe, reg) (dev_priv->info.cursor_offsets[(pipe)] - \
#define CURBASE(pipe) _PIPE(pipe, _CURABASE, _CURBBASE) dev_priv->info.cursor_offsets[PIPE_A] + (reg) + \
#define CURPOS(pipe) _PIPE(pipe, _CURAPOS, _CURBPOS) dev_priv->info.display_mmio_offset)
#define CURCNTR(pipe) _CURSOR2(pipe, _CURACNTR)
#define CURBASE(pipe) _CURSOR2(pipe, _CURABASE)
#define CURPOS(pipe) _CURSOR2(pipe, _CURAPOS)
#define CURCNTR_IVB(pipe) _PIPE(pipe, _CURACNTR, _CURBCNTR_IVB) #define CURSOR_A_OFFSET 0x70080
#define CURBASE_IVB(pipe) _PIPE(pipe, _CURABASE, _CURBBASE_IVB) #define CURSOR_B_OFFSET 0x700c0
#define CURPOS_IVB(pipe) _PIPE(pipe, _CURAPOS, _CURBPOS_IVB) #define CHV_CURSOR_C_OFFSET 0x700e0
#define IVB_CURSOR_B_OFFSET 0x71080
#define IVB_CURSOR_C_OFFSET 0x72080
/* Display A control */ /* Display A control */
#define _DSPACNTR 0x70180 #define _DSPACNTR 0x70180
......
drivers/gpu/drm/i915/intel_display.c
View file @ 5efb3e28
...@@ -1190,10 +1190,8 @@ static void assert_cursor(struct drm_i915_private *dev_priv, ...@@ -1190,10 +1190,8 @@ static void assert_cursor(struct drm_i915_private *dev_priv,
if (IS_845G(dev) || IS_I865G(dev)) if (IS_845G(dev) || IS_I865G(dev))
cur_state = I915_READ(_CURACNTR) & CURSOR_ENABLE; cur_state = I915_READ(_CURACNTR) & CURSOR_ENABLE;
else if (INTEL_INFO(dev)->gen <= 6 || IS_VALLEYVIEW(dev))
cur_state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE;
else else
cur_state = I915_READ(CURCNTR_IVB(pipe)) & CURSOR_MODE; cur_state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE;
WARN(cur_state != state, WARN(cur_state != state,
"cursor on pipe %c assertion failure (expected %s, current %s)\n", "cursor on pipe %c assertion failure (expected %s, current %s)\n",
...@@ -7910,7 +7908,7 @@ static void ivb_update_cursor(struct drm_crtc *crtc, u32 base) ...@@ -7910,7 +7908,7 @@ static void ivb_update_cursor(struct drm_crtc *crtc, u32 base)
if (intel_crtc->cursor_visible != visible) { if (intel_crtc->cursor_visible != visible) {
int16_t width = intel_crtc->cursor_width; int16_t width = intel_crtc->cursor_width;
uint32_t cntl = I915_READ(CURCNTR_IVB(pipe)); uint32_t cntl = I915_READ(CURCNTR(pipe));
if (base) { if (base) {
cntl &= ~CURSOR_MODE; cntl &= ~CURSOR_MODE;
cntl |= MCURSOR_GAMMA_ENABLE; cntl |= MCURSOR_GAMMA_ENABLE;
...@@ -7936,14 +7934,14 @@ static void ivb_update_cursor(struct drm_crtc *crtc, u32 base) ...@@ -7936,14 +7934,14 @@ static void ivb_update_cursor(struct drm_crtc *crtc, u32 base)
cntl |= CURSOR_PIPE_CSC_ENABLE; cntl |= CURSOR_PIPE_CSC_ENABLE;
cntl &= ~CURSOR_TRICKLE_FEED_DISABLE; cntl &= ~CURSOR_TRICKLE_FEED_DISABLE;
} }
I915_WRITE(CURCNTR_IVB(pipe), cntl); I915_WRITE(CURCNTR(pipe), cntl);
intel_crtc->cursor_visible = visible; intel_crtc->cursor_visible = visible;
} }
/* and commit changes on next vblank */ /* and commit changes on next vblank */
POSTING_READ(CURCNTR_IVB(pipe)); POSTING_READ(CURCNTR(pipe));
I915_WRITE(CURBASE_IVB(pipe), base); I915_WRITE(CURBASE(pipe), base);
POSTING_READ(CURBASE_IVB(pipe)); POSTING_READ(CURBASE(pipe));
} }
/* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */ /* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */
...@@ -7990,16 +7988,14 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc, ...@@ -7990,16 +7988,14 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc,
if (!visible && !intel_crtc->cursor_visible) if (!visible && !intel_crtc->cursor_visible)
return; return;
if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev) || IS_BROADWELL(dev)) { I915_WRITE(CURPOS(pipe), pos);
I915_WRITE(CURPOS_IVB(pipe), pos);
if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev) || IS_BROADWELL(dev))
ivb_update_cursor(crtc, base); ivb_update_cursor(crtc, base);
} else { else if (IS_845G(dev) || IS_I865G(dev))
I915_WRITE(CURPOS(pipe), pos); i845_update_cursor(crtc, base);
if (IS_845G(dev) || IS_I865G(dev)) else
i845_update_cursor(crtc, base); i9xx_update_cursor(crtc, base);
else
i9xx_update_cursor(crtc, base);
}
} }
static int intel_crtc_cursor_set(struct drm_crtc *crtc, static int intel_crtc_cursor_set(struct drm_crtc *crtc,
...@@ -12290,15 +12286,9 @@ intel_display_capture_error_state(struct drm_device *dev) ...@@ -12290,15 +12286,9 @@ intel_display_capture_error_state(struct drm_device *dev)
if (!error->pipe[i].power_domain_on) if (!error->pipe[i].power_domain_on)
continue; continue;
if (INTEL_INFO(dev)->gen <= 6 || IS_VALLEYVIEW(dev)) { error->cursor[i].control = I915_READ(CURCNTR(i));
error->cursor[i].control = I915_READ(CURCNTR(i)); error->cursor[i].position = I915_READ(CURPOS(i));
error->cursor[i].position = I915_READ(CURPOS(i)); error->cursor[i].base = I915_READ(CURBASE(i));
error->cursor[i].base = I915_READ(CURBASE(i));
} else {
error->cursor[i].control = I915_READ(CURCNTR_IVB(i));
error->cursor[i].position = I915_READ(CURPOS_IVB(i));
error->cursor[i].base = I915_READ(CURBASE_IVB(i));
}
error->plane[i].control = I915_READ(DSPCNTR(i)); error->plane[i].control = I915_READ(DSPCNTR(i));
error->plane[i].stride = I915_READ(DSPSTRIDE(i)); error->plane[i].stride = I915_READ(DSPSTRIDE(i));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7