drm/i915: Don't set cursor pipe select bits on g4x+
PATCH 1/7 drm/i915: Don't set cursor pipe select bits on g4x+
From: Ville Syrjälä <[email protected]>
G4x cursor control registers still allow us to write to the pipe select bits even though cursors are supposed to be fixed to a specific pipe. Bspec tells us that we should only ever write 0 to these bits. Let's follow that recommendation. On ilk+ the bits become hardwired to 0.
Also looks like ICL repurposes these bits for some other use, so we had better stop setting them to bogus values there.
--- drivers/gpu/drm/i915/intel_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +2 -1
@@ -9532,7 +9532,8 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state,if (HAS_DDI (dev_priv)) cntl |=CURSOR_PIPE_CSC_ENABLE ; - cntl |=MCURSOR_PIPE_SELECT (crtc->pipe); +if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv)) + cntl |=MCURSOR_PIPE_SELECT (crtc->pipe);switch (plane_state->base.crtc_w) {case 64 :
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/7 drm/i915: Set the primary plane pipe select bits on gen4
From: Ville Syrjälä <[email protected]>
i965 and g4x still have the pipe select bits in the plane control registers, they're just hardcoded to select a specific pipe. However plane C on i965 can still move between the pipes, thus we should program the pipe select bits on i965 if we want to expose plane C some day.
Since there is no harm in programming the bits on any plane on i965/g4x let's just always set them. This will also make our pre-computed register value match what the hardware register would read, should we want to cross check the two.
--- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -3163,7 +3163,7 @@ static u32 i9xx_plane_ctl(const struct intel_crtc_state *crtc_state,if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) dspcntr |=DISPPLANE_PIPE_CSC_ENABLE ; -if (INTEL_GEN (dev_priv) <4 ) +if (INTEL_GEN (dev_priv) <5 ) dspcntr |=DISPPLANE_SEL_PIPE (crtc->pipe);switch (fb->format->format) {
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/7] drm/i915: Set the primary plane pipe select bits on gen4
Quoted 8 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
i965 and g4x still have the pipe select bits in the plane control registers, they're just hardcoded to select a specific pipe. However plane C on i965 can still move between the pipes, thus we should program the pipe select bits on i965 if we want to expose plane C some day.
Quoted 5 lines
Since there is no harm in programming the bits on any plane on i965/g4x let's just always set them. This will also make our pre-computed register value match what the hardware register would read, should we want to cross check the two.
Quoted 20 lines
Signed-off-by Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/intel_display.c | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -3163,7 +3163,7 @@ static u32 i9xx_plane_ctl(const structintel_crtc_state *crtc_state, if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) dspcntr |= DISPPLANE_PIPE_CSC_ENABLE;drivers/gpu/drm/i915/intel_display.c +1
-1-if (INTEL_GEN (dev_priv) <4 ) +if (INTEL_GEN (dev_priv) <5 )dspcntr |=
DISPPLANE_SEL_PIPE(crtc->pipe);
switch (fb->format->format) {
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/7 drm/i915: Have plane->get_hw_state() return the current pipe
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Like we do for encoder let's make the plane->get_hw_state() return the pipe to which the plane is currently attached. We don't currently allow planes to move between the pipes, but perhaps one day we will.
In either case this makes the code more uniform and perhaps makes intel_plane_mapping_ok() slightly more clear.
Note that for i965 and g4x planes A and B still have pipe select bits but they're hardwired to pipe A and B respectively. This means we can safely interpret those bits just like on gen2/3. This allows the same readout code work for plane C (which can still be assigned to eiter pipe on i965) should we ever expose it.
g4x no longer allows moving the cursor planes between the pipes, but the pipe select bits can still be set in the register. Thus we have to ignore those bits. OTOH i965 still allows the cursors to move between pipes thus we have to trust the bits there.
--- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_display.c | 71 ++++++++++++++++++++++++++---------- drivers/gpu/drm/i915/intel_drv.h | 4 +- drivers/gpu/drm/i915/intel_sprite.c | 40 ++++++++++++-------- 4 files changed, 79 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -5908,6 +5908,8 @@ enum {#define CURSOR_MODE_128_ARGB_AX ((1 << 5) | CURSOR_MODE_128_32B_AX)#define CURSOR_MODE_256_ARGB_AX ((1 << 5) | CURSOR_MODE_256_32B_AX)#define CURSOR_MODE_64_ARGB_AX ((1 << 5) | CURSOR_MODE_64_32B_AX) +#define MCURSOR_PIPE_SELECT_MASK (0x3 << 28) +#define MCURSOR_PIPE_SELECT_SHIFT 28#define MCURSOR_PIPE_SELECT (pipe) ((pipe) << 28)#define MCURSOR_GAMMA_ENABLE (1 << 26)#define CURSOR_ROTATE_180 (1<<15)
drivers/gpu/drm/i915/intel_display.c +51 -20
169 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +2 -2
@@ -946,7 +946,7 @@ struct intel_plane { const struct intel_plane_state *plane_state);void (*disable_plane)(struct intel_plane *plane,struct intel_crtc *crtc); -bool (*get_hw_state)(struct intel_plane *plane); +bool (*get_hw_state)(struct intel_plane *plane,enum pipe *pipe);int (*check_plane)(struct intel_plane *plane,struct intel_crtc_state *crtc_state,struct intel_plane_state *state);
@@ -2023,7 +2023,7 @@ void skl_update_plane(struct intel_plane *plane,const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state);void skl_disable_plane (struct intel_plane *plane,struct intel_crtc *crtc); -bool skl_plane_get_hw_state (struct intel_plane *plane); +bool skl_plane_get_hw_state (struct intel_plane *plane,enum pipe *pipe);bool skl_plane_has_ccs (struct drm_i915_private *dev_priv,enum pipe pipe,enum plane_id plane_id);
drivers/gpu/drm/i915/intel_sprite.c +24 -16
@@ -326,19 +326,21 @@ skl_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc) }bool -skl_plane_get_hw_state (struct intel_plane *plane) +skl_plane_get_hw_state (struct intel_plane *plane, +enum pipe *pipe) {struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);enum intel_display_power_domain power_domain;enum plane_id plane_id = plane->id; -enum pipe pipe = plane->pipe;bool ret; - power_domain =POWER_DOMAIN_PIPE (pipe); + power_domain =POWER_DOMAIN_PIPE (plane->pipe);if (!intel_display_power_get_if_enabled (dev_priv, power_domain))return false; - ret =I915_READ (PLANE_CTL (pipe, plane_id)) &PLANE_CTL_ENABLE ; + ret =I915_READ (PLANE_CTL (plane->pipe, plane_id)) &PLANE_CTL_ENABLE ; + + *pipe = plane->pipe;intel_display_power_put (dev_priv, power_domain);
@@ -523,19 +525,21 @@ vlv_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc) }static bool -vlv_plane_get_hw_state (struct intel_plane *plane) +vlv_plane_get_hw_state (struct intel_plane *plane, +enum pipe *pipe) {struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);enum intel_display_power_domain power_domain;enum plane_id plane_id = plane->id; -enum pipe pipe = plane->pipe;bool ret; - power_domain =POWER_DOMAIN_PIPE (pipe); + power_domain =POWER_DOMAIN_PIPE (plane->pipe);if (!intel_display_power_get_if_enabled (dev_priv, power_domain))return false; - ret =I915_READ (SPCNTR (pipe, plane_id)) &SP_ENABLE ; + ret =I915_READ (SPCNTR (plane->pipe, plane_id)) &SP_ENABLE ; + + *pipe = plane->pipe;intel_display_power_put (dev_priv, power_domain);
@@ -683,18 +687,20 @@ ivb_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc) }static bool -ivb_plane_get_hw_state (struct intel_plane *plane) +ivb_plane_get_hw_state (struct intel_plane *plane, +enum pipe *pipe) {struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);enum intel_display_power_domain power_domain; -enum pipe pipe = plane->pipe;bool ret; - power_domain =POWER_DOMAIN_PIPE (pipe); + power_domain =POWER_DOMAIN_PIPE (plane->pipe);if (!intel_display_power_get_if_enabled (dev_priv, power_domain))return false; - ret =I915_READ (SPRCTL (pipe)) &SPRITE_ENABLE ; + ret =I915_READ (SPRCTL (plane->pipe)) &SPRITE_ENABLE ; + + *pipe = plane->pipe;intel_display_power_put (dev_priv, power_domain);
@@ -833,18 +839,20 @@ g4x_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc) }static bool -g4x_plane_get_hw_state (struct intel_plane *plane) +g4x_plane_get_hw_state (struct intel_plane *plane, +enum pipe *pipe) {struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);enum intel_display_power_domain power_domain; -enum pipe pipe = plane->pipe;bool ret; - power_domain =POWER_DOMAIN_PIPE (pipe); + power_domain =POWER_DOMAIN_PIPE (plane->pipe);if (!intel_display_power_get_if_enabled (dev_priv, power_domain))return false; - ret =I915_READ (DVSCNTR (pipe)) &DVS_ENABLE ; + ret =I915_READ (DVSCNTR (plane->pipe)) &DVS_ENABLE ; + + *pipe = plane->pipe;intel_display_power_put (dev_priv, power_domain);
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/7] drm/i915: Have plane->get_hw_state() return the current pipe
Quoted 15 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Like we do for encoder let's make the
plane->get_hw_state()return the pipe to which the plane is currently attached. We don't currently allow planes to move between the pipes, but perhaps one day we will.In either case this makes the code more uniform and perhaps makes
intel_plane_mapping_ok()slightly more clear.Note that for i965 and g4x planes A and B still have pipe select bits but they're hardwired to pipe A and B respectively. This means we can safely interpret those bits just like on gen2/3. This allows the same readout code work for plane C (which can still be assigned to eiter pipe on i965) should we ever expose it.
Quoted 5 lines
g4x no longer allows moving the cursor planes between the pipes, but the pipe select bits can still be set in the register. Thus we have to ignore those bits. OTOH i965 still allows the cursors to move between pipes thus we have to trust the bits there.
Quoted 376 lines
Signed-off-by Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/i915_reg.h | 2 +drivers/gpu/drm/i915/intel_display.c| 71
++++++++++++++++++++++++++----------
drivers/gpu/drm/i915/intel_drv.h | 4 +- drivers/gpu/drm/i915/intel_sprite.c | 40 ++++++++++++--------4 files changed, 79 insertions(+), 38 deletions(-)drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -5908,6 +5908,8 @@ enum { #define CURSOR_MODE_128_ARGB_AX ((1 << 5) | CURSOR_MODE_128_32B_AX) #define CURSOR_MODE_256_ARGB_AX ((1 << 5) | CURSOR_MODE_256_32B_AX) #define CURSOR_MODE_64_ARGB_AX ((1 << 5) | CURSOR_MODE_64_32B_AX) +#define MCURSOR_PIPE_SELECT_MASK (0x3 << 28) +#define MCURSOR_PIPE_SELECT_SHIFT 28 #define MCURSOR_PIPE_SELECT(pipe) ((pipe) << 28)#define MCURSOR_GAMMA_ENABLE (1 << 26)
#define CURSOR_ROTATE_180 (1<<15)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -1224,7 +1224,10 @@ void assert_pipe(struct drm_i915_private *dev_priv,
static voidassert_plane(struct intel_plane *plane, bool state){drivers/gpu/drm/i915/intel_display.c +4
-1-bool cur_state = plane->get_hw_state (plane); +enum pipe pipe; +bool cur_state; + + cur_state = plane->get_hw_state (plane, &pipe);
I915_STATE_WARN(cur_state != state,
"%s assertion failure (expected %s, current %s)\n",drivers/gpu/drm/i915/intel_display.c +0
-0@@ -3326,24 +3329,33 @@ static void i9xx_disable_plane(structintel_plane *plane, spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); }drivers/gpu/drm/i915/intel_display.c +2
-1-static bool i9xx_plane_get_hw_state (struct intel_plane *plane) +static bool i9xx_plane_get_hw_state (struct intel_plane *plane, + enum pipe *pipe){
structdrm_i915_private*dev_priv= to_i915(plane-Quoted 1 line
base.dev);
enum
intel_display_power_domainpower_domain; enumi9xx_plane_idi9xx_plane=plane->i9xx_plane;drivers/gpu/drm/i915/intel_display.c +0
-1-enum pipe pipe = plane->pipe;bool ret;
drivers/gpu/drm/i915/intel_display.c +1
-0+u32 val;
/*
* Not 100% correct for planes that can move between pipes,
* but that's only the case for gen2-4 which don't have any
* display power wells.
*/drivers/gpu/drm/i915/intel_display.c +1
-1- power_domain =POWER_DOMAIN_PIPE (pipe); + power_domain =POWER_DOMAIN_PIPE (plane->pipe);if (!intel_display_power_get_if_enabled(dev_priv,
power_domain))
return false;drivers/gpu/drm/i915/intel_display.c +9
-1- ret =I915_READ (DSPCNTR (i9xx_plane)) &DISPLAY_PLANE_ENABLE ; + val =I915_READ (DSPCNTR (i9xx_plane)); + + ret = val &DISPLAY_PLANE_ENABLE ; + +if (INTEL_GEN (dev_priv) >=5 ) + *pipe = plane->pipe; +else + *pipe = (val &DISPPLANE_SEL_PIPE_MASK ) >> +DISPPLANE_SEL_PIPE_SHIFT ;
intel_display_power_put(dev_priv, power_domain);drivers/gpu/drm/i915/intel_display.c +0
-0@@ -7482,16 +7494,18 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc, struct drm_i915_private *dev_priv = to_i915(dev);struct
intel_plane*plane = to_intel_plane(crtc-Quoted 1 line
base.primary);
enum
i9xx_plane_idi9xx_plane=plane->i9xx_plane;drivers/gpu/drm/i915/intel_display.c +1
-1-enum pipe pipe = crtc->pipe; +enum pipe pipe;u32 val, base, offset;
int fourcc,pixel_format;
unsigned intaligned_height;
structdrm_framebuffer*fb;
structintel_framebuffer*intel_fb;drivers/gpu/drm/i915/intel_display.c +1
-1-if (!plane->get_hw_state (plane)) +if (!plane->get_hw_state (plane, &pipe))return;
drivers/gpu/drm/i915/intel_display.c +2
-0+WARN_ON (pipe != crtc->pipe); +
intel_fb=kzalloc(sizeof(*intel_fb), GFP_KERNEL); if (!intel_fb) {
DRM_DEBUG_KMS("failed to alloc fb\n");drivers/gpu/drm/i915/intel_display.c +0
-0@@ -8512,16 +8526,18 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc, struct drm_i915_private *dev_priv = to_i915(dev);struct
intel_plane*plane = to_intel_plane(crtc-Quoted 1 line
base.primary);
enum
plane_idplane_id=plane->id;drivers/gpu/drm/i915/intel_display.c +1
-1-enum pipe pipe = crtc->pipe; +enum pipe pipe;u32 val, base, offset,
stride_mult, tiling, alpha; int fourcc,pixel_format;
unsigned intaligned_height;
structdrm_framebuffer*fb;
structintel_framebuffer*intel_fb;drivers/gpu/drm/i915/intel_display.c +1
-1-if (!plane->get_hw_state (plane)) +if (!plane->get_hw_state (plane, &pipe))return;
drivers/gpu/drm/i915/intel_display.c +2
-0+WARN_ON (pipe != crtc->pipe); +
intel_fb=kzalloc(sizeof(*intel_fb), GFP_KERNEL); if (!intel_fb) {
DRM_DEBUG_KMS("failed to alloc fb\n");drivers/gpu/drm/i915/intel_display.c +0
-0@@ -9502,7 +9518,8 @@ static void i845_disable_cursor(structintel_plane *plane, i845_update_cursor(plane, NULL, NULL); }drivers/gpu/drm/i915/intel_display.c +2
-1-static bool i845_cursor_get_hw_state (struct intel_plane *plane) +static bool i845_cursor_get_hw_state (struct intel_plane *plane, + enum pipe *pipe){
structdrm_i915_private*dev_priv= to_i915(plane-Quoted 1 line
base.dev);
enum
intel_display_power_domainpower_domain;drivers/gpu/drm/i915/intel_display.c +0
-0@@ -9514,6 +9531,8 @@ static bool i845_cursor_get_hw_state(struct intel_plane *plane)
ret = I915_READ(CURCNTR(PIPE_A)) &CURSOR_ENABLE;drivers/gpu/drm/i915/intel_display.c +2
-0+ *pipe =PIPE_A ; +
intel_display_power_put(dev_priv, power_domain);
return ret;drivers/gpu/drm/i915/intel_display.c +0
-0@@ -9713,23 +9732,32 @@ static void i9xx_disable_cursor(structintel_plane *plane, i9xx_update_cursor(plane, NULL, NULL); }drivers/gpu/drm/i915/intel_display.c +2
-1-static bool i9xx_cursor_get_hw_state (struct intel_plane *plane) +static bool i9xx_cursor_get_hw_state (struct intel_plane *plane, + enum pipe *pipe){
structdrm_i915_private*dev_priv= to_i915(plane-Quoted 1 line
base.dev);
enum
intel_display_power_domainpower_domain;drivers/gpu/drm/i915/intel_display.c +0
-1-enum pipe pipe = plane->pipe;bool ret;
drivers/gpu/drm/i915/intel_display.c +1
-0+u32 val;
/*
* Not 100% correct for planes that can move between pipes,
* but that's only the case for gen2-3 which don't have any
* display power wells.
*/drivers/gpu/drm/i915/intel_display.c +1
-1- power_domain =POWER_DOMAIN_PIPE (pipe); + power_domain =POWER_DOMAIN_PIPE (plane->pipe);if (!intel_display_power_get_if_enabled(dev_priv,
power_domain))
return false;drivers/gpu/drm/i915/intel_display.c +9
-1- ret =I915_READ (CURCNTR (pipe)) &CURSOR_MODE ; + val =I915_READ (CURCNTR (plane->pipe)); + + ret = val &CURSOR_MODE ; + +if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) + *pipe = plane->pipe; +else + *pipe = (val &MCURSOR_PIPE_SELECT_MASK ) >> +MCURSOR_PIPE_SELECT_SHIFT ;
intel_display_power_put(dev_priv, power_domain);drivers/gpu/drm/i915/intel_display.c +1
-3@@ -14755,12 +14783,12 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) static bool intel_plane_mapping_ok(struct intel_crtc *crtc, struct intel_plane *plane) { - struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); -enum i9xx_plane_id i9xx_plane = plane->i9xx_plane; -u32 val =I915_READ (DSPCNTR (i9xx_plane)); + enum pipe pipe;drivers/gpu/drm/i915/intel_display.c +0
-2-return (val &DISPLAY_PLANE_ENABLE ) ==0 || - (val & DISPPLANE_SEL_PIPE_MASK) ==
DISPPLANE_SEL_PIPE(crtc->pipe);drivers/gpu/drm/i915/intel_display.c +4
-0+if (!plane->get_hw_state (plane, &pipe)) +return true; + +return pipe == crtc->pipe;}
static voiddrivers/gpu/drm/i915/intel_display.c +0
-0@@ -14959,7 +14987,10 @@ static void readout_plane_state(struct intel_crtc *crtc) for_each_intel_plane_on_crtc(&dev_priv->drm, crtc, plane) {struct
intel_plane_state*plane_state=to_intel_plane_state(plane->base.state);drivers/gpu/drm/i915/intel_display.c +4
-1-bool visible = plane->get_hw_state (plane); +enum pipe pipe; +bool visible; + + visible = plane->get_hw_state (plane, &pipe);
intel_set_plane_visible(crtc_state, plane_state, visible);
}drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -946,7 +946,7 @@ struct intel_plane {const struct
intel_plane_state*plane_state);
void (*disable_plane)(structintel_plane*plane, structintel_crtc*crtc);drivers/gpu/drm/i915/intel_drv.h +1
-1-bool (*get_hw_state)(struct intel_plane *plane); + bool (*get_hw_state)(struct intel_plane *plane, enum pipe*pipe);
int (*check_plane)(structintel_plane*plane, structintel_crtc_state*crtc_state, structintel_plane_state*state);drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -2023,7 +2023,7 @@ void skl_update_plane(struct intel_plane *plane, const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state);void
skl_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc);drivers/gpu/drm/i915/intel_drv.h +1
-1-bool skl_plane_get_hw_state (struct intel_plane *plane); +bool skl_plane_get_hw_state(struct intel_plane *plane, enum pipe*pipe);
boolskl_plane_has_ccs(struct drm_i915_private *dev_priv, enum pipe pipe, enum plane_id plane_id);drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -326,19 +326,21 @@ skl_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc) }
booldrivers/gpu/drm/i915/intel_sprite.c +2
-1-skl_plane_get_hw_state(struct intel_plane *plane) +skl_plane_get_hw_state(struct intel_plane *plane, + enum pipe *pipe){
structdrm_i915_private*dev_priv= to_i915(plane-Quoted 1 line
base.dev);
enum
intel_display_power_domainpower_domain; enumplane_idplane_id=plane->id;drivers/gpu/drm/i915/intel_sprite.c +0
-1-enum pipe pipe = plane->pipe;bool ret;
drivers/gpu/drm/i915/intel_sprite.c +1
-1- power_domain =POWER_DOMAIN_PIPE (pipe); + power_domain =POWER_DOMAIN_PIPE (plane->pipe);if (!intel_display_power_get_if_enabled(dev_priv,
power_domain))
return false;drivers/gpu/drm/i915/intel_sprite.c +0
-1- ret = I915_READ(PLANE_CTL(pipe, plane_id)) &
PLANE_CTL_ENABLE;drivers/gpu/drm/i915/intel_sprite.c +1
-0+ ret = I915_READ(PLANE_CTL(plane->pipe, plane_id)) &
PLANE_CTL_ENABLE;drivers/gpu/drm/i915/intel_sprite.c +2
-0+ + *pipe = plane->pipe;
intel_display_power_put(dev_priv, power_domain);drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -523,19 +525,21 @@ vlv_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc) }
static booldrivers/gpu/drm/i915/intel_sprite.c +2
-1-vlv_plane_get_hw_state(struct intel_plane *plane) +vlv_plane_get_hw_state(struct intel_plane *plane, + enum pipe *pipe){
structdrm_i915_private*dev_priv= to_i915(plane-Quoted 1 line
base.dev);
enum
intel_display_power_domainpower_domain; enumplane_idplane_id=plane->id;drivers/gpu/drm/i915/intel_sprite.c +0
-1-enum pipe pipe = plane->pipe;bool ret;
drivers/gpu/drm/i915/intel_sprite.c +1
-1- power_domain =POWER_DOMAIN_PIPE (pipe); + power_domain =POWER_DOMAIN_PIPE (plane->pipe);if (!intel_display_power_get_if_enabled(dev_priv,
power_domain))
return false;drivers/gpu/drm/i915/intel_sprite.c +3
-1- ret =I915_READ (SPCNTR (pipe, plane_id)) &SP_ENABLE ; + ret =I915_READ (SPCNTR (plane->pipe, plane_id)) &SP_ENABLE ; + + *pipe = plane->pipe;
intel_display_power_put(dev_priv, power_domain);drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -683,18 +687,20 @@ ivb_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc) }
static booldrivers/gpu/drm/i915/intel_sprite.c +2
-1-ivb_plane_get_hw_state(struct intel_plane *plane) +ivb_plane_get_hw_state(struct intel_plane *plane, + enum pipe *pipe){
structdrm_i915_private*dev_priv= to_i915(plane-Quoted 1 line
base.dev);
enum
intel_display_power_domainpower_domain;drivers/gpu/drm/i915/intel_sprite.c +0
-1-enum pipe pipe = plane->pipe;bool ret;
drivers/gpu/drm/i915/intel_sprite.c +1
-1- power_domain =POWER_DOMAIN_PIPE (pipe); + power_domain =POWER_DOMAIN_PIPE (plane->pipe);if (!intel_display_power_get_if_enabled(dev_priv,
power_domain))
return false;drivers/gpu/drm/i915/intel_sprite.c +3
-1- ret = I915_READ(SPRCTL(pipe)) & SPRITE_ENABLE; + ret = I915_READ(SPRCTL(plane->pipe)) & SPRITE_ENABLE; + + *pipe = plane->pipe;
intel_display_power_put(dev_priv, power_domain);drivers/gpu/drm/i915/intel_sprite.c +0
-0@@ -833,18 +839,20 @@ g4x_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc) }
static booldrivers/gpu/drm/i915/intel_sprite.c +2
-1-g4x_plane_get_hw_state(struct intel_plane *plane) +g4x_plane_get_hw_state(struct intel_plane *plane, + enum pipe *pipe){
structdrm_i915_private*dev_priv= to_i915(plane-Quoted 1 line
base.dev);
enum
intel_display_power_domainpower_domain;drivers/gpu/drm/i915/intel_sprite.c +0
-1-enum pipe pipe = plane->pipe;bool ret;
drivers/gpu/drm/i915/intel_sprite.c +1
-1- power_domain =POWER_DOMAIN_PIPE (pipe); + power_domain =POWER_DOMAIN_PIPE (plane->pipe);if (!intel_display_power_get_if_enabled(dev_priv,
power_domain))
return false;drivers/gpu/drm/i915/intel_sprite.c +3
-1- ret =I915_READ (DVSCNTR (pipe)) &DVS_ENABLE ; + ret =I915_READ (DVSCNTR (plane->pipe)) &DVS_ENABLE ; + + *pipe = plane->pipe;
intel_display_power_put(dev_priv, power_domain);
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/7 drm/i915: Clean up cursor defines
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Use MCURSOR_ instead of CURSOR_ as the prefix for the non-845/865 cursor defines consistently, and move the pipe CSC enable bit next to the other non-845/865 cursor defines.
--- drivers/gpu/drm/i915/i915_reg.h | 22 +++++++++++----------- drivers/gpu/drm/i915/intel_display.c | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +11 -11
@@ -5891,7 +5891,6 @@ enum {#define CURSOR_GAMMA_ENABLE 0x40000000#define CURSOR_STRIDE_SHIFT 28#define CURSOR_STRIDE (x) ((ffs(x)-9) << CURSOR_STRIDE_SHIFT)/* 256,512,1k,2k */ -#define CURSOR_PIPE_CSC_ENABLE (1<<24)#define CURSOR_FORMAT_SHIFT 24#define CURSOR_FORMAT_MASK (0x07 << CURSOR_FORMAT_SHIFT)#define CURSOR_FORMAT_2C (0x00 << CURSOR_FORMAT_SHIFT)
@@ -5900,20 +5899,21 @@ enum {#define CURSOR_FORMAT_ARGB (0x04 << CURSOR_FORMAT_SHIFT)#define CURSOR_FORMAT_XRGB (0x05 << CURSOR_FORMAT_SHIFT)/* New style CUR*CNTR flags */ -#define CURSOR_MODE 0x27 -#define CURSOR_MODE_DISABLE 0x00 -#define CURSOR_MODE_128_32B_AX 0x02 -#define CURSOR_MODE_256_32B_AX 0x03 -#define CURSOR_MODE_64_32B_AX 0x07 -#define CURSOR_MODE_128_ARGB_AX ((1 << 5) | CURSOR_MODE_128_32B_AX) -#define CURSOR_MODE_256_ARGB_AX ((1 << 5) | CURSOR_MODE_256_32B_AX) -#define CURSOR_MODE_64_ARGB_AX ((1 << 5) | CURSOR_MODE_64_32B_AX) +#define MCURSOR_MODE 0x27 +#define MCURSOR_MODE_DISABLE 0x00 +#define MCURSOR_MODE_128_32B_AX 0x02 +#define MCURSOR_MODE_256_32B_AX 0x03 +#define MCURSOR_MODE_64_32B_AX 0x07 +#define MCURSOR_MODE_128_ARGB_AX ((1 << 5) | MCURSOR_MODE_128_32B_AX) +#define MCURSOR_MODE_256_ARGB_AX ((1 << 5) | MCURSOR_MODE_256_32B_AX) +#define MCURSOR_MODE_64_ARGB_AX ((1 << 5) | MCURSOR_MODE_64_32B_AX)#define MCURSOR_PIPE_SELECT_MASK (0x3 << 28)#define MCURSOR_PIPE_SELECT_SHIFT 28#define MCURSOR_PIPE_SELECT (pipe) ((pipe) << 28)#define MCURSOR_GAMMA_ENABLE (1 << 26) -#define CURSOR_ROTATE_180 (1<<15) -#define CURSOR_TRICKLE_FEED_DISABLE (1 << 14) +#define MCURSOR_PIPE_CSC_ENABLE (1<<24) +#define MCURSOR_ROTATE_180 (1<<15) +#define MCURSOR_TRICKLE_FEED_DISABLE (1 << 14)#define _CURABASE 0x70084#define _CURAPOS 0x70088#define CURSOR_POS_MASK 0x007FF
drivers/gpu/drm/i915/intel_display.c +8 -8
@@ -9549,20 +9549,20 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state, cntl =MCURSOR_GAMMA_ENABLE ;if (HAS_DDI (dev_priv)) - cntl |=CURSOR_PIPE_CSC_ENABLE ; + cntl |=MCURSOR_PIPE_CSC_ENABLE ;if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv)) cntl |=MCURSOR_PIPE_SELECT (crtc->pipe);switch (plane_state->base.crtc_w) {case 64 : - cntl |=CURSOR_MODE_64_ARGB_AX ; + cntl |=MCURSOR_MODE_64_ARGB_AX ;break ;case 128 : - cntl |=CURSOR_MODE_128_ARGB_AX ; + cntl |=MCURSOR_MODE_128_ARGB_AX ;break ;case 256 : - cntl |=CURSOR_MODE_256_ARGB_AX ; + cntl |=MCURSOR_MODE_256_ARGB_AX ;break ;default :MISSING_CASE (plane_state->base.crtc_w);
@@ -9570,7 +9570,7 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state, }if (plane_state->base.rotation &DRM_MODE_ROTATE_180 ) - cntl |=CURSOR_ROTATE_180 ; + cntl |=MCURSOR_ROTATE_180 ;return cntl; }
@@ -9751,7 +9751,7 @@ static bool i9xx_cursor_get_hw_state(struct intel_plane *plane, val =I915_READ (CURCNTR (plane->pipe)); - ret = val &CURSOR_MODE ; + ret = val &MCURSOR_MODE ;if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) *pipe = plane->pipe;
@@ -14768,8 +14768,8 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)WARN_ON (I915_READ (DSPCNTR (PLANE_A )) &DISPLAY_PLANE_ENABLE );WARN_ON (I915_READ (DSPCNTR (PLANE_B )) &DISPLAY_PLANE_ENABLE );WARN_ON (I915_READ (DSPCNTR (PLANE_C )) &DISPLAY_PLANE_ENABLE ); -WARN_ON (I915_READ (CURCNTR (PIPE_A )) &CURSOR_MODE ); -WARN_ON (I915_READ (CURCNTR (PIPE_B )) &CURSOR_MODE ); +WARN_ON (I915_READ (CURCNTR (PIPE_A )) &MCURSOR_MODE ); +WARN_ON (I915_READ (CURCNTR (PIPE_B )) &MCURSOR_MODE );I915_WRITE (PIPECONF (pipe),0 );POSTING_READ (PIPECONF (pipe));
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/7 drm/i915: Clean up cursor defines
From: Ville Syrjälä <[email protected]>
Use MCURSOR_ instead of CURSOR_ as the prefix for the non-845/865 cursor defines consistently, and move the pipe CSC enable bit next to the other non-845/865 cursor defines.
v2: Take care of gvt uses as well
--- drivers/gpu/drm/i915/gvt/fb_decoder.c | 12 ++++++------ drivers/gpu/drm/i915/i915_reg.h | 22 +++++++++++----------- drivers/gpu/drm/i915/intel_display.c | 16 ++++++++-------- 3 files changed, 25 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/gvt/fb_decoder.c +6 -6
@@ -303,16 +303,16 @@ static int cursor_mode_to_drm(int mode)int cursor_pixel_formats_index =4 ;switch (mode) { -case CURSOR_MODE_128_ARGB_AX : +case MCURSOR_MODE_128_ARGB_AX : cursor_pixel_formats_index =0 ;break ; -case CURSOR_MODE_256_ARGB_AX : +case MCURSOR_MODE_256_ARGB_AX : cursor_pixel_formats_index =1 ;break ; -case CURSOR_MODE_64_ARGB_AX : +case MCURSOR_MODE_64_ARGB_AX : cursor_pixel_formats_index =2 ;break ; -case CURSOR_MODE_64_32B_AX : +case MCURSOR_MODE_64_32B_AX : cursor_pixel_formats_index =3 ;break ;
@@ -345,8 +345,8 @@ int intel_vgpu_decode_cursor_plane(struct intel_vgpu *vgpu,return -ENODEV ; val =vgpu_vreg_t (vgpu,CURCNTR (pipe)); - mode = val &CURSOR_MODE ; - plane->enabled = (mode !=CURSOR_MODE_DISABLE ); + mode = val &MCURSOR_MODE ; + plane->enabled = (mode !=MCURSOR_MODE_DISABLE );if (!plane->enabled)return -ENODEV ;
drivers/gpu/drm/i915/i915_reg.h +11 -11
@@ -5891,7 +5891,6 @@ enum {#define CURSOR_GAMMA_ENABLE 0x40000000#define CURSOR_STRIDE_SHIFT 28#define CURSOR_STRIDE (x) ((ffs(x)-9) << CURSOR_STRIDE_SHIFT)/* 256,512,1k,2k */ -#define CURSOR_PIPE_CSC_ENABLE (1<<24)#define CURSOR_FORMAT_SHIFT 24#define CURSOR_FORMAT_MASK (0x07 << CURSOR_FORMAT_SHIFT)#define CURSOR_FORMAT_2C (0x00 << CURSOR_FORMAT_SHIFT)
@@ -5900,20 +5899,21 @@ enum {#define CURSOR_FORMAT_ARGB (0x04 << CURSOR_FORMAT_SHIFT)#define CURSOR_FORMAT_XRGB (0x05 << CURSOR_FORMAT_SHIFT)/* New style CUR*CNTR flags */ -#define CURSOR_MODE 0x27 -#define CURSOR_MODE_DISABLE 0x00 -#define CURSOR_MODE_128_32B_AX 0x02 -#define CURSOR_MODE_256_32B_AX 0x03 -#define CURSOR_MODE_64_32B_AX 0x07 -#define CURSOR_MODE_128_ARGB_AX ((1 << 5) | CURSOR_MODE_128_32B_AX) -#define CURSOR_MODE_256_ARGB_AX ((1 << 5) | CURSOR_MODE_256_32B_AX) -#define CURSOR_MODE_64_ARGB_AX ((1 << 5) | CURSOR_MODE_64_32B_AX) +#define MCURSOR_MODE 0x27 +#define MCURSOR_MODE_DISABLE 0x00 +#define MCURSOR_MODE_128_32B_AX 0x02 +#define MCURSOR_MODE_256_32B_AX 0x03 +#define MCURSOR_MODE_64_32B_AX 0x07 +#define MCURSOR_MODE_128_ARGB_AX ((1 << 5) | MCURSOR_MODE_128_32B_AX) +#define MCURSOR_MODE_256_ARGB_AX ((1 << 5) | MCURSOR_MODE_256_32B_AX) +#define MCURSOR_MODE_64_ARGB_AX ((1 << 5) | MCURSOR_MODE_64_32B_AX)#define MCURSOR_PIPE_SELECT_MASK (0x3 << 28)#define MCURSOR_PIPE_SELECT_SHIFT 28#define MCURSOR_PIPE_SELECT (pipe) ((pipe) << 28)#define MCURSOR_GAMMA_ENABLE (1 << 26) -#define CURSOR_ROTATE_180 (1<<15) -#define CURSOR_TRICKLE_FEED_DISABLE (1 << 14) +#define MCURSOR_PIPE_CSC_ENABLE (1<<24) +#define MCURSOR_ROTATE_180 (1<<15) +#define MCURSOR_TRICKLE_FEED_DISABLE (1 << 14)#define _CURABASE 0x70084#define _CURAPOS 0x70088#define CURSOR_POS_MASK 0x007FF
drivers/gpu/drm/i915/intel_display.c +8 -8
@@ -9549,20 +9549,20 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state, cntl =MCURSOR_GAMMA_ENABLE ;if (HAS_DDI (dev_priv)) - cntl |=CURSOR_PIPE_CSC_ENABLE ; + cntl |=MCURSOR_PIPE_CSC_ENABLE ;if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv)) cntl |=MCURSOR_PIPE_SELECT (crtc->pipe);switch (plane_state->base.crtc_w) {case 64 : - cntl |=CURSOR_MODE_64_ARGB_AX ; + cntl |=MCURSOR_MODE_64_ARGB_AX ;break ;case 128 : - cntl |=CURSOR_MODE_128_ARGB_AX ; + cntl |=MCURSOR_MODE_128_ARGB_AX ;break ;case 256 : - cntl |=CURSOR_MODE_256_ARGB_AX ; + cntl |=MCURSOR_MODE_256_ARGB_AX ;break ;default :MISSING_CASE (plane_state->base.crtc_w);
@@ -9570,7 +9570,7 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state, }if (plane_state->base.rotation &DRM_MODE_ROTATE_180 ) - cntl |=CURSOR_ROTATE_180 ; + cntl |=MCURSOR_ROTATE_180 ;return cntl; }
@@ -9751,7 +9751,7 @@ static bool i9xx_cursor_get_hw_state(struct intel_plane *plane, val =I915_READ (CURCNTR (plane->pipe)); - ret = val &CURSOR_MODE ; + ret = val &MCURSOR_MODE ;if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) *pipe = plane->pipe;
@@ -14768,8 +14768,8 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)WARN_ON (I915_READ (DSPCNTR (PLANE_A )) &DISPLAY_PLANE_ENABLE );WARN_ON (I915_READ (DSPCNTR (PLANE_B )) &DISPLAY_PLANE_ENABLE );WARN_ON (I915_READ (DSPCNTR (PLANE_C )) &DISPLAY_PLANE_ENABLE ); -WARN_ON (I915_READ (CURCNTR (PIPE_A )) &CURSOR_MODE ); -WARN_ON (I915_READ (CURCNTR (PIPE_B )) &CURSOR_MODE ); +WARN_ON (I915_READ (CURCNTR (PIPE_A )) &MCURSOR_MODE ); +WARN_ON (I915_READ (CURCNTR (PIPE_B )) &MCURSOR_MODE );I915_WRITE (PIPECONF (pipe),0 );POSTING_READ (PIPECONF (pipe));
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 4/7] drm/i915: Clean up cursor defines
Quoted 8 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Use
MCURSOR_instead ofCURSOR_as the prefix for the non-845/865 cursor defines consistently, and move the pipe CSC enable bit next to the other non-845/865 cursor defines.v2: Take care of gvt uses as well
Quoted 159 lines
Signed-off-by Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/gvt/fb_decoder.c | 12 ++++++------ drivers/gpu/drm/i915/i915_reg.h | 22 +++++++++++----------- drivers/gpu/drm/i915/intel_display.c | 16 ++++++++--------3 files changed, 25 insertions(+), 25 deletions(-)drivers/gpu/drm/i915/gvt/fb_decoder.c +0
-0@@ -303,16 +303,16 @@ static int cursor_mode_to_drm(int mode) int cursor_pixel_formats_index = 4;
switch (mode) {drivers/gpu/drm/i915/gvt/fb_decoder.c +1
-1-case CURSOR_MODE_128_ARGB_AX : +case MCURSOR_MODE_128_ARGB_AX :
cursor_pixel_formats_index= 0;
break;drivers/gpu/drm/i915/gvt/fb_decoder.c +1
-1-case CURSOR_MODE_256_ARGB_AX : +case MCURSOR_MODE_256_ARGB_AX :
cursor_pixel_formats_index= 1;
break;drivers/gpu/drm/i915/gvt/fb_decoder.c +1
-1-case CURSOR_MODE_64_ARGB_AX : +case MCURSOR_MODE_64_ARGB_AX :
cursor_pixel_formats_index= 2;
break;drivers/gpu/drm/i915/gvt/fb_decoder.c +1
-1-case CURSOR_MODE_64_32B_AX : +case MCURSOR_MODE_64_32B_AX :
cursor_pixel_formats_index= 3;
break;drivers/gpu/drm/i915/gvt/fb_decoder.c +0
-0@@ -345,8 +345,8 @@ int intel_vgpu_decode_cursor_plane(structintel_vgpu *vgpu, return -ENODEV;
val =vgpu_vreg_t(vgpu, CURCNTR(pipe));drivers/gpu/drm/i915/gvt/fb_decoder.c +2
-2- mode = val &CURSOR_MODE ; - plane->enabled = (mode !=CURSOR_MODE_DISABLE ); + mode = val &MCURSOR_MODE ; + plane->enabled = (mode !=MCURSOR_MODE_DISABLE );if (!plane->enabled)
return-ENODEV;drivers/gpu/drm/i915/i915_reg.h +0
-0@@ -5891,7 +5891,6 @@ enum { #define CURSOR_GAMMA_ENABLE 0x40000000 #define CURSOR_STRIDE_SHIFT 28 #define CURSOR_STRIDE(x) ((ffs(x)-9) <<
CURSOR_STRIDE_SHIFT) /* 256,512,1k,2k */
-#define CURSOR_PIPE_CSC_ENABLE (1<<24)
#define CURSOR_FORMAT_SHIFT 24
#define CURSOR_FORMAT_MASK (0x07<<CURSOR_FORMAT_SHIFT)
#define CURSOR_FORMAT_2C (0x00<<CURSOR_FORMAT_SHIFT)drivers/gpu/drm/i915/i915_reg.h +11
-10@@ -5900,20 +5899,21 @@ enum { #define CURSOR_FORMAT_ARGB (0x04 << CURSOR_FORMAT_SHIFT) #define CURSOR_FORMAT_XRGB (0x05 << CURSOR_FORMAT_SHIFT) /* New style CUR*CNTR flags */ -#define CURSOR_MODE 0x27 -#define CURSOR_MODE_DISABLE 0x00 -#define CURSOR_MODE_128_32B_AX 0x02 -#define CURSOR_MODE_256_32B_AX 0x03 -#define CURSOR_MODE_64_32B_AX 0x07 -#define CURSOR_MODE_128_ARGB_AX ((1 << 5) | CURSOR_MODE_128_32B_AX) -#define CURSOR_MODE_256_ARGB_AX ((1 << 5) | CURSOR_MODE_256_32B_AX) -#define CURSOR_MODE_64_ARGB_AX ((1 << 5) | CURSOR_MODE_64_32B_AX) +#define MCURSOR_MODE 0x27 +#define MCURSOR_MODE_DISABLE 0x00 +#define MCURSOR_MODE_128_32B_AX 0x02 +#define MCURSOR_MODE_256_32B_AX 0x03 +#define MCURSOR_MODE_64_32B_AX 0x07 +#define MCURSOR_MODE_128_ARGB_AX ((1 << 5) | MCURSOR_MODE_128_32B_AX) +#define MCURSOR_MODE_256_ARGB_AX ((1 << 5) | MCURSOR_MODE_256_32B_AX) +#define MCURSOR_MODE_64_ARGB_AX ((1 << 5) | MCURSOR_MODE_64_32B_AX) #define MCURSOR_PIPE_SELECT_MASK (0x3 << 28) #define MCURSOR_PIPE_SELECT_SHIFT 28 #define MCURSOR_PIPE_SELECT(pipe) ((pipe) << 28) #define MCURSOR_GAMMA_ENABLE (1 << 26) -#define CURSOR_ROTATE_180 (1<<15) -#define CURSOR_TRICKLE_FEED_DISABLE (1 << 14) +#define MCURSOR_PIPE_CSC_ENABLE (1<<24) +#define MCURSOR_ROTATE_180 (1<<15) +#define MCURSOR_TRICKLE_FEED_DISABLE (1 << 14)#define
_CURABASE0x70084
#define_CURAPOS0x70088
#define CURSOR_POS_MASK 0x007FFdrivers/gpu/drm/i915/intel_display.c +0
-0@@ -9549,20 +9549,20 @@ static u32 i9xx_cursor_ctl(const structintel_crtc_state *crtc_state, cntl = MCURSOR_GAMMA_ENABLE;
if (HAS_DDI(dev_priv))drivers/gpu/drm/i915/intel_display.c +1
-1- cntl |=CURSOR_PIPE_CSC_ENABLE ; + cntl |=MCURSOR_PIPE_CSC_ENABLE ;
if (INTEL_GEN(dev_priv)< 5 && !IS_G4X(dev_priv)) cntl |=MCURSOR_PIPE_SELECT(crtc->pipe);
switch (plane_state->base.crtc_w) {
case 64:drivers/gpu/drm/i915/intel_display.c +1
-1- cntl |=CURSOR_MODE_64_ARGB_AX ; + cntl |=MCURSOR_MODE_64_ARGB_AX ;break;
case 128:drivers/gpu/drm/i915/intel_display.c +1
-1- cntl |=CURSOR_MODE_128_ARGB_AX ; + cntl |=MCURSOR_MODE_128_ARGB_AX ;break;
case 256:drivers/gpu/drm/i915/intel_display.c +1
-1- cntl |=CURSOR_MODE_256_ARGB_AX ; + cntl |=MCURSOR_MODE_256_ARGB_AX ;break;
default:
MISSING_CASE(plane_state->base.crtc_w);drivers/gpu/drm/i915/intel_display.c +0
-0@@ -9570,7 +9570,7 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state, }
if (plane_state->base.rotation&DRM_MODE_ROTATE_180)drivers/gpu/drm/i915/intel_display.c +1
-1- cntl |=CURSOR_ROTATE_180 ; + cntl |=MCURSOR_ROTATE_180 ;
return cntl;
}drivers/gpu/drm/i915/intel_display.c +0
-0@@ -9751,7 +9751,7 @@ static bool i9xx_cursor_get_hw_state(struct intel_plane *plane,
val = I915_READ(CURCNTR(plane->pipe));drivers/gpu/drm/i915/intel_display.c +1
-1- ret = val &CURSOR_MODE ; + ret = val &MCURSOR_MODE ;
if (INTEL_GEN(dev_priv)>= 5 ||IS_G4X(dev_priv)) *pipe =plane->pipe;drivers/gpu/drm/i915/intel_display.c +2
-2@@ -14768,8 +14768,8 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) WARN_ON(I915_READ(DSPCNTR(PLANE_A)) & DISPLAY_PLANE_ENABLE); WARN_ON(I915_READ(DSPCNTR(PLANE_B)) & DISPLAY_PLANE_ENABLE); WARN_ON(I915_READ(DSPCNTR(PLANE_C)) & DISPLAY_PLANE_ENABLE); -WARN_ON (I915_READ (CURCNTR (PIPE_A )) &CURSOR_MODE ); -WARN_ON (I915_READ (CURCNTR (PIPE_B )) &CURSOR_MODE ); +WARN_ON (I915_READ (CURCNTR (PIPE_A )) &MCURSOR_MODE ); +WARN_ON (I915_READ (CURCNTR (PIPE_B )) &MCURSOR_MODE );
I915_WRITE(PIPECONF(pipe), 0);
POSTING_READ(PIPECONF(pipe));
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/7 drm/i915: Disable trickle feed for SNB/IVB cursors
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
We disable trickle feed whenever possible, except for the cursors on SNB/IVB. Let's try disabling it there too if for no other reason than consistency.
--- drivers/gpu/drm/i915/intel_display.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_display.c +3 -0
@@ -9548,6 +9548,9 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state, cntl =MCURSOR_GAMMA_ENABLE ; +if (IS_GEN6 (dev_priv) ||IS_IVYBRIDGE (dev_priv)) + cntl |=MCURSOR_TRICKLE_FEED_DISABLE ; +if (HAS_DDI (dev_priv)) cntl |=MCURSOR_PIPE_CSC_ENABLE ;
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/7] drm/i915: Disable trickle feed for SNB/IVB cursors
Quoted 6 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
We disable trickle feed whenever possible, except for the cursors on SNB/IVB. Let's try disabling it there too if for no other reason than consistency.
Quoted 21 lines
Signed-off-by Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/intel_display.c | 3 +++1 file changed, 3 insertions(+)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -9548,6 +9548,9 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state,
cntl =MCURSOR_GAMMA_ENABLE;drivers/gpu/drm/i915/intel_display.c +3
-0+if (IS_GEN6 (dev_priv) ||IS_IVYBRIDGE (dev_priv)) + cntl |=MCURSOR_TRICKLE_FEED_DISABLE ; +if (
HAS_DDI(dev_priv))
cntl |=MCURSOR_PIPE_CSC_ENABLE;
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/7 drm/i915: Drop WaDoubleCursorLP3Latency:ivb
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
WaDoubleCursorLP3Latency was meant for pre-production hardware. Drop it.
--- drivers/gpu/drm/i915/intel_pm.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -4
@@ -2916,10 +2916,6 @@ static void intel_fixup_cur_wm_latency(struct drm_i915_private *dev_priv,/* ILK cursor LP0 latency is 1300 ns */ if (IS_GEN5 (dev_priv)) wm[0 ] =13 ; - -/* WaDoubleCursorLP3Latency:ivb */ -if (IS_IVYBRIDGE (dev_priv)) - wm[3 ] *=2 ; }int ilk_wm_max_level (const struct drm_i915_private *dev_priv)
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/7] drm/i915: Drop WaDoubleCursorLP3Latency:ivb
Quoted 5 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
WaDoubleCursorLP3Latency was meant for pre-production hardware. Drop it.
Quoted 22 lines
Signed-off-by Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/intel_pm.c | 4 ----1 file changed, 4 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-4@@ -2916,10 +2916,6 @@ static void intel_fixup_cur_wm_latency(structdrm_i915_private *dev_priv, /* ILK cursor LP0 latency is 1300 ns */ if (IS_GEN5(dev_priv)) wm[0] = 13; - -/* WaDoubleCursorLP3Latency:ivb */ -if (IS_IVYBRIDGE (dev_priv)) - wm[3 ] *=2 ; }
intilk_wm_max_level(const struct drm_i915_private *dev_priv)
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/7] drm/i915: Drop WaDoubleCursorLP3Latency:ivb
Quoted 7 lines · Mika Kahola
Quoted 5 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
WaDoubleCursorLP3Latency was meant for pre-production hardware. Drop it.
Reviewed-by Mika Kahola <[email protected]>
Patches 1,2,6 pushed to dinq. Thanks for the review.
Quoted 25 lines
Quoted 23 lines
Signed-off-by Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/intel_pm.c | 4 ----1 file changed, 4 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-4@@ -2916,10 +2916,6 @@ static void intel_fixup_cur_wm_latency(structdrm_i915_private *dev_priv, /* ILK cursor LP0 latency is 1300 ns */ if (IS_GEN5(dev_priv)) wm[0] = 13; - -/* WaDoubleCursorLP3Latency:ivb */ -if (IS_IVYBRIDGE (dev_priv)) - wm[3 ] *=2 ; }
intilk_wm_max_level(const struct drm_i915_private *dev_priv)Signature · 1 line
Mika Kahola - Intel OTC
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/7 drm/i915: s/plane/i9xx_plane/
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Call the enum i9xx_plane_id variable i9xx_plane like we do elsewhere.
--- drivers/gpu/drm/i915/intel_dsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_dsi.c +4 -4
@@ -1665,16 +1665,16 @@ static int intel_dsi_get_panel_orientation(struct intel_connector *connector) {struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);int orientation =DRM_MODE_PANEL_ORIENTATION_NORMAL ; -enum i9xx_plane_id plane; +enum i9xx_plane_id i9xx_plane;u32 val;if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {if (connector->encoder->crtc_mask ==BIT (PIPE_B )) - plane =PLANE_B ; + i9xx_plane =PLANE_B ;else - plane =PLANE_A ; + i9xx_plane =PLANE_A ; - val =I915_READ (DSPCNTR (plane)); + val =I915_READ (DSPCNTR (i9xx_plane));if (val &DISPPLANE_ROTATE_180 ) orientation =DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP ; }
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/7] drm/i915: s/plane/i9xx_plane/
Quoted 5 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Call the enum
i9xx_plane_idvariablei9xx_planelike we do elsewhere.Cc Hans de Goede <[email protected]>
Quoted 34 lines
Signed-off-by Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/intel_dsi.c | 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_dsi.c +0
-0@@ -1665,16 +1665,16 @@ static int intel_dsi_get_panel_orientation(struct intel_connector *connector) {struct
drm_i915_private*dev_priv= to_i915(connector-Quoted 1 line
base.dev);
int orientation =
DRM_MODE_PANEL_ORIENTATION_NORMAL;drivers/gpu/drm/i915/intel_dsi.c +1
-1-enum i9xx_plane_id plane; +enum i9xx_plane_id i9xx_plane;u32 val;
if (IS_VALLEYVIEW(dev_priv)||IS_CHERRYVIEW(dev_priv)) { if (connector->encoder->crtc_mask==BIT(PIPE_B))drivers/gpu/drm/i915/intel_dsi.c +1
-1- plane =PLANE_B ; + i9xx_plane =PLANE_B ;else
drivers/gpu/drm/i915/intel_dsi.c +1
-1- plane =PLANE_A ; + i9xx_plane =PLANE_A ;drivers/gpu/drm/i915/intel_dsi.c +1
-1- val =I915_READ (DSPCNTR (plane)); + val =I915_READ (DSPCNTR (i9xx_plane));if (val &
DISPPLANE_ROTATE_180)
orientation =DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP;
}
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/7] drm/i915: s/plane/i9xx_plane/
Quoted 8 lines · Mika Kahola
Quoted 5 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Call the enum
i9xx_plane_idvariablei9xx_planelike we do elsewhere.Cc Hans de Goede <[email protected]>Reviewed-by Mika Kahola <[email protected]>
Thanks. Remainder of the series pushed.
Quoted 37 lines
Quoted 35 lines
Signed-off-by Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/intel_dsi.c | 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_dsi.c +0
-0@@ -1665,16 +1665,16 @@ static int intel_dsi_get_panel_orientation(struct intel_connector *connector) {struct
drm_i915_private*dev_priv= to_i915(connector-Quoted 1 line
base.dev);
int orientation =
DRM_MODE_PANEL_ORIENTATION_NORMAL;drivers/gpu/drm/i915/intel_dsi.c +1
-1-enum i9xx_plane_id plane; +enum i9xx_plane_id i9xx_plane;u32 val;
if (IS_VALLEYVIEW(dev_priv)||IS_CHERRYVIEW(dev_priv)) { if (connector->encoder->crtc_mask==BIT(PIPE_B))drivers/gpu/drm/i915/intel_dsi.c +1
-1- plane =PLANE_B ; + i9xx_plane =PLANE_B ;else
drivers/gpu/drm/i915/intel_dsi.c +1
-1- plane =PLANE_A ; + i9xx_plane =PLANE_A ;drivers/gpu/drm/i915/intel_dsi.c +1
-1- val =I915_READ (DSPCNTR (plane)); + val =I915_READ (DSPCNTR (i9xx_plane));if (val &
DISPPLANE_ROTATE_180)
orientation =DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP;
}Signature · 1 line
Mika Kahola - Intel OTC
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/7] drm/i915: Don't set cursor pipe select bits on g4x+
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: series starting with [1/7] drm/i915: Don't set cursor pipe select bits on g4x+
URL : https://patchwork.freedesktop.org/series/37362/
State : failure
== Summary ==
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
DESCEND objtool
CHK scripts/mod/devicetable-offsets.h
CHK include/generated/compile.h
CHK kernel/config_data.h
CC [M] drivers/gpu/drm/i915/gvt/fb_decoder.o
drivers/gpu/drm/i915/gvt/fb_decoder.c: In function ‘cursor_mode_to_drm’:
drivers/gpu/drm/i915/gvt/fb_decoder.c:306:7: error: ‘CURSOR_MODE_128_ARGB_AX’ undeclared (first use in this function)
case CURSOR_MODE_128_ARGB_AX:
^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gvt/fb_decoder.c:306:7: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/i915/gvt/fb_decoder.c:309:7: error: ‘CURSOR_MODE_256_ARGB_AX’ undeclared (first use in this function)
case CURSOR_MODE_256_ARGB_AX:
^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gvt/fb_decoder.c:312:7: error: ‘CURSOR_MODE_64_ARGB_AX’ undeclared (first use in this function)
case CURSOR_MODE_64_ARGB_AX:
^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gvt/fb_decoder.c:315:7: error: ‘CURSOR_MODE_64_32B_AX’ undeclared (first use in this function)
case CURSOR_MODE_64_32B_AX:
^~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/gvt/fb_decoder.c: In function ‘intel_vgpu_decode_cursor_plane’:
drivers/gpu/drm/i915/gvt/fb_decoder.c:348:15: error: ‘CURSOR_MODE’ undeclared (first use in this function)
mode = val & CURSOR_MODE;
^~~~~~~~~~~
drivers/gpu/drm/i915/gvt/fb_decoder.c:349:28: error: ‘CURSOR_MODE_DISABLE’ undeclared (first use in this function)
plane->enabled = (mode != CURSOR_MODE_DISABLE);
^~~~~~~~~~~~~~~~~~~scripts/Makefile.build:316: recipe for target 'drivers/gpu/drm/i915/gvt/fb_decoder.o' failed make[4]: *** [drivers/gpu/drm/i915/gvt/fb_decoder.o] Error 1 scripts/Makefile.build:575: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:575: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:575: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1018: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/7] drm/i915: Don't set cursor pipe select bits on g4x+ (rev2)
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: series starting with [1/7] drm/i915: Don't set cursor pipe select bits on g4x+ (rev2)
URL : https://patchwork.freedesktop.org/series/37362/
State : success
== Summary ==
Series 37362v2 series starting with [1/7] drm/i915: Don't set cursor pipe select bits on g4x+
https://patchwork.freedesktop.org/api/1.0/series/37362/revisions/2/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
pass -> INCOMPLETE (fi-bdw-5557u) fdo#104162
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
incomplete -> PASS (fi-snb-2520m) fdo#103713fdo#104162 https://bugs.freedesktop.org/show_bug.cgi?id=104162
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:109 pass:105 dwarn:0 dfail:0 fail:0 skip:3 fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:422s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:370s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:490s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:283s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:478s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:487s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:471s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:454s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:573s fi-elk-e7500 total:224 pass:168 dwarn:10 dfail:0 fail:0 skip:45 fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:286s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:514s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:397s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:399s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:416s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:449s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:411s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:463s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:496s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:450s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:502s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:583s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:438s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:509s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:525s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:494s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:475s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:417s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:430s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:522s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:403s
Blacklisted hosts:
fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:472s
badc0398a06018a07f6f50a1ff5a5fd8a30b9944 drm-tip: 2018y-01m-31d-12h-17m-12s UTC integration manifest a6b40df641b0 drm/i915: s/plane/i9xx_plane/309c54212a22 drm/i915: Drop WaDoubleCursorLP3Latency:ivbab266dd84d7a drm/i915: Disable trickle feed for SNB/IVB cursors45da2273b46f drm/i915: Clean up cursor defines8948a9152607 drm/i915: Have plane->get_hw_state() return the current pipe db3c2d0815ab drm/i915: Set the primary plane pipe select bits on gen445bad81fbb4c drm/i915: Don't set cursor pipe select bits on g4x+
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7839/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/7] drm/i915: Don't set cursor pipe select bits on g4x+ (rev2)
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: series starting with [1/7] drm/i915: Don't set cursor pipe select bits on g4x+ (rev2)
URL : https://patchwork.freedesktop.org/series/37362/
State : success
== Summary ==
Test perf_pmu:
Subgroup semaphore-wait-bcs0:
fail -> PASS (shard-apl) fdo#104829
Test kms_sysfs_edid_timing:
pass -> WARN (shard-apl) fdo#100047fdo#104829 https://bugs.freedesktop.org/show_bug.cgi?id=104829
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
shard-apl total:2838 pass:1749 dwarn:1 dfail:0 fail:23 skip:1064 time:12633s shard-hsw total:2838 pass:1736 dwarn:1 dfail:0 fail:10 skip:1090 time:11990s shard-snb total:2838 pass:1330 dwarn:1 dfail:0 fail:10 skip:1497 time:6629s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7839/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
G4x cursor control registers still allow us to write to the pipe select
bits even though cursors are supposed to be fixed to a specific pipe. Bspec tells us that we should only ever write 0 to these bits. Let's follow that recommendation. On ilk+ the bits become hardwired to 0.Also looks like ICL repurposes these bits for some other use, so we had better stop setting them to bogus values there.
Quoted 21 lines
Signed-off-by Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/intel_display.c | 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -9532,7 +9532,8 @@ static u32 i9xx_cursor_ctl(const structintel_crtc_state *crtc_state, if (HAS_DDI(dev_priv)) cntl |= CURSOR_PIPE_CSC_ENABLE;drivers/gpu/drm/i915/intel_display.c +2
-1- cntl |=MCURSOR_PIPE_SELECT (crtc->pipe); +if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv)) + cntl |=MCURSOR_PIPE_SELECT (crtc->pipe);
switch (plane_state->base.crtc_w) {
case 64:
Signature · 6 lines
Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx